From 825163364b9858c206dbd9ce5af1ddb3e8db11e7 Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 20 Oct 2022 18:10:11 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=206.0.39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.php | 4 ++-- think | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/index.php b/public/index.php index 8d0e0cbb8..a7a0d2715 100644 --- a/public/index.php +++ b/public/index.php @@ -16,10 +16,10 @@ namespace think; -use think\admin\service\SystemService; +use think\admin\service\RuntimeService; // 加载基础文件 require __DIR__ . '/../vendor/autoload.php'; // WEB应用初始化 -SystemService::instance()->doInit(); \ No newline at end of file +RuntimeService::doWebsiteInit(); \ No newline at end of file diff --git a/think b/think index b81565dc3..e092ab9e4 100755 --- a/think +++ b/think @@ -16,10 +16,10 @@ namespace think; -use think\admin\service\SystemService; +use think\admin\service\RuntimeService; // 加载基础文件 require __DIR__ . '/vendor/autoload.php'; // 命令行应用初始化 -SystemService::instance()->doConsoleInit(); \ No newline at end of file +RuntimeService::doConsoleInit(); \ No newline at end of file From 423a12e5694fe0893f408e5e011ddf12ad379570 Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 21 Oct 2022 14:45:34 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/wechat/command/Fans.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/wechat/command/Fans.php b/app/wechat/command/Fans.php index 946ec729c..ac6cbde1b 100644 --- a/app/wechat/command/Fans.php +++ b/app/wechat/command/Fans.php @@ -67,7 +67,7 @@ class Fans extends Command protected function _list(string $next = '', int $done = 0): string { $appid = WechatService::getAppid(); - $this->output->comment('开始获取微信用户数据'); + $this->process->message(0, 0, '开始获取微信用户数据'); while (is_string($next)) { $result = WechatService::WeChatUser()->getUserList($next); if (is_array($result) && !empty($result['data']['openid'])) { @@ -75,8 +75,9 @@ class Fans extends Command $info = WechatService::WeChatUser()->getBatchUserInfo($openids); if (is_array($info) && !empty($info['user_info_list'])) { foreach ($info['user_info_list'] as $user) if (isset($user['nickname'])) { - $this->queue->message($result['total'], ++$done, "-> {$user['openid']} {$user['nickname']}"); + $this->queue->message($result['total'], ++$done, "-> 开始获取 {$user['openid']} {$user['nickname']}"); FansService::set($user, $appid); + $this->queue->message($result['total'], $done, "-> 完成更新 {$user['openid']} {$user['nickname']}", 1); } } } @@ -85,8 +86,8 @@ class Fans extends Command $next = null; } } - $this->output->comment($done > 0 ? '微信用户数据获取完成' : '未获取到微信用户数据'); - $this->output->newLine(); + $this->process->message($done > 0 ? '微信用户数据获取完成' : '未获取到微信用户数据'); + $this->process->message(''); return "共获取 {$done} 个用户数据"; } From 85b8c55b0a15f7e9408645fa638850d526cb786f Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 21 Oct 2022 14:49:16 +0800 Subject: [PATCH 3/7] Update index.html --- app/wechat/view/fans/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/wechat/view/fans/index.html b/app/wechat/view/fans/index.html index b40c3d7f1..4cd04dd74 100644 --- a/app/wechat/view/fans/index.html +++ b/app/wechat/view/fans/index.html @@ -33,11 +33,11 @@ { field: 'headimg', title: '头像', width: 65, align: "center", templet: function (d) { d.headimgurl = d.headimgurl || ''; - return d.headimgurl ? '
' : ''; + return d.headimgurl ? '
' : '-'; } }, - {field: 'nickname', title: '微信昵称', align: "center", minWidth: 100}, - {field: 'province', title: '所在区域', align: "center", minWidth: 120, templet: '
{{d.country}} {{d.province}} {{d.city}}
'}, + {field: 'nickname', title: '微信昵称', align: "center", minWidth: 100, templet: '
{{d.nickname||"-"}}
'}, + {field: 'province', title: '所在区域', align: "center", minWidth: 120, templet: '
{{d.country||"-"}} {{d.province}} {{d.city}}
'}, {field: 'sex', title: '性别', align: 'center', minWidth: 80, templet: '
{{d.sex==1 ? "男" : (d.sex==2 ? "女" : "未知")}}
'}, {field: 'language', title: '使用语言', align: 'center', minWidth: 100, templet: '
{{d.language}}
'}, { From 21b9e107c50494d3758811a13c14902321b8c3db Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 21 Oct 2022 17:51:01 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/api/upload.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/admin/view/api/upload.js b/app/admin/view/api/upload.js index d931d7d28..0b05b7eb2 100644 --- a/app/admin/view/api/upload.js +++ b/app/admin/view/api/upload.js @@ -72,11 +72,12 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) { var that = this.init(); layui.each(files, function (index, file) { that.count.total++, file.index = index, that.files[index] = file; - if (that.option.size && file.size > that.option.size) { - that.event('upload.error', {file: file}, file, '大小超限'); - } else if (!that.option.hide) { + if (!that.option.hide && !file.notify) { file.notify = new NotifyExtend(file); } + if (that.option.size && file.size > that.option.size) { + that.event('upload.error', {file: file}, file, '大小超出限制'); + } }), layui.each(files, function (index, file) { // 禁传异常状态文件 if (typeof file.xstate === 'number' && file.xstate === -1) return; From 45ec382ddc0cbce9dcb68628beb28fd1cf8a3e0b Mon Sep 17 00:00:00 2001 From: Anyon Date: Fri, 21 Oct 2022 17:54:19 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/api/upload/image.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/admin/view/api/upload/image.html b/app/admin/view/api/upload/image.html index 7a058e844..deeee9dd4 100644 --- a/app/admin/view/api/upload/image.html +++ b/app/admin/view/api/upload/image.html @@ -130,12 +130,14 @@
- {foreach $points as $point => $title} {if sysconf('storage.qiniu_region') eq $point}