diff --git a/app/controller/api/User.php b/app/controller/api/User.php index 61b7591..dda5ef3 100644 --- a/app/controller/api/User.php +++ b/app/controller/api/User.php @@ -434,7 +434,7 @@ class User extends Base $bgImg = $bgImg ?: app()->getRootPath().'public/static/images/poster-bg1.png'; $headimg = $account['headimgurl'] ?? app()->getRootPath().'public/static/images/icon-logo.jpg'; $name = mb_substr($account['nickname'], 0, 4); - $name = $name ?: '佩丽商城'; + $name = $name ?: '商城'; // 圆形头像 $head = $this->getCircleImg($headimg, 60, 60); $poster = (string) ImageManagerStatic::make($bgImg) diff --git a/app/controller/manager/Index.php b/app/controller/manager/Index.php index 41a680a..f56b96a 100644 --- a/app/controller/manager/Index.php +++ b/app/controller/manager/Index.php @@ -75,7 +75,7 @@ class Index extends Base { $res = []; $res['homeInfo'] = ['title' => '控制台', 'href' => "manager/index/dashboard"]; - $res['logoInfo'] = ['title' => '佩丽商城', 'href' => "", 'image' => '/static/manager/image/logo.png']; + $res['logoInfo'] = ['title' => '商城', 'href' => "", 'image' => '/static/manager/image/logo.png']; $menus = CmsRepository::getInstance()->getMenuList(Menu::TYPE_MENU, Menu::SHOW_YES)->toArray(); $userId = $this->auth['user_id'] ?? 0; diff --git a/app/service/ali/Sms.php b/app/service/ali/Sms.php index 8b39a30..d94b814 100644 --- a/app/service/ali/Sms.php +++ b/app/service/ali/Sms.php @@ -13,7 +13,7 @@ use think\facade\Log; class Sms { - public const SMS_SIGN = '佩丽商城'; + public const SMS_SIGN = '商城'; // 会员注册模版 public const TEMPLATE_REGISTER_CODE = 'SMS_187934108'; @@ -53,7 +53,7 @@ class Sms * @param array $args * args = [ * 'phoneNumberJson' => '["135411****","1xxxx"]', - * 'signNameJson' => '["佩丽商城","恒美会"]', + * 'signNameJson' => '["商城","恒美会"]', * 'templateCode' => 'SMS_187934108', * 'templateParamJson' => '[{"code":"12345"},{"code":"3333"}]' * ] @@ -66,7 +66,7 @@ class Sms //注意格式 // $args = [ // 'phoneNumberJson' => '["13541194069"]', - // 'signNameJson' => '["佩丽商城"]', + // 'signNameJson' => '["商城"]', // 'templateCode' => 'SMS_187934108', // 'templateParamJson' => '[{"code":"12345"}]' // ]; @@ -90,14 +90,14 @@ class Sms * @param string $phone 手机号 * @param array $args 参数 如['code' => '3333', 'other' => 'other value']; * @param string $templateId 模版 默认注册验证码模版 - * @param string $signName 标签 默认 佩丽商城 + * @param string $signName 标签 默认 商城 * @return bool|string */ public static function send(string $phone, array $args, string $templateId = self::TEMPLATE_REGISTER_CODE, string $signName = self::SMS_SIGN) { // $args = [ // 'phoneNumbers' => '13541194069', - // 'signName' => '佩丽商城', + // 'signName' => '商城', // 'templateCode' => 'SMS_187934108', // 'templateParam' => '{"code":"66666","other":"other value"}' // ]; diff --git a/app/traits/account/AccountMessageTrait.php b/app/traits/account/AccountMessageTrait.php index 3479924..d8f1f0f 100644 --- a/app/traits/account/AccountMessageTrait.php +++ b/app/traits/account/AccountMessageTrait.php @@ -424,7 +424,7 @@ trait AccountMessageTrait // ['template_id' => '模版ID', 'msg' => msgBody] $data = [ 'phoneNumberJson' => '', // 如'["13541194xxxx"]' - 'signNameJson' => '',// 如 '["佩丽商城","佩丽商城"]' + 'signNameJson' => '',// 如 '["商城","商城"]' 'templateCode' => '', 'templateParamJson' => '', //如 '[{"code":"12345"},{"code":"333"}]' ]; diff --git a/public/.htaccess b/public/.htaccess index be1eac6..5cae19e 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,10 +1,10 @@ - - SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 - Options +FollowSymlinks -Multiviews - RewriteEngine On - - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_URI} !^(.*)\.(gif|jpg|jpeg|png|swf|mp4)$ [NC] - RewriteRule ^(.*)$ index.php?s=/$1 [QSA,PT,L] + + SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 + Options +FollowSymlinks -Multiviews + RewriteEngine On + + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_URI} !^(.*)\.(gif|jpg|jpeg|png|swf|mp4)$ [NC] + RewriteRule ^(.*)$ index.php?s=/$1 [QSA,PT,L] \ No newline at end of file diff --git a/public/static/manager/image/logo.png b/public/static/manager/image/logo.png index 6c8846d..cdba55e 100644 Binary files a/public/static/manager/image/logo.png and b/public/static/manager/image/logo.png differ