From 8c13facb3bf680b432a8ed425a7aeb2b6f7d0da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sat, 6 Apr 2024 17:51:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Login.php | 21 +- app/admin/controller/api/Upload.php | 4 +- app/admin/view/api/upload/image.html | 4 +- app/admin/view/config/storage-0.html | 2 +- app/admin/view/login/index.html | 2 +- app/wechat/controller/Config.php | 5 +- app/wechat/controller/payment/Refund.php | 6 +- app/wechat/view/payment/record/index.html | 5 +- app/wechat/view/payment/refund/index.html | 39 +- public/static/admin.js | 8 +- public/static/login.js | 3 + public/static/plugs/ckeditor4/config.js | 2 +- public/static/plugs/ckeditor5/content.css | 832 +++++++++++++--------- public/static/plugs/jquery/area/area.php | 2 +- public/static/plugs/jquery/area/data.json | 2 +- public/static/plugs/jquery/pcasunzips.js | 2 +- public/static/plugs/layui/css/layui.css | 2 +- public/static/plugs/layui/layui.js | 2 +- public/static/theme/css/_custom.less | 142 ++-- public/static/theme/css/console.css | 2 +- public/static/theme/css/console.css.map | 2 +- 21 files changed, 600 insertions(+), 489 deletions(-) diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php index dc5a206fc..04ae0c239 100644 --- a/app/admin/controller/Login.php +++ b/app/admin/controller/Login.php @@ -43,8 +43,13 @@ class Login extends Controller if (AdminService::isLogin()) { $this->redirect(sysuri('admin/index/index')); } else { + // 加载登录模板 + $this->title = '系统登录'; // 当前运行模式 - $this->developMode = RuntimeService::check(); + $this->runtimeMode = RuntimeService::check(); + // 登录验证令牌 + $this->captchaType = 'LoginCaptcha'; + $this->captchaToken = CodeExtend::uuid(); // 后台背景处理 $images = str2arr(sysconf('login_image|raw') ?: '', '|'); if (empty($images)) $images = [ @@ -52,18 +57,10 @@ class Login extends Controller SystemService::uri('/static/theme/img/login/bg2.jpg'), ]; $this->loginStyle = sprintf('style="background-image:url(%s)" data-bg-transition="%s"', $images[0], join(',', $images)); - // 登录验证令牌 - $this->captchaType = 'LoginCaptcha'; - $this->captchaToken = CodeExtend::uniqidDate(18); - if (!$this->app->session->get('LoginInputSessionError')) { - $this->app->session->set($this->captchaType, $this->captchaToken); - } - // 更新后台域名 + // 更新后台主域名，用于部分无法获取域名的场景调用 if ($this->request->domain() !== sysconf('base.site_host|raw')) { sysconf('base.site_host', $this->request->domain()); } - // 加载登录模板 - $this->title = '系统登录'; $this->fetch(); } } else { @@ -119,9 +116,9 @@ class Login extends Controller ]); $image = CaptchaService::instance()->initialize(); $captcha = ['image' => $image->getData(), 'uniqid' => $image->getUniqid()]; - if ($this->app->session->get($input['type']) === $input['token']) { + // 未发生异常时，直接返回验证码内容 + if (!$this->app->session->get('LoginInputSessionError')) { $captcha['code'] = $image->getCode(); - $this->app->session->delete($input['type']); } $this->success('生成验证码成功', $captcha); } diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php index ec0cfa340..2b879ae05 100644 --- a/app/admin/controller/api/Upload.php +++ b/app/admin/controller/api/Upload.php @@ -266,7 +266,7 @@ class Upload extends Controller private function getType(): string { $type = strtolower(input('uptype', '')); - if (in_array($type, ['local', 'qiniu', 'alioss', 'txcos', 'uptype'])) { + if (in_array($type, array_keys(Storage::types()))) { return $type; } else { return strtolower(sysconf('storage.type|raw')); @@ -284,7 +284,7 @@ class Upload extends Controller if ($file instanceof UploadedFile) { return $file; } else { - $this->error('未获取到上传的文件对象！'); + $this->error('读取临时文件失败！'); } } catch (HttpResponseException $exception) { throw $exception; diff --git a/app/admin/view/api/upload/image.html b/app/admin/view/api/upload/image.html index 0d8c2275d..9bc6456ff 100644 --- a/app/admin/view/api/upload/image.html +++ b/app/admin/view/api/upload/image.html @@ -145,13 +145,13 @@