From 2370e1a4761ecc4338ab0146b848dbc1da706942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?= <1518079521@qq.com> Date: Thu, 1 Jun 2023 19:37:03 +0800 Subject: [PATCH] niucloud --- niucloud/app/adminapi/route/route.php | 2 -- niucloud/app/api/middleware.php | 2 -- .../app/api/middleware/AllowCrossDomain.php | 2 -- niucloud/app/api/route/article.php | 3 ++- niucloud/app/api/route/auth.php | 3 ++- niucloud/app/api/route/diy.php | 3 ++- niucloud/app/api/route/file.php | 3 ++- niucloud/app/api/route/member.php | 5 ++-- niucloud/app/api/route/order.php | 3 ++- niucloud/app/api/route/pay.php | 5 ++-- niucloud/app/api/route/route.php | 6 +++-- niucloud/app/dict/sys/SmsDict.php | 2 +- niucloud/app/dict/sys/StorageDict.php | 2 +- niucloud/app/install/controller/Index.php | 16 +++++++++++- niucloud/app/install/source/database.sql | 6 ++--- niucloud/app/install/view/index/step-4.html | 2 +- niucloud/app/lang/en/dict.php | 2 +- niucloud/app/lang/zh-cn/api.php | 1 + niucloud/app/listener/notice/Sms.php | 2 +- niucloud/app/listener/notice/Weapp.php | 4 --- niucloud/app/listener/notice/Wechat.php | 4 --- .../notice_template/MemberVerifySuccess.php | 5 ++-- .../listener/site/AddSiteAfterListener.php | 2 +- niucloud/app/service/admin/diy/DiyService.php | 1 + .../service/admin/stat/SiteStatService.php | 10 +++++-- .../app/service/admin/sys/SystemService.php | 6 ++--- .../app/service/api/login/RegisterService.php | 2 +- .../app/service/api/notice/NoticeService.php | 1 - .../service/api/wechat/WechatAuthService.php | 6 +++-- .../core/addon/CoreAddonInstallService.php | 3 ++- .../service/core/addon/CoreAddonService.php | 18 ++++++++----- .../service/core/notice/CoreSmsService.php | 2 +- .../app/service/core/notice/NoticeService.php | 2 +- .../core/sys/CoreAttachmentService.php | 2 -- .../core/upload/CoreStorageService.php | 26 ++++++++++++++++++- niucloud/core/base/BaseJob.php | 4 +-- niucloud/core/dict/BaseDict.php | 20 +++++--------- niucloud/core/sms/Aliyun.php | 3 +-- niucloud/core/upload/BaseUpload.php | 3 --- niucloud/core/upload/Local.php | 9 ------- niucloud/core/upload/Qcloud.php | 9 ------- niucloud/core/upload/Qiniu.php | 9 ------- 42 files changed, 115 insertions(+), 106 deletions(-) diff --git a/niucloud/app/adminapi/route/route.php b/niucloud/app/adminapi/route/route.php index 67bafcfe0..db625b3a5 100644 --- a/niucloud/app/adminapi/route/route.php +++ b/niucloud/app/adminapi/route/route.php @@ -26,8 +26,6 @@ Route::group(function () { //一次校验验证码 Route::get('captcha/check', 'login.Captcha/check'); - Route::get('terminal', 'sys.Terminal/exec'); - Route::get('test', 'login.Login/test'); }); diff --git a/niucloud/app/api/middleware.php b/niucloud/app/api/middleware.php index afcb39f0b..38535bbdc 100644 --- a/niucloud/app/api/middleware.php +++ b/niucloud/app/api/middleware.php @@ -1,8 +1,6 @@ header('origin'); if(env('app_debug') || ($origin && in_array($origin, $allow_origin))){ header('Access-Control-Allow-Origin: *'); -// header('Access-Control-Allow-Origin: ' . $origin); }else{ header('Access-Control-Allow-Origin: *'); throw new ServerException('SERVER_CROSS_REQUEST_FAIL', 409); diff --git a/niucloud/app/api/route/article.php b/niucloud/app/api/route/article.php index 749eb8540..a41ebaa89 100644 --- a/niucloud/app/api/route/article.php +++ b/niucloud/app/api/route/article.php @@ -12,6 +12,7 @@ use app\api\middleware\ApiChannel; use app\api\middleware\ApiCheckToken; use app\api\middleware\ApiLog; +use app\api\middleware\AllowCrossDomain; use think\facade\Route; @@ -33,6 +34,6 @@ Route::group('article', function () { //文章分类详情 Route::get('category/:id', 'article.ArticleCategory/info'); -})->middleware(ApiChannel::class) +})->middleware(AllowCrossDomain::class)->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class, false) ->middleware(ApiLog::class); \ No newline at end of file diff --git a/niucloud/app/api/route/auth.php b/niucloud/app/api/route/auth.php index fbb101359..8de27f41c 100644 --- a/niucloud/app/api/route/auth.php +++ b/niucloud/app/api/route/auth.php @@ -12,6 +12,7 @@ use app\api\middleware\ApiChannel; use app\api\middleware\ApiCheckToken; use app\api\middleware\ApiLog; +use app\api\middleware\AllowCrossDomain; use think\facade\Route; @@ -22,6 +23,6 @@ Route::group('auth',function () { Route::put('logout', 'login.Login/logout'); -})->middleware(ApiChannel::class) +})->middleware(AllowCrossDomain::class)->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class, true) ->middleware(ApiLog::class); \ No newline at end of file diff --git a/niucloud/app/api/route/diy.php b/niucloud/app/api/route/diy.php index f401b9612..b6bf55aa9 100644 --- a/niucloud/app/api/route/diy.php +++ b/niucloud/app/api/route/diy.php @@ -11,6 +11,7 @@ use app\api\middleware\ApiCheckToken; use app\api\middleware\ApiLog; +use app\api\middleware\AllowCrossDomain; use think\facade\Route; @@ -26,5 +27,5 @@ Route::group('diy', function() { Route::get('share', 'diy.Diy/share'); -})->middleware(ApiLog::class) +})->middleware(AllowCrossDomain::class)->middleware(ApiLog::class) ->middleware(ApiCheckToken::class, false); \ No newline at end of file diff --git a/niucloud/app/api/route/file.php b/niucloud/app/api/route/file.php index 622686c6c..8dc48da4e 100644 --- a/niucloud/app/api/route/file.php +++ b/niucloud/app/api/route/file.php @@ -12,6 +12,7 @@ use app\api\middleware\ApiChannel; use app\api\middleware\ApiCheckToken; use app\api\middleware\ApiLog; +use app\api\middleware\AllowCrossDomain; use think\facade\Route; @@ -28,6 +29,6 @@ Route::group('file', function () { //base64图片 Route::post('image/base64', 'upload.Upload/imageBase64'); -})->middleware(ApiChannel::class) +})->middleware(AllowCrossDomain::class)->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class, true) ->middleware(ApiLog::class); \ No newline at end of file diff --git a/niucloud/app/api/route/member.php b/niucloud/app/api/route/member.php index 209c550d4..c6c01fd7a 100644 --- a/niucloud/app/api/route/member.php +++ b/niucloud/app/api/route/member.php @@ -12,6 +12,7 @@ use app\api\middleware\ApiChannel; use app\api\middleware\ApiCheckToken; use app\api\middleware\ApiLog; +use app\api\middleware\AllowCrossDomain; use think\facade\Route; @@ -71,7 +72,7 @@ Route::group('member', function() { Route::put('cashout_account/:account_id', 'member.CashOutAccount/edit'); // 删除提现账号 Route::delete('cashout_account/:account_id', 'member.CashOutAccount/del'); -})->middleware(ApiChannel::class) +})->middleware(AllowCrossDomain::class)->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class, true) ->middleware(ApiLog::class); @@ -81,6 +82,6 @@ Route::group('member', function() { /***************************************************** 会员管理 ****************************************************/ //会员日志 Route::post('log', 'member.Member/log'); -})->middleware(ApiChannel::class) +})->middleware(AllowCrossDomain::class)->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class) ->middleware(ApiLog::class); \ No newline at end of file diff --git a/niucloud/app/api/route/order.php b/niucloud/app/api/route/order.php index d9d60aad3..ece59a8bd 100644 --- a/niucloud/app/api/route/order.php +++ b/niucloud/app/api/route/order.php @@ -12,6 +12,7 @@ use app\api\middleware\ApiChannel; use app\api\middleware\ApiCheckToken; use app\api\middleware\ApiLog; +use app\api\middleware\AllowCrossDomain; use think\facade\Route; @@ -27,6 +28,6 @@ Route::group('order', function () { Route::get('recharge', 'order.Recharge/lists'); // 充值订单详情 Route::get('recharge/:order_id', 'order.Recharge/detail'); -})->middleware(ApiChannel::class) +})->middleware(AllowCrossDomain::class)->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class, true) ->middleware(ApiLog::class); \ No newline at end of file diff --git a/niucloud/app/api/route/pay.php b/niucloud/app/api/route/pay.php index 65b555be3..f8bb7356d 100644 --- a/niucloud/app/api/route/pay.php +++ b/niucloud/app/api/route/pay.php @@ -11,6 +11,7 @@ use app\api\middleware\ApiChannel; use app\api\middleware\ApiCheckToken; +use app\api\middleware\AllowCrossDomain; use app\api\middleware\ApiLog; use think\facade\Route; @@ -18,7 +19,7 @@ use think\facade\Route; Route::any('pay/notify/:site_id/:channel/:type/:action', 'pay.Pay/notify') ->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class) - ->middleware(ApiLog::class); + ->middleware(ApiLog::class)->allowCrossDomain(); /** * 路由 */ @@ -28,6 +29,6 @@ Route::group('pay',function () { //支付信息 Route::get('info/:out_trade_no', 'pay.Pay/info'); -})->middleware(ApiChannel::class) +})->middleware(AllowCrossDomain::class)->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class) ->middleware(ApiLog::class); \ No newline at end of file diff --git a/niucloud/app/api/route/route.php b/niucloud/app/api/route/route.php index 378217eff..fffc672f3 100644 --- a/niucloud/app/api/route/route.php +++ b/niucloud/app/api/route/route.php @@ -13,12 +13,13 @@ use app\api\middleware\ApiChannel; use app\api\middleware\ApiCheckToken; use app\api\middleware\ApiLog; use think\facade\Route; +use app\api\middleware\AllowCrossDomain; //公众号消息推送 Route::any('wechat/serve/:site_id', 'wechat.Serve/serve') ->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class) - ->middleware(ApiLog::class); + ->middleware(ApiLog::class)->allowCrossDomain(); /** @@ -74,7 +75,8 @@ Route::group(function () { Route::get('site', 'sys.Config/site'); //场景域名 Route::get('scene_domain', 'sys.Config/getSceneDomain'); -})->middleware(ApiChannel::class) +})->middleware(AllowCrossDomain::class) + ->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class) ->middleware(ApiLog::class); //加载插件路由 diff --git a/niucloud/app/dict/sys/SmsDict.php b/niucloud/app/dict/sys/SmsDict.php index 6b8996a04..bc933e4c6 100644 --- a/niucloud/app/dict/sys/SmsDict.php +++ b/niucloud/app/dict/sys/SmsDict.php @@ -19,7 +19,7 @@ namespace app\dict\sys; class SmsDict { //阿里云短信 - const ALISMS = 'ali'; + const ALISMS = 'aliyun'; //腾讯云短信 const TENCENTSMS = 'tencent'; diff --git a/niucloud/app/dict/sys/StorageDict.php b/niucloud/app/dict/sys/StorageDict.php index ef231054f..1b06d4499 100644 --- a/niucloud/app/dict/sys/StorageDict.php +++ b/niucloud/app/dict/sys/StorageDict.php @@ -25,7 +25,7 @@ class StorageDict const QINIU = 'qiniu'; //阿里云存储 - const ALI = 'ali'; + const ALI = 'aliyun'; //腾讯云存储 const TENCENT = 'tencent'; diff --git a/niucloud/app/install/controller/Index.php b/niucloud/app/install/controller/Index.php index 45a44429d..c24c613fb 100644 --- a/niucloud/app/install/controller/Index.php +++ b/niucloud/app/install/controller/Index.php @@ -234,6 +234,11 @@ class Index extends BaseInstall return fail('平台信息不能为空!'); } + if ($site_username == $username) { + $this->setSuccessLog([ '站点管理员和平台管理员不能相同，请重新输入', 'error' ]); + return fail('站点管理员和平台管理员不能相同，请重新输入'); + } + if ($password != $password2) { $this->setSuccessLog([ '平台两次密码输入不一样，请重新输入', 'error' ]); return fail('平台两次密码输入不一样，请重新输入'); @@ -244,6 +249,11 @@ class Index extends BaseInstall return fail('平台信息不能为空!'); } + if($site_username == $username) { + $this->setSuccessLog([ '站点账号不能跟平台账号一致', 'error' ]); + return fail('站点账号不能跟平台账号一致!'); + } + if ($site_password != $site_password2) { $this->setSuccessLog([ '站点两次密码输入不一样，请重新输入', 'error' ]); return fail('站点两次密码输入不一样，请重新输入'); @@ -292,7 +302,11 @@ class Index extends BaseInstall } if ($site_name == '' || $site_username == '' || $site_password == '') { - return fail('平台信息不能为空!'); + return fail('站点信息不能为空!'); + } + + if($site_username == $username) { + return fail('站点账号不能跟平台账号一致'); } if ($site_password != $site_password2) { diff --git a/niucloud/app/install/source/database.sql b/niucloud/app/install/source/database.sql index 103663038..08191173c 100644 --- a/niucloud/app/install/source/database.sql +++ b/niucloud/app/install/source/database.sql @@ -1210,9 +1210,9 @@ CREATE TABLE jobs ( id int(11) NOT NULL AUTO_INCREMENT, queue varchar(255) NOT NULL, payload longtext NOT NULL, - attempts tinyint(3) UNSIGNED NOT NULL, - reserved tinyint(3) UNSIGNED NOT NULL, - reserve_time int(10) UNSIGNED DEFAULT NULL, + attempts tinyint(3) UNSIGNED NOT NULL DEFAULT 0, + reserved tinyint(3) UNSIGNED NOT NULL DEFAULT 0, + reserve_time int(10) UNSIGNED DEFAULT 0, available_time int(10) UNSIGNED NOT NULL, create_time int(10) UNSIGNED NOT NULL, PRIMARY KEY (id) diff --git a/niucloud/app/install/view/index/step-4.html b/niucloud/app/install/view/index/step-4.html index 30836fa6b..b35749feb 100644 --- a/niucloud/app/install/view/index/step-4.html +++ b/niucloud/app/install/view/index/step-4.html @@ -50,7 +50,7 @@ 站点电脑端 -
  • +
  • diff --git a/niucloud/app/lang/en/dict.php b/niucloud/app/lang/en/dict.php index 76415025e..ae628e563 100644 --- a/niucloud/app/lang/en/dict.php +++ b/niucloud/app/lang/en/dict.php @@ -62,7 +62,7 @@ return [ //存储方式 'storage_type_local' => 'local', 'storage_type_qiniu' => 'qiniu', - 'storage_type_ali' => 'ali', + 'storage_type_ali' => 'aliyun', 'storage_type_qcloud' => 'tencent', ], diff --git a/niucloud/app/lang/zh-cn/api.php b/niucloud/app/lang/zh-cn/api.php index 3b0cd093b..832ee5ea6 100644 --- a/niucloud/app/lang/zh-cn/api.php +++ b/niucloud/app/lang/zh-cn/api.php @@ -106,6 +106,7 @@ return [ 'WECHAT_TEMPLATE_NEED_NO' => '微信消息模板缺少模板编号', 'NOTICE_NOT_OPEN_SMS' => '当前消息未开启短信发送', 'NOTICE_SMS_EMPTY' => '手机号为空', + 'NOTICE_SMS_NOT_OPEN' => '短信未启用', //会员相关 'MOBILE_IS_EXIST' => '当前手机号已绑定账号', diff --git a/niucloud/app/listener/notice/Sms.php b/niucloud/app/listener/notice/Sms.php index 32b61941b..616050330 100644 --- a/niucloud/app/listener/notice/Sms.php +++ b/niucloud/app/listener/notice/Sms.php @@ -20,7 +20,7 @@ class Sms $to = $data['to'];//发送对象主题 $mobile = $to['mobile'] ?? ''; //完全信任消息的设置, 不再依赖support_type - if (!$template['is_sms']) { + if ($template['is_sms']) { $sms_id = $template['sms_id'];//发送模板id $content = $template['sms_content']; $member_id = $to['member_id'] ?? 0; diff --git a/niucloud/app/listener/notice/Weapp.php b/niucloud/app/listener/notice/Weapp.php index 709b6f612..605d60af7 100644 --- a/niucloud/app/listener/notice/Weapp.php +++ b/niucloud/app/listener/notice/Weapp.php @@ -73,10 +73,6 @@ class Weapp } } } - }else { - if (!$template['async']) { - throw new NoticeException('WEAPP_TEMPLATE_NOTICE_NOT_OPEN'); - } } return true; } diff --git a/niucloud/app/listener/notice/Wechat.php b/niucloud/app/listener/notice/Wechat.php index 0dd8bde45..aed5d10c0 100644 --- a/niucloud/app/listener/notice/Wechat.php +++ b/niucloud/app/listener/notice/Wechat.php @@ -84,10 +84,6 @@ class Wechat } } } - }else { - if (!$template['async']) { - throw new NoticeException('WECHAT_TEMPLATE_NOTICE_NOT_OPEN'); - } } return true; } diff --git a/niucloud/app/listener/notice_template/MemberVerifySuccess.php b/niucloud/app/listener/notice_template/MemberVerifySuccess.php index 3fdfd7dbf..3ae18c176 100644 --- a/niucloud/app/listener/notice_template/MemberVerifySuccess.php +++ b/niucloud/app/listener/notice_template/MemberVerifySuccess.php @@ -14,9 +14,10 @@ class MemberVerifySuccess extends BaseNoticeTemplate private $key = 'member_verify_code'; - public function handle(array $data) + public function handle(array $params) { - if ($this->key == $data['key']) { + if ($this->key == $params['key']){ + $data = $params['data']; return $this->toReturn( [ 'code' => $data['code'], diff --git a/niucloud/app/listener/site/AddSiteAfterListener.php b/niucloud/app/listener/site/AddSiteAfterListener.php index 9896e8a5e..154f3372c 100644 --- a/niucloud/app/listener/site/AddSiteAfterListener.php +++ b/niucloud/app/listener/site/AddSiteAfterListener.php @@ -28,7 +28,7 @@ class AddSiteAfterListener { // 初始化文章数据 - ( new InstallArticleService() )->install([ 'site_id' => $data[ 'site_id' ] ]); +// ( new InstallArticleService() )->install([ 'site_id' => $data[ 'site_id' ] ]); //加载插件语言包 return; } diff --git a/niucloud/app/service/admin/diy/DiyService.php b/niucloud/app/service/admin/diy/DiyService.php index 776740e8f..9b3d700bf 100644 --- a/niucloud/app/service/admin/diy/DiyService.php +++ b/niucloud/app/service/admin/diy/DiyService.php @@ -229,6 +229,7 @@ class DiyService extends BaseAdminService } $data[ 'component' ] = $this->getComponentList($data[ 'name' ]); $data[ 'domain_url' ] = ( new SystemService() )->getUrl(); + $data[ 'site_id' ] = $this->site_id; return $data; } diff --git a/niucloud/app/service/admin/stat/SiteStatService.php b/niucloud/app/service/admin/stat/SiteStatService.php index 259df6ac8..3752c9709 100644 --- a/niucloud/app/service/admin/stat/SiteStatService.php +++ b/niucloud/app/service/admin/stat/SiteStatService.php @@ -19,6 +19,7 @@ use app\service\admin\sys\SystemService; use app\service\core\member\CoreMemberService; use Carbon\Carbon; use core\base\BaseAdminService; +use think\facade\Db; /** @@ -54,7 +55,7 @@ class SiteStatService extends BaseAdminService 'version' => [], 'visit_stat' => [ 'date' => [], - 'value' => [980,1323,882,762,865,923,1105] + 'value' => [] ], 'member_stat' => [ 'type' => ['男','女','未知'], @@ -88,7 +89,12 @@ class SiteStatService extends BaseAdminService $data['system'] = (new SystemService())->getInfo(); $data['version'] = $data['system']['version'] ?? []; $time = time(); - for ($i=1; $i<=7; $i++) $data['visit_stat']['date'][] = date('Y-m-d', strtotime( '+' . $i-7 .' days', $time)); + for ($i=1; $i<=7; $i++){ + $time_data = date('Y-m-d', strtotime( '+' . $i-7 .' days', $time)); + $data['visit_stat']['date'][] = $time_data; + $time_arr = get_start_and_end_time_by_day($time_data); + $data['visit_stat']['value'][] = (new MemberService())->getCount([[ '', 'exp', Db::raw('(`create_time` >= ' . $time_arr[0] . ') and (`create_time` < ' . $time_arr[1] . ')') ]]); + } $member_count = (new MemberService())->getCount(); $man_count = (new MemberService())->getCount([ ['sex', '=', '1'] ]); $woman_count = (new MemberService())->getCount([ ['sex', '=', '2'] ]); diff --git a/niucloud/app/service/admin/sys/SystemService.php b/niucloud/app/service/admin/sys/SystemService.php index 46389ea2a..c2f0dda6b 100644 --- a/niucloud/app/service/admin/sys/SystemService.php +++ b/niucloud/app/service/admin/sys/SystemService.php @@ -49,7 +49,7 @@ class SystemService extends BaseAdminService */ public function getUrl() { - $site_tag = $this->site_id == 1 ? '' : '/s' . $this->site_id; + $site_tag = $this->site_id == 31 ? '' : '/s' . $this->site_id; $data = [ 'wap_url' => ( !empty(env("system.wap_domain")) ? env("system.wap_domain") : request()->domain() ) . "/wap" . $site_tag, 'web_url' => ( !empty(env("system.web_domain")) ? env("system.web_domain") : request()->domain() ) . "/web" . $site_tag, @@ -122,11 +122,11 @@ class SystemService extends BaseAdminService * 清理缓存 */ public function schemaCache(){ + if (is_dir(dirname($_SERVER['DOCUMENT_ROOT']) . '/runtime/schema')) { rmdirs(dirname($_SERVER['DOCUMENT_ROOT']) . '/runtime/schema'); - return 'CLEAR_MYSQL_CACHE_SUCCESS'; } - return; + return 'CLEAR_MYSQL_CACHE_SUCCESS'; } /** diff --git a/niucloud/app/service/api/login/RegisterService.php b/niucloud/app/service/api/login/RegisterService.php index e477c0453..0f86b077c 100644 --- a/niucloud/app/service/api/login/RegisterService.php +++ b/niucloud/app/service/api/login/RegisterService.php @@ -50,7 +50,7 @@ class RegisterService extends BaseApiService $member_id = $data; } else{ if(empty($data['nickname'])){ - $data['nickname'] = $data['username'] ?? substr_replace($data['mobile'], '****', 3, 4) ?? $this->createName(); + $data['nickname'] = $data['username'] ?? !empty($mobile) ? substr_replace($mobile, '****', 3, 4) : $this->createName(); } $data['register_channel'] = $this->channel; $data['register_type'] = $type; diff --git a/niucloud/app/service/api/notice/NoticeService.php b/niucloud/app/service/api/notice/NoticeService.php index 2f7b274be..ff93950d5 100644 --- a/niucloud/app/service/api/notice/NoticeService.php +++ b/niucloud/app/service/api/notice/NoticeService.php @@ -31,7 +31,6 @@ class NoticeService extends BaseApiService * 发送消息 * @param $key * @param $data - * @param bool $is_delay 是否延时 * @return bool */ public function send($key, $data) diff --git a/niucloud/app/service/api/wechat/WechatAuthService.php b/niucloud/app/service/api/wechat/WechatAuthService.php index 5dce091bc..4706491c8 100644 --- a/niucloud/app/service/api/wechat/WechatAuthService.php +++ b/niucloud/app/service/api/wechat/WechatAuthService.php @@ -109,7 +109,7 @@ class WechatAuthService extends BaseApiService $is_bind_mobile = $config['is_bind_mobile']; $is_auth_register = $config['is_auth_register']; if ($is_bind_mobile == 0 && $is_auth_register == 1) { - return $this->register($openid); + return $this->register($openid, '', $nickname, $avatar); } else { return ['avatar' => $avatar, 'nickname' => $nickname, 'openid' => $openid]; } @@ -146,7 +146,7 @@ class WechatAuthService extends BaseApiService * @return void * @throws InvalidArgumentException */ - public function register(string $openid, string|int $mobile = '') + public function register(string $openid, string|int $mobile = '', string $nickname = '', string $avatar = '') { $member_service = new MemberService(); $member_info = $member_service->findMemberInfo(['wx_openid' => $openid, 'site_id' => $this->site_id]); @@ -155,6 +155,8 @@ class WechatAuthService extends BaseApiService $result = $register_service->register($mobile, [ 'wx_openid' => $openid, + 'nickname' => $nickname, + 'headimg' => $avatar ], MemberRegisterTypeDict::WECHAT ); diff --git a/niucloud/app/service/core/addon/CoreAddonInstallService.php b/niucloud/app/service/core/addon/CoreAddonInstallService.php index adb99593a..197b70d8f 100644 --- a/niucloud/app/service/core/addon/CoreAddonInstallService.php +++ b/niucloud/app/service/core/addon/CoreAddonInstallService.php @@ -518,6 +518,7 @@ class CoreAddonInstallService extends CoreAddonBaseService $core_addon_service->set($install_data); //清理缓存 Cache::tag(self::$cache_tag_name)->clear(); + Cache::set("local_install_addons", []); //执行命令 //执行插件安装方法 $class = "addon\\" . $this->addon . "\\" . Str::studly($this->addon); @@ -559,7 +560,7 @@ class CoreAddonInstallService extends CoreAddonBaseService $core_addon_service = new CoreAddonService(); $core_addon_service->delByKey($this->addon); - + Cache::set("local_install_addons", []); //清理缓存 Cache::tag(self::$cache_tag_name)->clear(); return true; diff --git a/niucloud/app/service/core/addon/CoreAddonService.php b/niucloud/app/service/core/addon/CoreAddonService.php index 6fc3f9f9e..e259280fe 100644 --- a/niucloud/app/service/core/addon/CoreAddonService.php +++ b/niucloud/app/service/core/addon/CoreAddonService.php @@ -39,13 +39,17 @@ class CoreAddonService extends CoreAddonBaseService $install_addon_list = $this->model->append(['status_name'])->column('title, icon, key, desc, status, author, version, install_time, update_time, cover', 'key'); foreach($files as $path) { $data = $this->getAddonConfig($path); - $icon = addon_resource($data['key'], "icon.png"); - $data['icon'] = is_file($icon) ? $icon : ''; - $cover = addon_resource($data['key'], "cover.png"); - $data['cover'] = is_file($cover) ? $cover : ''; - $key = $data['key']; - $data['install_info'] = $install_addon_list[$key] ?? []; - $list[] = $data; + if(isset($data['key'])) + { + $icon = addon_resource($data['key'], "icon.png"); + $data['icon'] = is_file($icon) ? $icon : ''; + $cover = addon_resource($data['key'], "cover.png"); + $data['cover'] = is_file($cover) ? $cover : ''; + $key = $data['key']; + $data['install_info'] = $install_addon_list[$key] ?? []; + $list[] = $data; + } + } } return $list; diff --git a/niucloud/app/service/core/notice/CoreSmsService.php b/niucloud/app/service/core/notice/CoreSmsService.php index 0a21726f4..557c58b85 100644 --- a/niucloud/app/service/core/notice/CoreSmsService.php +++ b/niucloud/app/service/core/notice/CoreSmsService.php @@ -94,7 +94,7 @@ class CoreSmsService extends BaseCoreService { $info = (new CoreConfigService())->getConfig($site_id, 'SMS')['value'] ?? []; if (empty($info)) - throw new NoticeException('NO_SMS_DRIVER_OPEN'); + throw new NoticeException('NOTICE_SMS_NOT_OPEN'); $sms_type = $info['default'] ?? ''; $config = array( diff --git a/niucloud/app/service/core/notice/NoticeService.php b/niucloud/app/service/core/notice/NoticeService.php index d78f88bff..f1d5b5dbe 100644 --- a/niucloud/app/service/core/notice/NoticeService.php +++ b/niucloud/app/service/core/notice/NoticeService.php @@ -48,6 +48,6 @@ class NoticeService extends BaseCoreService $template = (new CoreNoticeService())->getInfo($site_id, $key); if(empty($template)) return false; - return Notice::invoke(['site_id' => $site_id, 'key' => $key, 'data' => $data, 'template' => $template], is_open:$template['async']); + return Notice::invoke(['site_id' => $site_id, 'key' => $key, 'data' => $data, 'template' => $template], is_async:false); } } \ No newline at end of file diff --git a/niucloud/app/service/core/sys/CoreAttachmentService.php b/niucloud/app/service/core/sys/CoreAttachmentService.php index ef222f46f..47279aee8 100644 --- a/niucloud/app/service/core/sys/CoreAttachmentService.php +++ b/niucloud/app/service/core/sys/CoreAttachmentService.php @@ -13,11 +13,9 @@ namespace app\service\core\sys; use app\model\sys\SysAttachment; use app\service\core\upload\CoreFileService; -use app\service\core\upload\CoreStorageService; use core\base\BaseCoreService; use core\exception\AdminException; use core\exception\UploadFileException; -use core\upload\FileDriver; use think\db\exception\DataNotFoundException; use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; diff --git a/niucloud/app/service/core/upload/CoreStorageService.php b/niucloud/app/service/core/upload/CoreStorageService.php index 3eae7c841..b9f64e21b 100644 --- a/niucloud/app/service/core/upload/CoreStorageService.php +++ b/niucloud/app/service/core/upload/CoreStorageService.php @@ -28,7 +28,7 @@ class CoreStorageService extends BaseCoreService */ public function getDefaultStorage(int $site_id = 0) { - $storage_list = $this->getStorageList($site_id); + $storage_list = $this->getStorageConfigList($site_id); foreach($storage_list as $k => $v){ if($v['is_use'] == StorageDict::ON){ $item_storage = $v['params'] ?? []; @@ -76,4 +76,28 @@ class CoreStorageService extends BaseCoreService } return $list; } + + + /** + * 获取配置列表 + * @param int $site_id + * @return array + */ + public function getStorageConfigList(int $site_id = 0) + { + $config_type = $this->getStorageConfig($site_id); + $storage_type_list = StorageDict::getType(); + $list = []; + foreach ($storage_type_list as $k => $v) { + $data = []; + $data['storage_type'] = $k; + $data['is_use'] = $k == $config_type['default'] ? StorageDict::ON : StorageDict::OFF; + $data['name'] = $v['name']; + foreach ($v['params'] as $k_param => $v_param) { + $data['params'][$k_param] = $config_type[$k][$k_param] ?? ''; + } + $list[] = $data; + } + return $list; + } } \ No newline at end of file diff --git a/niucloud/core/base/BaseJob.php b/niucloud/core/base/BaseJob.php index 8d702c4b8..d69010191 100644 --- a/niucloud/core/base/BaseJob.php +++ b/niucloud/core/base/BaseJob.php @@ -34,7 +34,7 @@ abstract class BaseJob extends Dispatch /** - * 运行队列 + * 消费任务 * @param Job $job * @param $params */ @@ -52,7 +52,7 @@ abstract class BaseJob extends Dispatch /** - * 执行队列 + * 执行任务 * @param string $action * @param Job $job * @param array $data diff --git a/niucloud/core/dict/BaseDict.php b/niucloud/core/dict/BaseDict.php index fb73386fa..d9d4e5226 100644 --- a/niucloud/core/dict/BaseDict.php +++ b/niucloud/core/dict/BaseDict.php @@ -42,19 +42,13 @@ abstract class BaseDict extends Storage //尚未安装不加载插件 return []; } - $cache_name = "local_install_addons"; - return cache_remember( - $cache_name, - function () { - $list = Db::name("addon")->column("key"); - return $list; - }, - self::$cache_tag_name - ); -// return Cache::tag(self::$cache_tag_name)->remember($cache_name, function () { -// $list = Db::name("addon")->column("key"); -// return $list; -// }); + $addons = Cache::get("local_install_addons"); + if(empty($addons)) + { + $addons = Db::name("addon")->column("key"); + Cache::set("local_install_addons", $addons); + } + return $addons; } /** diff --git a/niucloud/core/sms/Aliyun.php b/niucloud/core/sms/Aliyun.php index af4ea98c7..88b22803a 100644 --- a/niucloud/core/sms/Aliyun.php +++ b/niucloud/core/sms/Aliyun.php @@ -47,7 +47,6 @@ class Aliyun extends BaseSms AlibabaCloud::accessKeyClient($this->app_key, $this->secret_key) ->regionId('cn-hangzhou') ->asDefaultClient(); - $result = AlibabaCloud::rpcRequest() ->product('Dysmsapi') ->host('dysmsapi.aliyuncs.com') @@ -60,7 +59,7 @@ class Aliyun extends BaseSms 'PhoneNumbers' => $mobile, 'SignName' => $this->sign, 'TemplateCode' => $template_id, - 'TemplateParam' => $data, + 'TemplateParam' => json_encode($data, JSON_UNESCAPED_UNICODE), ], ]) ->request(); diff --git a/niucloud/core/upload/BaseUpload.php b/niucloud/core/upload/BaseUpload.php index 7a382787f..bad64d0fb 100644 --- a/niucloud/core/upload/BaseUpload.php +++ b/niucloud/core/upload/BaseUpload.php @@ -8,15 +8,12 @@ // +---------------------------------------------------------------------- // | Author: Niucloud Team // +---------------------------------------------------------------------- - namespace core\upload; - use app\service\core\upload\CoreUploadConfigService; use core\exception\UploadFileException; use core\loader\DriverConfig; use core\loader\Storage; - /** * Class BaseUpload */ diff --git a/niucloud/core/upload/Local.php b/niucloud/core/upload/Local.php index 258ce7c9d..d4e8c3a53 100644 --- a/niucloud/core/upload/Local.php +++ b/niucloud/core/upload/Local.php @@ -1,11 +1,4 @@