From 115785d0c0859a3815042b9e6cb66dab6f325d61 Mon Sep 17 00:00:00 2001 From: ModStart Date: Mon, 16 Dec 2024 14:57:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AF=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Constant/AppConstant.php | 2 +- .../Admin/Controller/MemberController.php | 8 + .../Controller/MemberProfileController.php | 1 - module/Member/Docs/release.md | 3 +- module/Member/Model/MemberMeta.php | 12 + module/Member/Type/Gender.php | 24 +- module/Member/Util/MemberMetaUtil.php | 11 +- module/Member/Util/MemberUtil.php | 10 +- module/Member/View/pc/loginDialog.blade.php | 2 + .../Member/View/pc/registerDialog.blade.php | 2 +- module/Member/config.json | 4 +- .../Admin/Controller/ConfigController.php | 5 +- module/SmsTecmz/Docs/release.md | 6 + module/SmsTecmz/config.json | 11 +- module/Vendor/Atomic/AtomicUtil.php | 158 ------ module/Vendor/Biz/BizTrait.php | 60 --- module/Vendor/Cache/CacheUtil.php | 51 -- .../Captcha/AbstractCaptchaProvider.php | 17 - module/Vendor/Captcha/CaptchaUtil.php | 29 - .../Vendor/Captcha/DefaultCaptchaProvider.php | 33 -- module/Vendor/Developer/UniappUtil.php | 86 --- module/Vendor/Docs/release.md | 10 +- module/Vendor/Email/AbstractEmailSender.php | 56 -- module/Vendor/Email/MailSendJob.php | 114 ---- module/Vendor/LazyValue/LazyValueJob.php | 70 --- .../Vendor/LazyValue/LazyValueProcessor.php | 13 - module/Vendor/LazyValue/LazyValueUtil.php | 84 --- module/Vendor/Markdown/MarkdownUtil.php | 2 +- module/Vendor/Oauth/OauthType.php | 32 -- module/Vendor/Provider/BizTrait.php | 8 + module/Vendor/SDK/WechatMiniProgramSdk.php | 61 +++ module/Vendor/Session/SessionUtil.php | 30 -- module/Vendor/Sms/AbstractSmsSender.php | 19 - module/Vendor/Sms/SmsSendJob.php | 47 -- module/Vendor/Sms/SmsUtil.php | 84 --- module/Vendor/Util/FeUtil.php | 30 +- module/Vendor/Util/QueueUtil.php | 20 + .../View/quickRun/export/common.blade.php | 7 +- .../View/quickRun/export/excel.blade.php | 6 + module/Vendor/config.json | 2 +- public/asset/common/editor.js | 2 +- public/asset/image/no-record-dark.svg | 63 +++ public/asset/image/no-record.svg | 63 +++ public/asset/theme/default/style.css | 2 +- public/asset/vendor/jquery.marquee.js | 1 + .../dialogs/attachment/attachment.html | 2 +- .../vendor/ueditor/dialogs/audio/audio.html | 2 +- .../vendor/ueditor/dialogs/image/image.html | 2 +- .../vendor/ueditor/dialogs/video/video.html | 2 +- .../ueditor/dialogs/wordimage/wordimage.html | 2 +- .../ueditor/themes/default/css/ueditor.css | 2 +- public/asset/vendor/ueditor/ueditor.all.js | 2 +- .../modstart/modstart/asset/common/editor.js | 2 +- .../modstart/asset/image/no-record-dark.svg | 63 +++ .../modstart/asset/image/no-record.svg | 63 +++ .../modstart/asset/theme/default/style.css | 2 +- .../modstart/asset/vendor/jquery.marquee.js | 1 + .../dialogs/attachment/attachment.html | 2 +- .../vendor/ueditor/dialogs/audio/audio.html | 2 +- .../vendor/ueditor/dialogs/image/image.html | 2 +- .../vendor/ueditor/dialogs/video/video.html | 2 +- .../ueditor/dialogs/wordimage/wordimage.html | 2 +- .../ueditor/themes/default/css/ueditor.css | 2 +- .../asset/vendor/ueditor/ueditor.all.js | 2 +- vendor/modstart/modstart/lang/zh/base.php | 1 + .../asset/src/image/no-record-dark.svg | 63 +++ .../resources/asset/src/image/no-record.svg | 63 +++ .../asset/src/sui/base/component/base.less | 2 +- .../src/sui/bricks/component/bar/bar.less | 58 ++ .../src/sui/bricks/component/misc/misc.less | 10 + .../src/sui/bricks/component/nav/nav.less | 2 + .../src/sui/bricks/page/account/account.less | 9 +- .../resources/asset/src/svue/lib/api.js | 48 +- .../resources/asset/src/svue/store/api.js | 35 ++ .../resources/asset/src/svue/store/base.js | 32 ++ .../asset/src/vendor/jquery.marquee.js | 498 ++++++++++++++++++ .../dialogs/attachment/attachment.html | 2 +- .../vendor/ueditor/dialogs/audio/audio.html | 2 +- .../vendor/ueditor/dialogs/image/image.html | 2 +- .../vendor/ueditor/dialogs/video/video.html | 2 +- .../ueditor/dialogs/wordimage/wordimage.html | 2 +- .../ueditor/themes/default/css/ueditor.css | 9 +- .../asset/src/vendor/ueditor/ueditor.all.js | 63 ++- .../modstart/src/Core/Util/AgentUtil.php | 2 +- .../modstart/views/core/grid/index.blade.php | 2 +- 85 files changed, 1344 insertions(+), 1083 deletions(-) create mode 100644 module/Member/Model/MemberMeta.php delete mode 100644 module/Vendor/Atomic/AtomicUtil.php delete mode 100644 module/Vendor/Biz/BizTrait.php delete mode 100644 module/Vendor/Cache/CacheUtil.php delete mode 100644 module/Vendor/Captcha/AbstractCaptchaProvider.php delete mode 100644 module/Vendor/Captcha/CaptchaUtil.php delete mode 100644 module/Vendor/Captcha/DefaultCaptchaProvider.php delete mode 100644 module/Vendor/Developer/UniappUtil.php delete mode 100644 module/Vendor/Email/AbstractEmailSender.php delete mode 100644 module/Vendor/Email/MailSendJob.php delete mode 100644 module/Vendor/LazyValue/LazyValueJob.php delete mode 100644 module/Vendor/LazyValue/LazyValueProcessor.php delete mode 100644 module/Vendor/LazyValue/LazyValueUtil.php delete mode 100644 module/Vendor/Oauth/OauthType.php create mode 100644 module/Vendor/SDK/WechatMiniProgramSdk.php delete mode 100644 module/Vendor/Session/SessionUtil.php delete mode 100644 module/Vendor/Sms/AbstractSmsSender.php delete mode 100644 module/Vendor/Sms/SmsSendJob.php delete mode 100644 module/Vendor/Sms/SmsUtil.php create mode 100644 module/Vendor/Util/QueueUtil.php create mode 100644 public/asset/image/no-record-dark.svg create mode 100644 public/asset/image/no-record.svg create mode 100644 public/asset/vendor/jquery.marquee.js create mode 100644 vendor/modstart/modstart/asset/image/no-record-dark.svg create mode 100644 vendor/modstart/modstart/asset/image/no-record.svg create mode 100644 vendor/modstart/modstart/asset/vendor/jquery.marquee.js create mode 100644 vendor/modstart/modstart/resources/asset/src/image/no-record-dark.svg create mode 100644 vendor/modstart/modstart/resources/asset/src/image/no-record.svg create mode 100644 vendor/modstart/modstart/resources/asset/src/svue/store/api.js create mode 100644 vendor/modstart/modstart/resources/asset/src/svue/store/base.js create mode 100644 vendor/modstart/modstart/resources/asset/src/vendor/jquery.marquee.js diff --git a/app/Constant/AppConstant.php b/app/Constant/AppConstant.php index 82d6c7607..051d16e04 100644 --- a/app/Constant/AppConstant.php +++ b/app/Constant/AppConstant.php @@ -6,5 +6,5 @@ class AppConstant { const APP = 'cms'; const APP_NAME = 'ModStartCMS'; - const VERSION = '9.0.0'; + const VERSION = '9.1.0'; } diff --git a/module/Member/Admin/Controller/MemberController.php b/module/Member/Admin/Controller/MemberController.php index 99588de65..fc65f3db5 100644 --- a/module/Member/Admin/Controller/MemberController.php +++ b/module/Member/Admin/Controller/MemberController.php @@ -117,11 +117,19 @@ protected function crud(AdminCRUDBuilder $builder) $icon = $oauth->icon(); } } + switch ($title) { + case 'wechatunion': + $icon = 'iconfont icon-wechat'; + $title = '微信联合ID'; + $color = '#565b56'; + break; + } if (empty($color)) { $color = ColorUtil::pick($oauthRecord['type']); } $oauthList[] = join('', [ " $item->id]) . "'", diff --git a/module/Member/Api/Controller/MemberProfileController.php b/module/Member/Api/Controller/MemberProfileController.php index 1c229315c..10c225866 100644 --- a/module/Member/Api/Controller/MemberProfileController.php +++ b/module/Member/Api/Controller/MemberProfileController.php @@ -23,7 +23,6 @@ use Module\Member\Util\MemberUtil; use Module\Vendor\Job\MailSendJob; use Module\Vendor\Job\SmsSendJob; -use Module\Vendor\Sms\SmsUtil; use Module\Vendor\Support\ResponseCodes; use Symfony\Component\HttpFoundation\File\UploadedFile; diff --git a/module/Member/Docs/release.md b/module/Member/Docs/release.md index b0c0b8437..c072a4f46 100644 --- a/module/Member/Docs/release.md +++ b/module/Member/Docs/release.md @@ -1,9 +1,10 @@ -## 4.5.0 +## 4.5.0 VIP优惠券集成,VIP购买交互方式优化,注册IP定位,用户密码加密 - 新增:VIP 优惠券功能集成,支持折扣券 - 新增:可完全自定义上传功能定制的特性 UploadScript Hook - 新增:用户登录传输用户密码加密 - 新增:用户注册增加注册IP定位,支持用户注册地理位置记录 +- 优化:后台授权登录显示样式功能优化 - 优化:VIP 开通页面交互形式优化 --- diff --git a/module/Member/Model/MemberMeta.php b/module/Member/Model/MemberMeta.php new file mode 100644 index 000000000..efaaa67a9 --- /dev/null +++ b/module/Member/Model/MemberMeta.php @@ -0,0 +1,12 @@ + $name, ]; if (is_null($value)) { - ModelUtil::delete('member_meta', $where); + ModelUtil::delete(MemberMeta::class, $where); } else { - if (ModelUtil::update('member_meta', $where, [ + if (ModelUtil::update(MemberMeta::class, $where, [ 'value' => $value, 'updated_at' => Carbon::now() ]) <= 0) { ModelUtil::transactionBegin(); - $one = ModelUtil::getWithLock('member_meta', $where); + $one = ModelUtil::getWithLock(MemberMeta::class, $where); if (empty($one)) { - ModelUtil::insert('member_meta', array_merge($where, [ + ModelUtil::insert(MemberMeta::class, array_merge($where, [ 'value' => $value, ])); } @@ -40,7 +41,7 @@ public static function get($memberUserId, $name) 'memberUserId' => $memberUserId, 'name' => $name, ]; - $meta = ModelUtil::get('member_meta', $where); + $meta = ModelUtil::get(MemberMeta::class, $where); if ($meta) { return $meta['value']; } diff --git a/module/Member/Util/MemberUtil.php b/module/Member/Util/MemberUtil.php index 57230bd6f..0fbc9a3c9 100644 --- a/module/Member/Util/MemberUtil.php +++ b/module/Member/Util/MemberUtil.php @@ -145,12 +145,12 @@ public static function listUsers($ids) public static function convertOneToBasic($memberUser) { return [ - 'id' => $memberUser['id'], - 'username' => $memberUser['username'], - 'nickname' => empty($memberUser['nickname']) ? $memberUser['username'] : $memberUser['nickname'], - 'created_at' => $memberUser['created_at'], + 'id' => $memberUser ? $memberUser['id'] : 0, + 'username' => $memberUser ? $memberUser['username'] : null, + 'nickname' => $memberUser ? (empty($memberUser['nickname']) ? $memberUser['username'] : $memberUser['nickname']) : null, + 'created_at' => $memberUser ? $memberUser['created_at'] : null, 'signature' => isset($memberUser['signature']) ? $memberUser['signature'] : null, - 'avatar' => AssetsUtil::fixFullOrDefault($memberUser['avatar'], 'asset/image/avatar.svg'), + 'avatar' => AssetsUtil::fixFullOrDefault($memberUser ? $memberUser['avatar'] : null, 'asset/image/avatar.svg'), ]; } diff --git a/module/Member/View/pc/loginDialog.blade.php b/module/Member/View/pc/loginDialog.blade.php index 76eb68496..603c385e0 100644 --- a/module/Member/View/pc/loginDialog.blade.php +++ b/module/Member/View/pc/loginDialog.blade.php @@ -6,6 +6,7 @@ @section('headAppend') @parent + {!! \ModStart\Core\Hook\ModStartHook::fireInView('MemberLoginPageHeadAppend'); !!} @endsection @@ -14,6 +15,7 @@ @endsection {!! \ModStart\ModStart::style('html,body{background:var(--color-content-bg);}') !!} + @section('body') - + - + diff --git a/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/audio/audio.html b/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/audio/audio.html index 61fc7cf48..05b4b1d63 100644 --- a/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/audio/audio.html +++ b/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/audio/audio.html @@ -74,7 +74,7 @@ - + diff --git a/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/image/image.html b/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/image/image.html index e7d513fc1..9ee69c070 100644 --- a/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/image/image.html +++ b/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/image/image.html @@ -9,7 +9,7 @@ - + diff --git a/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/video/video.html b/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/video/video.html index 59a48ee65..7a5351793 100644 --- a/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/video/video.html +++ b/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/video/video.html @@ -100,7 +100,7 @@ - + diff --git a/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/wordimage/wordimage.html b/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/wordimage/wordimage.html index 600868dfe..2dd55605b 100644 --- a/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/wordimage/wordimage.html +++ b/vendor/modstart/modstart/asset/vendor/ueditor/dialogs/wordimage/wordimage.html @@ -130,7 +130,7 @@ - + - + diff --git a/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/audio/audio.html b/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/audio/audio.html index 61fc7cf48..05b4b1d63 100644 --- a/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/audio/audio.html +++ b/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/audio/audio.html @@ -74,7 +74,7 @@ - + diff --git a/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/image/image.html b/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/image/image.html index e7d513fc1..9ee69c070 100644 --- a/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/image/image.html +++ b/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/image/image.html @@ -9,7 +9,7 @@ - + diff --git a/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/video/video.html b/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/video/video.html index 59a48ee65..7a5351793 100644 --- a/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/video/video.html +++ b/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/video/video.html @@ -100,7 +100,7 @@ - + diff --git a/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/wordimage/wordimage.html b/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/wordimage/wordimage.html index 600868dfe..2dd55605b 100644 --- a/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/wordimage/wordimage.html +++ b/vendor/modstart/modstart/resources/asset/src/vendor/ueditor/dialogs/wordimage/wordimage.html @@ -130,7 +130,7 @@ - +