blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.com/zoujingli/ThinkAdmin into dev

Browse Source
This commit is contained in:
邹景立 2022-10-25 15:04:33 +08:00
commit 180f044e37
7 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/admin/view/api/upload.js
View File

@ -72,12 +72,14 @@ 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);
}
}), layui.each(files, function (index, 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;
// 图片限宽限高压缩

6
app/admin/view/api/upload/image.html
View File

@ -130,12 +130,14 @@
<label class="layui-hide" id="ImageDialogUploadLayout">
<!-- 图片上传组件 开始 -->
{if isset($get.file) && $get.file eq 'image'}
<button data-file="one" data-type="gif,png,jpg,jpeg" data-path="{$get.path|default=''}"
<button data-file="one" data-type="gif,png,jpg,jpeg"
data-path="{$get.path|default=''}" data-size="{$get.size|default=0}"
data-cut-width="{$get.cutWidth|default=0}" data-cut-height="{$get.cutHeight|default=0}"
data-max-width="{$get.maxWidth|default=0}" data-max-height="{$get.maxHeight|default=0}"
></button>
{else}
<button data-file="mul" data-type="gif,png,jpg,jpeg" data-path="{$get.path|default=''}"
<button data-file="mul" data-type="gif,png,jpg,jpeg"
data-path="{$get.path|default=''}" data-size="{$get.size|default=0}"
data-cut-width="{$get.cutWidth|default=0}" data-cut-height="{$get.cutHeight|default=0}"
data-max-width="{$get.maxWidth|default=0}" data-max-height="{$get.maxHeight|default=0}"
></button>

2
app/admin/view/config/storage-qiniu.html
View File

@ -32,7 +32,7 @@
<b class="color-green">存储区域</b><br><span class="nowrap color-desc label-required">Region</span>
</label>
<div class="layui-input-block">
<select class="layui-select" name="storage.txcos_point" lay-search>
<select class="layui-select" name="storage.qiniu_region" lay-search>
{foreach $points as $point => $title}
{if sysconf('storage.qiniu_region') eq $point}
<option selected value="{$point}">{$title}（ {$point} ）</option>

9
app/wechat/command/Fans.php
View File

@ -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} 个用户数据";
}

6
app/wechat/view/fans/index.html
View File

@ -33,11 +33,11 @@
{
field: 'headimg', title: '头像', width: 65, align: "center", templet: function (d) {
d.headimgurl = d.headimgurl || '';
return d.headimgurl ? '<div class="headimg headimg-xs margin-0" data-tips-image data-tips-hover data-lazy-src="' + d.headimgurl + '" style="background-image:url(' + d.headimgurl + ')"></div>' : '';
return d.headimgurl ? '<div class="headimg headimg-xs margin-0" data-tips-image data-tips-hover data-lazy-src="' + d.headimgurl + '" style="background-image:url(' + d.headimgurl + ')"></div>' : '-';
}
},
{field: 'nickname', title: '微信昵称', align: "center", minWidth: 100},
{field: 'province', title: '所在区域', align: "center", minWidth: 120, templet: '<div>{{d.country}} {{d.province}} {{d.city}}</div>'},
{field: 'nickname', title: '微信昵称', align: "center", minWidth: 100, templet: '<div>{{d.nickname||"-"}}</div>'},
{field: 'province', title: '所在区域', align: "center", minWidth: 120, templet: '<div>{{d.country||"-"}} {{d.province}} {{d.city}}</div>'},
{field: 'sex', title: '性别', align: 'center', minWidth: 80, templet: '<div>{{d.sex==1 ? "男" : (d.sex==2 ? "女" : "未知")}}</div>'},
{field: 'language', title: '使用语言', align: 'center', minWidth: 100, templet: '<div>{{d.language}}</div>'},
{

4
public/index.php
View File

@ -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();
RuntimeService::doWebsiteInit();

4
think
View File

@ -16,10 +16,10 @@
namespace think;
use think\admin\service\SystemService;
use think\admin\service\RuntimeService;
// 加载基础文件
require __DIR__ . '/vendor/autoload.php';
// 命令行应用初始化
SystemService::instance()->doConsoleInit();
RuntimeService::doConsoleInit();