+ {notempty name='showErrorMessage'}
+
+ 系统提示：{$showErrorMessage|raw}
+
+ {/notempty}
{block name='content'}{/block}
diff --git a/app/admin/view/table.html b/app/admin/view/table.html
index 47c21aaad..83fdb3566 100644
--- a/app/admin/view/table.html
+++ b/app/admin/view/table.html
@@ -3,7 +3,7 @@
{block name='header'}
{notempty name='title'}
{/notempty}
@@ -11,6 +11,11 @@
+ {notempty name='showErrorMessage'}
+
+ 系统提示：{$showErrorMessage|raw}
+
+ {/notempty}
{block name='content'}{/block}
diff --git a/app/wechat/command/Auto.php b/app/wechat/command/Auto.php
index aa923c618..0fe89a4b1 100644
--- a/app/wechat/command/Auto.php
+++ b/app/wechat/command/Auto.php
@@ -61,13 +61,13 @@ class Auto extends Command
{
$code = $input->getArgument('autocode');
$this->openid = $input->getArgument('openid');
- if (empty($code)) $this->setQueueError("Message Code cannot be empty");
- if (empty($this->openid)) $this->setQueueError("Wechat Openid cannot be empty");
+ if (empty($code)) $this->setQueueError('Message Code cannot be empty');
+ if (empty($this->openid)) $this->setQueueError('Wechat Openid cannot be empty');
// 查询微信消息对象
$map = ['code' => $code, 'status' => 1];
$data = WechatAuto::mk()->where($map)->find();
- if (empty($data)) $this->setQueueError("Message Data Query failed");
+ if (empty($data)) $this->setQueueError('Message Data Query failed');
// 发送微信客服消息
$this->buildMessage($data->toArray());
diff --git a/app/wechat/command/Clear.php b/app/wechat/command/Clear.php
index 1392f2d3b..b9e6a20ed 100644
--- a/app/wechat/command/Clear.php
+++ b/app/wechat/command/Clear.php
@@ -49,12 +49,12 @@ class Clear extends Command
$query->where(['payment_status' => 0]);
$query->whereTime('create_time', '<', strtotime('-24 hours'));
[$total, $count] = [(clone $query)->count(), 0];
- if (empty($total)) $this->setQueueSuccess("没有需要清理的24小时未支付数据！");
+ if (empty($total)) $this->setQueueSuccess('无需清理24小时未支付！');
/** @var \think\Model $item */
foreach ($query->cursor() as $item) {
- $this->setQueueMessage($total, ++$count, "开始清理 {$item->getAttr('code')} 支付单...");
+ $this->setQueueMessage($total, ++$count, sprintf('开始清理 %s 支付单...', $item->getAttr('code')));
$item->delete();
- $this->setQueueMessage($total, $count, "完成清理 {$item->getAttr('code')} 支付单!!!", 1);
+ $this->setQueueMessage($total, $count, sprintf('完成清理 %s 支付单！', $item->getAttr('code')), 1);
}
}
}
\ No newline at end of file
diff --git a/app/wechat/command/Fans.php b/app/wechat/command/Fans.php
index e8e077208..81843ef58 100644
--- a/app/wechat/command/Fans.php
+++ b/app/wechat/command/Fans.php
@@ -84,7 +84,7 @@ class Fans extends Command
}
$this->process->message($done > 0 ? '微信用户数据获取完成' : '未获取到微信用户数据');
$this->process->message('');
- return "共获取 {$done} 个用户数据";
+ return sprintf('共获取 %d 个用户数据', $done);
}
/**
@@ -98,7 +98,7 @@ class Fans extends Command
public function _black(string $next = '', int $done = 0): string
{
$wechat = WechatService::WeChatUser();
- $this->setQueueProgress("开始更新黑名单列表");
+ $this->setQueueProgress('开始更新黑名单列表');
// 清理原来的黑名单，重新批量更新黑名单列表
WechatFans::mk()->where(['is_black' => 1])->update(['is_black' => 0]);
@@ -112,12 +112,12 @@ class Fans extends Command
}
$next = $result['total'] > $done ? $result['next_openid'] : null;
}
- $this->setQueueProgress("完成更新 {$result['total']} 个黑名单", null, 1);
+ $this->setQueueProgress(sprintf('完成更新 %v 个黑名单', $result['total']), null, 1);
$this->output->newLine();
if (empty($result['total'])) {
return ', 其中黑名单 0 人';
} else {
- return ", 其中黑名单 {$result['total']} 人";
+ return sprintf(', 其中黑名单 %v 人', $result['total']);
}
}
@@ -144,6 +144,6 @@ class Fans extends Command
}
$this->output->comment($done > 0 ? '微信用户标签数据获取完成' : '未获取到微信用户标签数据');
$this->output->newLine();
- return ", 获取到 {$done} 个标签";
+ return sprintf(', 获取到 %v 个标签', $done);
}
}
diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php
index b5858c320..ce6aa534e 100644
--- a/app/wechat/controller/Config.php
+++ b/app/wechat/controller/Config.php
@@ -96,8 +96,8 @@ class Config extends Controller
$auth = sysconf('wechat.service_authurl|raw') ?: "https://open.cuci.cc/service/api.push/auth?source=SOURCE";
$jsonRpc = sysconf('wechat.service_jsonrpc|raw') ?: 'https://open.cuci.cc/service/api.client/jsonrpc?token=TOKEN¬_init_session=1';
Builder::mk()
- ->addTextInput('auth_url', '公众号授权跳转入口', 'Getway', true, '进行微信授权时会跳转到这个页面，由微信管理员扫二维码进行授权。', '^https?://.*?auth.*?(\?|\&)source=SOURCE')
- ->addTextInput('json_rpc', '第三方服务平台接口', 'JsonRpc', true, '由应用插件 ThinkPlugsWechatService 提供的第三方服务平台 JSON-RPC 接口地址。', '^https?://.*?jsonrpc.*?(\?|\&)token=TOKEN')
+ ->addTextInput('auth_url', '公众号授权跳转入口', 'Getway', true, '进行微信授权时会跳转到这个页面，由微信管理员扫二维码进行授权。', '^https?://.*?auth.*?source=SOURCE')
+ ->addTextInput('json_rpc', '第三方服务平台接口', 'JsonRpc', true, '由应用插件