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

同步插件代码

Browse Source
This commit is contained in:
邹景立 2023-03-25 12:57:39 +08:00
parent a6afa20850
commit 15d33afdd2
34 changed files with 631 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -29,6 +29,7 @@
/database/migrations/20221013031925_install_admin.php /database/migrations/20221013031925_install_admin.php
/database/migrations/20221013031926_install_admin_data.php /database/migrations/20221013031926_install_admin_data.php
/database/migrations/20221013031927_install_admin20230325.php
/database/migrations/20221013045829_install_wechat.php /database/migrations/20221013045829_install_wechat.php
/database/migrations/20221013045830_install_wechat_data.php /database/migrations/20221013045830_install_wechat_data.php
/database/migrations/20221013045838_install_user.php /database/migrations/20221013045838_install_user.php
@ -37,4 +38,4 @@
/database/migrations/20221215000001_install_center_data.php /database/migrations/20221215000001_install_center_data.php
/database/migrations/20230209000001_install_wechat_service.php /database/migrations/20230209000001_install_wechat_service.php
/database/migrations/20230224000001_install_account.php /database/migrations/20230224000001_install_account.php
database/migrations/20230225000001_install_payment.php database/migrations/20230225000001_install_payment.php

2
app/admin/Service.php
View File

@ -20,7 +20,7 @@ use think\admin\Plugin;
/** /**
* 插件服务注册 * 插件服务注册
* Class Service * @class Service
* @package app\admin * @package app\admin
*/ */
class Service extends Plugin class Service extends Plugin

2
app/admin/controller/Auth.php
View File

@ -24,7 +24,7 @@ use think\admin\service\AdminService;
/** /**
* 系统权限管理 * 系统权限管理
* Class Auth * @class Auth
* @package app\admin\controller * @package app\admin\controller
*/ */
class Auth extends Controller class Auth extends Controller

2
app/admin/controller/Base.php
View File

@ -22,7 +22,7 @@ use think\admin\model\SystemBase;
/** /**
* 数据字典管理 * 数据字典管理
* Class Base * @class Base
* @package app\admin\controller * @package app\admin\controller
*/ */
class Base extends Controller class Base extends Controller

2
app/admin/controller/Config.php
View File

@ -27,7 +27,7 @@ use think\admin\storage\TxcosStorage;
/** /**
* 系统参数配置 * 系统参数配置
* Class Config * @class Config
* @package app\admin\controller * @package app\admin\controller
*/ */
class Config extends Controller class Config extends Controller

3
app/admin/controller/File.php
View File

@ -24,7 +24,7 @@ use think\admin\Storage;
/** /**
* 系统文件管理 * 系统文件管理
* Class File * @class File
* @package app\admin\controller * @package app\admin\controller
*/ */
class File extends Controller class File extends Controller
@ -99,6 +99,7 @@ class File extends Controller
* 清理重复文件 * 清理重复文件
* @auth true * @auth true
* @return void * @return void
* @throws \think\db\exception\DbException
*/ */
public function distinct() public function distinct()
{ {

7
app/admin/controller/Index.php
View File

@ -23,7 +23,7 @@ use think\admin\service\MenuService;
/** /**
* 后台界面入口 * 后台界面入口
* Class Index * @class Index
* @package app\admin\controller * @package app\admin\controller
*/ */
class Index extends Controller class Index extends Controller
@ -31,6 +31,7 @@ class Index extends Controller
/** /**
* 显示后台首页 * 显示后台首页
* @throws \ReflectionException * @throws \ReflectionException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
@ -58,9 +59,7 @@ class Index extends Controller
* 后台主题切换 * 后台主题切换
* @login true * @login true
* @return void * @return void
* @throws \think\db\exception\DataNotFoundException * @throws \think\admin\Exception
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/ */
public function theme() public function theme()
{ {

6
app/admin/controller/Login.php
View File

@ -26,7 +26,7 @@ use think\admin\service\SystemService;
/** /**
* 用户登录管理 * 用户登录管理
* Class Login * @class Login
* @package app\admin\controller * @package app\admin\controller
*/ */
class Login extends Controller class Login extends Controller
@ -35,9 +35,7 @@ class Login extends Controller
/** /**
* 后台登录入口 * 后台登录入口
* @return void * @return void
* @throws \think\db\exception\DataNotFoundException * @throws \think\admin\Exception
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/ */
public function index() public function index()
{ {

2
app/admin/controller/Menu.php
View File

@ -25,7 +25,7 @@ use think\admin\service\NodeService;
/** /**
* 系统菜单管理 * 系统菜单管理
* Class Menu * @class Menu
* @package app\admin\controller * @package app\admin\controller
*/ */
class Menu extends Controller class Menu extends Controller

2
app/admin/controller/Oplog.php
View File

@ -25,7 +25,7 @@ use think\exception\HttpResponseException;
/** /**
* 系统日志管理 * 系统日志管理
* Class Oplog * @class Oplog
* @package app\admin\controller * @package app\admin\controller
*/ */
class Oplog extends Controller class Oplog extends Controller

2
app/admin/controller/Queue.php
View File

@ -27,7 +27,7 @@ use think\exception\HttpResponseException;
/** /**
* 系统任务管理 * 系统任务管理
* Class Queue * @class Queue
* @package app\admin\controller * @package app\admin\controller
*/ */
class Queue extends Controller class Queue extends Controller

2
app/admin/controller/User.php
View File

@ -25,7 +25,7 @@ use think\admin\service\AdminService;
/** /**
* 系统用户管理 * 系统用户管理
* Class User * @class User
* @package app\admin\controller * @package app\admin\controller
*/ */
class User extends Controller class User extends Controller

16
app/admin/controller/api/Plugs.php
View File

@ -21,8 +21,8 @@ use think\admin\service\AdminService;
use think\Response; use think\Response;
/** /**
* 通用插件管理 * 扩展插件管理
* Class Plugs * @class Plugs
* @package app\admin\controller\api * @package app\admin\controller\api
*/ */
class Plugs extends Controller class Plugs extends Controller
@ -42,17 +42,17 @@ class Plugs extends Controller
/** /**
* 前端脚本变量 * 前端脚本变量
* @return \think\Response * @return \think\Response
* @throws \think\db\exception\DataNotFoundException * @throws \think\admin\Exception
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/ */
public function script(): Response public function script(): Response
{ {
$token = $this->request->get('uptoken', '');
$domain = boolval(AdminService::withUploadUnid($token));
return response(join("\r\n", [ return response(join("\r\n", [
sprintf("window.taDebug = %s;", $this->app->isDebug() ? 'true' : 'false'), sprintf("window.taDebug = %s;", $this->app->isDebug() ? 'true' : 'false'),
sprintf("window.taAdmin = '%s';", sysuri('admin/index/index', [], false)), sprintf("window.taAdmin = '%s';", sysuri('admin/index/index', [], false, $domain)),
sprintf("window.taEditor = '%s';", sysconf('base.editor|raw') ?: 'ckeditor4'), sprintf("window.taEditor = '%s';", sysconf('base.editor|raw') ?: 'ckeditor4'),
]))->contentType('application/x-javascript'); ]))->contentType('application/javascript');
} }
/** /**
@ -65,7 +65,7 @@ class Plugs extends Controller
sysoplog('系统运维管理', '创建数据库优化任务'); sysoplog('系统运维管理', '创建数据库优化任务');
$this->_queue('优化数据库所有数据表', 'xadmin:database optimize'); $this->_queue('优化数据库所有数据表', 'xadmin:database optimize');
} else { } else {
$this->error('只有超级管理员才能操作！'); $this->error('请使用超管账号操作！');
} }
} }
} }

32
app/admin/controller/api/Queue.php
View File

@ -24,25 +24,25 @@ use think\admin\service\QueueService;
use think\exception\HttpResponseException; use think\exception\HttpResponseException;
/** /**
* 后台任务通用接口 * 任务监听服务管理
* Class Queue * @class Queue
* @package app\admin\controller\api * @package app\admin\controller\api
*/ */
class Queue extends Controller class Queue extends Controller
{ {
/** /**
* WIN停止监听进程 * 停止监听服务
* @login true * @login true
*/ */
public function stop() public function stop()
{ {
try { if (AdminService::isSuper()) try {
$message = $this->app->console->call('xadmin:queue', ['stop'])->fetch(); $message = $this->app->console->call('xadmin:queue', ['stop'])->fetch();
if (stripos($message, 'sent end signal to process')) { if (stripos($message, 'sent end signal to process')) {
sysoplog('系统运维管理', '尝试停止后台服务主进程'); sysoplog('系统运维管理', '尝试停止任务监听服务');
$this->success('停止后台服务主进程成功！'); $this->success('停止任务监听服务成功！');
} elseif (stripos($message, 'processes to stop')) { } elseif (stripos($message, 'processes to stop')) {
$this->success('没有找到需要停止的进程！'); $this->success('没有找到需要停止的服务！');
} else { } else {
$this->error(nl2br($message)); $this->error(nl2br($message));
} }
@ -51,22 +51,24 @@ class Queue extends Controller
} catch (Exception $exception) { } catch (Exception $exception) {
trace_file($exception); trace_file($exception);
$this->error($exception->getMessage()); $this->error($exception->getMessage());
} else {
$this->error('请使用超管账号操作！');
} }
} }
/** /**
* WIN创建监听进程 * 启动监听服务
* @login true * @login true
*/ */
public function start() public function start()
{ {
try { if (AdminService::isSuper()) try {
$message = $this->app->console->call('xadmin:queue', ['start'])->fetch(); $message = $this->app->console->call('xadmin:queue', ['start'])->fetch();
if (stripos($message, 'daemons started successfully for pid')) { if (stripos($message, 'daemons started successfully for pid')) {
sysoplog('系统运维管理', '尝试启动后台服务主进程'); sysoplog('系统运维管理', '尝试启动任务监听服务');
$this->success('后台服务主进程启动成功！'); $this->success('任务监听服务启动成功！');
} elseif (stripos($message, 'daemons already exist for pid')) { } elseif (stripos($message, 'daemons already exist for pid')) {
$this->success('后台服务主进程已经存在！'); $this->success('任务监听服务已经启动！');
} else { } else {
$this->error(nl2br($message)); $this->error(nl2br($message));
} }
@ -75,11 +77,13 @@ class Queue extends Controller
} catch (Exception $exception) { } catch (Exception $exception) {
trace_file($exception); trace_file($exception);
$this->error($exception->getMessage()); $this->error($exception->getMessage());
} else {
$this->error('请使用超管账号操作！');
} }
} }
/** /**
* 检查任务状态 * 检查监听服务
* @login true * @login true
*/ */
public function status() public function status()
@ -99,7 +103,7 @@ class Queue extends Controller
} }
/** /**
* 任务进度查询 * 查询任务进度
* @login true * @login true
* @throws \think\admin\Exception * @throws \think\admin\Exception
*/ */

14
app/admin/controller/api/System.php
View File

@ -23,8 +23,8 @@ use think\admin\service\RuntimeService;
use think\exception\HttpResponseException; use think\exception\HttpResponseException;
/** /**
* 系统运行控制管理 * 系统运行管理
* Class System * @class System
* @package app\admin\controller\api * @package app\admin\controller\api
*/ */
class System extends Controller class System extends Controller
@ -45,7 +45,7 @@ class System extends Controller
trace_file($exception); trace_file($exception);
$this->error($exception->getMessage()); $this->error($exception->getMessage());
} else { } else {
$this->error('只有超级管理员才能操作！'); $this->error('请使用超管账号操作！');
} }
} }
@ -64,7 +64,7 @@ class System extends Controller
trace_file($exception); trace_file($exception);
$this->error($exception->getMessage()); $this->error($exception->getMessage());
} else { } else {
$this->error('只有超级管理员才能操作！'); $this->error('请使用超管账号操作！');
} }
} }
@ -83,7 +83,7 @@ class System extends Controller
sysoplog('系统运维管理', '生产模式切换为开发模式'); sysoplog('系统运维管理', '生产模式切换为开发模式');
$this->success('已切换为开发模式！', 'javascript:location.reload()'); $this->success('已切换为开发模式！', 'javascript:location.reload()');
} else { } else {
$this->error('只有超级管理员才能操作！'); $this->error('请使用超管账号操作！');
} }
} }
@ -102,7 +102,7 @@ class System extends Controller
sysoplog('系统运维管理', "切换编辑器为{$editor}"); sysoplog('系统运维管理', "切换编辑器为{$editor}");
$this->success('已切换后台编辑器！', 'javascript:location.reload()'); $this->success('已切换后台编辑器！', 'javascript:location.reload()');
} else { } else {
$this->error('只有超级管理员才能操作！'); $this->error('请使用超管账号操作！');
} }
} }
@ -132,7 +132,7 @@ class System extends Controller
trace_file($exception); trace_file($exception);
$this->error($exception->getMessage()); $this->error($exception->getMessage());
} else { } else {
$this->error('只有超级管理员才能操作！'); $this->error('请使用超管账号操作！');
} }
} }
} }

143
app/admin/controller/api/Upload.php
View File

@ -32,25 +32,23 @@ use think\Response;
/** /**
* 文件上传接口 * 文件上传接口
* Class Upload * @class Upload
* @package app\admin\controller\api * @package app\admin\controller\api
*/ */
class Upload extends Controller class Upload extends Controller
{ {
/** /**
* 文件上传脚本 * 文件上传脚本
* @return Response * @return Response
* @throws \think\db\exception\DataNotFoundException * @throws \think\admin\Exception
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/ */
public function index(): Response public function index(): Response
{ {
$data = ['exts' => []]; $data = ['exts' => []];
foreach (str2arr(sysconf('storage.allow_exts|raw')) as $ext) { [$uuid, $unid, $exts] = $this->initUnid(false);
$data['exts'][$ext] = Storage::mime($ext); $allows = str2arr(sysconf('storage.allow_exts|raw'));
} if (empty($uuid) && $unid > 0) $allows = array_intersect($exts, $allows);
foreach ($allows as $ext) $data['exts'][$ext] = Storage::mime($ext);
$template = realpath(__DIR__ . '/../../view/api/upload.js'); $template = realpath(__DIR__ . '/../../view/api/upload.js');
$data['exts'] = json_encode($data['exts'], JSON_UNESCAPED_UNICODE); $data['exts'] = json_encode($data['exts'], JSON_UNESCAPED_UNICODE);
$data['nameType'] = sysconf('storage.name_type|raw') ?: 'xmd5'; $data['nameType'] = sysconf('storage.name_type|raw') ?: 'xmd5';
@ -58,21 +56,42 @@ class Upload extends Controller
} }
/** /**
* 文件上传检查 * 文件选择器
* @login true
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
*/ */
public function image()
{
[$uuid, $unid] = $this->initUnid();
SystemFile::mQuery()->layTable(function () {
$this->title = '文件选择器';
}, function (QueryHelper $query) use ($unid, $uuid) {
if ($unid && $uuid) $query->where(function ($query) use ($uuid, $unid) {
/** @var \think\db\Query $query */
$query->whereOr([['uuid', '=', $uuid], ['unid', '=', $unid]]);
}); else {
$query->where($unid ? ['unid' => $unid] : ['uuid' => $uuid]);
}
$query->where(['status' => 2, 'issafe' => 0])->in('xext#type');
$query->like('name,hash')->dateBetween('create_at')->order('id desc');
});
}
/**
* 文件上传检查
* @throws \think\admin\Exception
*/
public function state() public function state()
{ {
[$uuid, $unid] = $this->initUnid();
[$name, $safe] = [input('name'), $this->getSafe()]; [$name, $safe] = [input('name'), $this->getSafe()];
$data = ['uptype' => $this->getType(), 'safe' => intval($safe), 'key' => input('key')]; $data = ['uptype' => $this->getType(), 'safe' => intval($safe), 'key' => input('key')];
$file = SystemFile::mk()->data($this->_vali([ $file = SystemFile::mk()->data($this->_vali([
'xkey.value' => $data['key'], 'xkey.value' => $data['key'],
'type.value' => $this->getType(), 'type.value' => $this->getType(),
'uuid.value' => AdminService::getUserId(), 'uuid.value' => $uuid,
'unid.value' => $unid,
'name.require' => '名称不能为空！', 'name.require' => '名称不能为空！',
'hash.require' => '哈希不能为空！', 'hash.require' => '哈希不能为空！',
'xext.require' => '后缀不能为空！', 'xext.require' => '后缀不能为空！',
@ -80,9 +99,10 @@ class Upload extends Controller
'mime.default' => '', 'mime.default' => '',
'status.value' => 1, 'status.value' => 1,
])); ]));
if (empty($file['mime'])) $file['mime'] = Storage::mime($file['xext']); $mime = $file->getAttr('mime');
if (empty($mime)) $file->setAttr('mime', Storage::mime($file->getAttr('xext')));
$info = Storage::instance($data['uptype'])->info($data['key'], $safe, $name); $info = Storage::instance($data['uptype'])->info($data['key'], $safe, $name);
if (is_array($info) && isset($info['url']) && isset($info['key'])) { if (isset($info['url']) && isset($info['key'])) {
$file->save(['xurl' => $info['url'], 'isfast' => 1, 'issafe' => $data['safe']]); $file->save(['xurl' => $info['url'], 'isfast' => 1, 'issafe' => $data['safe']]);
$extr = ['id' => $file->id ?? 0, 'url' => $info['url'], 'key' => $info['key']]; $extr = ['id' => $file->id ?? 0, 'url' => $info['url'], 'key' => $info['key']];
$this->success('文件已经上传', array_merge($data, $extr), 200); $this->success('文件已经上传', array_merge($data, $extr), 200);
@ -110,7 +130,7 @@ class Upload extends Controller
$data['q-sign-algorithm'] = $token['q-sign-algorithm']; $data['q-sign-algorithm'] = $token['q-sign-algorithm'];
$data['server'] = TxcosStorage::instance()->upload(); $data['server'] = TxcosStorage::instance()->upload();
} elseif ('upyun' === $data['uptype']) { } elseif ('upyun' === $data['uptype']) {
$token = UpyunStorage::instance()->buildUploadToken($data['key'], 3600, $name, input('size'), input('hash')); $token = UpyunStorage::instance()->buildUploadToken($data['key'], 3600, $name, input('hash', ''));
$data['url'] = $token['siteurl']; $data['url'] = $token['siteurl'];
$data['policy'] = $token['policy']; $data['policy'] = $token['policy'];
$data['authorization'] = $token['authorization']; $data['authorization'] = $token['authorization'];
@ -122,15 +142,16 @@ class Upload extends Controller
/** /**
* 更新文件状态 * 更新文件状态
* @login true
* @return void * @return void
*/ */
public function done() public function done()
{ {
[$uuid, $unid] = $this->initUnid();
$data = $this->_vali([ $data = $this->_vali([
'id.require' => '编号不能为空！', 'id.require' => '编号不能为空！',
'hash.require' => '哈希不能为空！', 'hash.require' => '哈希不能为空！',
'uuid.value' => AdminService::getUserId(), 'uuid.value' => $uuid,
'unid.value' => $unid,
]); ]);
$file = SystemFile::mk()->where($data)->findOrEmpty(); $file = SystemFile::mk()->where($data)->findOrEmpty();
if ($file->isEmpty()) $this->error('文件不存在！'); if ($file->isEmpty()) $this->error('文件不存在！');
@ -141,75 +162,63 @@ class Upload extends Controller
} }
} }
/**
* 文件选择器
* @login true
* @return void
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function image()
{
SystemFile::mQuery()->layTable(function () {
$this->title = '文件选择器';
}, function (QueryHelper $query) {
$query->where(['status' => 2, 'issafe' => 0, 'uuid' => AdminService::getUserId()]);
$query->like('name,hash')->in('xext#type')->dateBetween('create_at')->order('id desc');
});
}
/** /**
* 文件上传入口 * 文件上传入口
* @login true * @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/ */
public function file() public function file()
{ {
if (!($file = $this->getFile())->isValid()) { [$uuid, $unid, $unexts] = $this->initUnid();
$this->error('文件上传异常，文件过大或未上传！'); // 开始处理文件上传
} $file = $this->getFile();
$safeMode = $this->getSafe();
$extension = strtolower($file->getOriginalExtension()); $extension = strtolower($file->getOriginalExtension());
$saveName = input('key') ?: Storage::name($file->getPathname(), $extension, '', 'md5_file'); $saveFileName = input('key') ?: Storage::name($file->getPathname(), $extension, '', 'md5_file');
// 检查文件名称是否合法 // 检查文件名称是否合法
if (strpos($saveName, '../') !== false) { if (strpos($saveFileName, '../') !== false) {
$this->error('文件路径不能出现跳级操作！'); $this->error('文件路径不能出现跳级操作！');
} }
// 检查文件后缀是否被恶意修改 // 检查文件后缀是否被恶意修改
if (strtolower(pathinfo(parse_url($saveName, PHP_URL_PATH), PATHINFO_EXTENSION)) !== $extension) { if (strtolower(pathinfo(parse_url($saveFileName, PHP_URL_PATH), PATHINFO_EXTENSION)) !== $extension) {
$this->error('文件后缀异常，请重新上传文件！'); $this->error('文件后缀异常，请重新上传文件！');
} }
// 屏蔽禁止上传指定后缀的文件 // 屏蔽禁止上传指定后缀的文件
if (!in_array($extension, str2arr(sysconf('storage.allow_exts|raw')))) { if (!in_array($extension, str2arr(sysconf('storage.allow_exts|raw')))) {
$this->error('文件类型受限，请在后台配置规则！'); $this->error('文件类型受限，请在后台配置规则！');
} }
// 前端用户上传后缀检查处理
if (empty($uuid) && $unid > 0 && !in_array($extension, $unexts)) {
$this->error('文件类型受限，请上传允许的文件类型！');
}
if (in_array($extension, ['sh', 'asp', 'bat', 'cmd', 'exe', 'php'])) { if (in_array($extension, ['sh', 'asp', 'bat', 'cmd', 'exe', 'php'])) {
$this->error('文件安全保护，禁止上传可执行文件！'); $this->error('文件安全保护，禁止上传可执行文件！');
} }
try { try {
if ($this->getType() === 'local') { $safeMode = $this->getSafe();
if (($type = $this->getType()) === 'local') {
$local = LocalStorage::instance(); $local = LocalStorage::instance();
$distName = $local->path($saveName, $safeMode); $distName = $local->path($saveFileName, $safeMode);
$file->move(dirname($distName), basename($distName)); if (PHP_SAPI === 'cli') {
$info = $local->info($saveName, $safeMode, $file->getOriginalName()); is_dir(dirname($distName)) || mkdir(dirname($distName), 0777, true);
rename($file->getPathname(), $distName);
} else {
$file->move(dirname($distName), basename($distName));
}
$info = $local->info($saveFileName, $safeMode, $file->getOriginalName());
if (in_array($extension, ['jpg', 'gif', 'png', 'bmp', 'jpeg', 'wbmp'])) { if (in_array($extension, ['jpg', 'gif', 'png', 'bmp', 'jpeg', 'wbmp'])) {
if ($this->imgNotSafe($distName) && $local->del($saveName)) { if ($this->imgNotSafe($distName) && $local->del($saveFileName)) {
$this->error('图片未通过安全检查！'); $this->error('图片未通过安全检查！');
} }
[$width, $height] = getimagesize($distName); [$width, $height] = getimagesize($distName);
if (($width < 1 || $height < 1) && $local->del($saveName)) { if (($width < 1 || $height < 1) && $local->del($saveFileName)) {
$this->error('读取图片的尺寸失败！'); $this->error('读取图片的尺寸失败！');
} }
} }
} else { } else {
$bina = file_get_contents($file->getPathname()); $bina = file_get_contents($file->getPathname());
$info = Storage::instance($this->getType())->set($saveName, $bina, $safeMode, $file->getOriginalName()); $info = Storage::instance($type)->set($saveFileName, $bina, $safeMode, $file->getOriginalName());
} }
if (isset($info['url'])) { if (isset($info['url'])) {
$this->success('文件上传成功！', ['url' => $safeMode ? $saveName : $info['url']]); $this->success('文件上传成功！', ['url' => $safeMode ? $saveFileName : $info['url']]);
} else { } else {
$this->error('文件处理失败，请稍候再试！'); $this->error('文件处理失败，请稍候再试！');
} }
@ -222,7 +231,7 @@ class Upload extends Controller
} }
/** /**
* 获取文件上传类型 * 获取上传类型
* @return boolean * @return boolean
*/ */
private function getSafe(): bool private function getSafe(): bool
@ -231,11 +240,9 @@ class Upload extends Controller
} }
/** /**
* 获取文件上传方式 * 获取上传方式
* @return string * @return string
* @throws \think\db\exception\DataNotFoundException * @throws \think\admin\Exception
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/ */
private function getType(): string private function getType(): string
{ {
@ -248,7 +255,7 @@ class Upload extends Controller
} }
/** /**
* 获取本地文件对象 * 获取文件对象
* @return UploadedFile|void * @return UploadedFile|void
*/ */
private function getFile(): UploadedFile private function getFile(): UploadedFile
@ -268,6 +275,22 @@ class Upload extends Controller
} }
} }
/**
* 初始化用户状态
* @param boolean $check
* @return array
*/
private function initUnid(bool $check = true): array
{
$uuid = AdminService::getUserId();
[$unid, $exts] = AdminService::withUploadUnid();
if ($check && empty($uuid) && empty($unid)) {
$this->error('未登录，禁止使用文件上传！');
} else {
return [$uuid, $unid, $exts];
}
}
/** /**
* 检查图片是否安全 * 检查图片是否安全
* @param string $filename * @param string $filename

137
app/admin/view/api/icon.html
View File

@ -11,85 +11,86 @@
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1">
<link rel="stylesheet" href="__ROOT__/static/theme/css/iconfont.css?at={:date('md')}"> <link rel="stylesheet" href="__ROOT__/static/theme/css/iconfont.css?at={:date('md')}">
<link rel="stylesheet" href="__ROOT__/static/plugs/layui/css/layui.css?v={:date('ymd')}"> <link rel="stylesheet" href="__ROOT__/static/plugs/layui/css/layui.css?v={:date('ymd')}">
<style> ::-webkit-input-placeholder { <style>
color: #aaa ::-webkit-input-placeholder {
} color: #aaa
}
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 3px; width: 3px;
height: 3px height: 3px
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
background: #ccc background: #ccc
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background-color: #666 background-color: #666
} }
::selection { ::selection {
background-color: #ec494e; background-color: #ec494e;
color: #fff color: #fff
} }
::-moz-selection { ::-moz-selection {
background-color: #ec494e; background-color: #ec494e;
color: #fff color: #fff
} }
:-webkit-autofill { :-webkit-autofill {
-webkit-box-shadow: 0 0 0 1000px white inset; -webkit-box-shadow: 0 0 0 1000px white inset;
-webkit-text-fill-color: #333 -webkit-text-fill-color: #333
} }
ul li { ul li {
width: 20%; width: 20%;
height: 65px; height: 65px;
display: block; display: block;
float: left; float: left;
margin-right: -1px; margin-right: -1px;
margin-left: -2px; margin-left: -2px;
margin-bottom: -2px; margin-bottom: -2px;
cursor: pointer; cursor: pointer;
font-size: 14px; font-size: 14px;
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
padding: 15px 0 10px 0; padding: 15px 0 10px 0;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
background-color: #efefef; background-color: #efefef;
user-select: none; user-select: none;
-ms-user-select: none; -ms-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
transition: all .2s linear; transition: all .2s linear;
-o-transition: all .2s linear; -o-transition: all .2s linear;
-moz-transition: all .2s linear; -moz-transition: all .2s linear;
-webkit-transition: all .2s linear -webkit-transition: all .2s linear
} }
ul li:hover { ul li:hover {
color: #fff; color: #fff;
background-color: #563d7c background-color: #563d7c
} }
ul li:hover i, ul li:hover div { ul li:hover i, ul li:hover div {
color: #fff; color: #fff;
} }
ul li i { ul li i {
color: #333; color: #333;
display: inline-block; display: inline-block;
font-size: 30px !important font-size: 30px !important
} }
ul li div { ul li div {
color: #333; color: #333;
height: 35px; height: 35px;
font-size: 13px; font-size: 13px;
line-height: 35px; line-height: 35px;
white-space: nowrap white-space: nowrap
} </style> } </style>
</head> </head>
<body> <body>

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

@ -32,7 +32,7 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) {
/*! 初始化上传组件 */ /*! 初始化上传组件 */
this.adapter = new Adapter(this.option, layui.upload.render({ this.adapter = new Adapter(this.option, layui.upload.render({
url: '{:url("admin/api.upload/file")}', auto: false, elem: elem, accept: 'file', multiple: this.option.mult, exts: this.option.exts.join('|'), acceptMime: this.option.mimes.join(','), choose: function (obj) { url: '{:url("admin/api.upload/file",[],false,true)}', auto: false, elem: elem, accept: 'file', multiple: this.option.mult, exts: this.option.exts.join('|'), acceptMime: this.option.mimes.join(','), choose: function (obj) {
obj.items = [], obj.files = obj.pushFile(); obj.items = [], obj.files = obj.pushFile();
layui.each(obj.files, function (idx, file) { layui.each(obj.files, function (idx, file) {
obj.items.push(file); obj.items.push(file);
@ -108,7 +108,7 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) {
Adapter.prototype.request = function (file, done) { Adapter.prototype.request = function (file, done) {
var that = this, data = {key: file.xkey, safe: that.option.safe, uptype: that.option.type}; var that = this, data = {key: file.xkey, safe: that.option.safe, uptype: that.option.type};
data.size = file.size, data.name = file.name, data.hash = file.xmd5, data.mime = file.type, data.xext = file.xext; data.size = file.size, data.name = file.name, data.hash = file.xmd5, data.mime = file.type, data.xext = file.xext;
jQuery.ajax("{:url('admin/api.upload/state')}", { jQuery.ajax("{:url('admin/api.upload/state',[],false,true)}", {
data: data, method: 'post', success: function (ret) { data: data, method: 'post', success: function (ret) {
file.id = ret.data.id || 0, file.xurl = ret.data.url; file.id = ret.data.id || 0, file.xurl = ret.data.url;
file.xsafe = ret.data.safe, file.xpath = ret.data.key, file.xtype = ret.data.uptype; file.xsafe = ret.data.safe, file.xpath = ret.data.key, file.xtype = ret.data.uptype;
@ -192,7 +192,7 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) {
/*! 检查单个文件上传返回的结果 */ /*! 检查单个文件上传返回的结果 */
if (ret.code < 1) return $.msg.tips(ret.info || '文件上传失败！'); if (ret.code < 1) return $.msg.tips(ret.info || '文件上传失败！');
if (typeof file.xurl !== 'string') return $.msg.tips('无效的文件上传对象！'); if (typeof file.xurl !== 'string') return $.msg.tips('无效的文件上传对象！');
jQuery.post("{:url('admin/api.upload/done')}", {id: file.id, hash: file.xmd5}); jQuery.post("{:url('admin/api.upload/done',[],false,true)}", {id: file.id, hash: file.xmd5});
/*! 单个文件上传成功结果处理 */ /*! 单个文件上传成功结果处理 */
if (typeof done === 'function') { if (typeof done === 'function') {
done.call(this.option.elem, file.xurl, this.files['id']); done.call(this.option.elem, file.xurl, this.files['id']);

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

@ -109,7 +109,7 @@
loadPage: function () { loadPage: function () {
this.params = {page: this.page, limit: this.limit, output: 'layui.table', name: this.keys || ''}; this.params = {page: this.page, limit: this.limit, output: 'layui.table', name: this.keys || ''};
this.params.type = '{$get.type|default="gif,png,jpg,jpeg"}'; this.params.type = '{$get.type|default="gif,png,jpg,jpeg"}';
$.form.load('{:url("image")}', this.params, 'get', function (ret) { $.form.load('{:url("image",[],false,true)}', this.params, 'get', function (ret) {
return app.setList(ret.data, ret.count), false; return app.setList(ret.data, ret.count), false;
}); });
}, },

22
app/admin/view/queue/index.html
View File

@ -1,22 +1,26 @@
{extend name='table'} {extend name='table'}
{block name="button"} {block name="button"}
<!--{if isset($super) and $super}-->
<a data-table-id="QueueTable" class="layui-btn layui-btn-sm layui-btn-primary" data-queue="{:url('admin/api.plugs/optimize')}">优化数据库</a>
<!--{/if}-->
<!--{if isset($super) and $super and $iswin}--> {if isset($super) and $super}
<a data-table-id="QueueTable" class="layui-btn layui-btn-sm layui-btn-primary" data-queue="{:url('admin/api.plugs/optimize')}">优化数据库</a>
{if isset($iswin) and ($iswin or php_sapi_name() eq 'cli')}
<button data-load='{:url("admin/api.queue/start")}' class='layui-btn layui-btn-sm layui-btn-primary'>开启服务</button> <button data-load='{:url("admin/api.queue/start")}' class='layui-btn layui-btn-sm layui-btn-primary'>开启服务</button>
<button data-load='{:url("admin/api.queue/stop")}' class='layui-btn layui-btn-sm layui-btn-primary'>关闭服务</button> <button data-load='{:url("admin/api.queue/stop")}' class='layui-btn layui-btn-sm layui-btn-primary'>关闭服务</button>
<!--{/if}--> {/if}
<!--{if auth("clean")}--> {if auth("clean")}
<button data-table-id="QueueTable" data-queue='{:url("clean")}' class='layui-btn layui-btn-sm layui-btn-primary'>定时清理</button> <button data-table-id="QueueTable" data-queue='{:url("clean")}' class='layui-btn layui-btn-sm layui-btn-primary'>定时清理</button>
<!--{/if}--> {/if}
<!--{if auth("remove")}--> {/if}
{if auth("remove")}
<button data-table-id="QueueTable" data-action='{:url("remove")}' data-rule="id#{id}" data-confirm="确定批量删除记录吗？" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button> <button data-table-id="QueueTable" data-action='{:url("remove")}' data-rule="id#{id}" data-confirm="确定批量删除记录吗？" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
<!--{/if}--> {/if}
{/block} {/block}
{block name="content"} {block name="content"}

2
app/wechat/controller/Menu.php
View File

@ -78,7 +78,7 @@ class Menu extends Controller
{ {
try { try {
WechatService::WeChatMenu()->delete(); WechatService::WeChatMenu()->delete();
$this->success('菜单取消成功，重新订阅可立即生效！'); $this->success('公众号菜单取消成功！');
} catch (HttpResponseException $exception) { } catch (HttpResponseException $exception) {
sysoplog('微信管理', '取消微信菜单成功'); sysoplog('微信管理', '取消微信菜单成功');
throw $exception; throw $exception;

60
app/wechat/controller/api/Login.php
View File

@ -16,45 +16,29 @@
namespace app\wechat\controller\api; namespace app\wechat\controller\api;
use app\wechat\service\MediaService; use app\wechat\service\LoginService;
use app\wechat\service\WechatService;
use think\admin\Controller; use think\admin\Controller;
/** /**
* 微信扫码授权登录 * 微信扫码登录
* Class Login * Class Login
* @package app\wechat\controller\api * @package app\wechat\controller\api
*/ */
class Login extends Controller class Login extends Controller
{ {
/** /**
* 数据缓存时间 * 显示二维码
* @var integer
*/
protected $expire = 3600;
/**
* 授权码前缀
* @var string
*/
protected $prefix = 'wxlogin';
/**
* 扫描显示二维码
* @return void * @return void
*/ */
public function qrc() public function qrc()
{ {
$mode = intval(input('mode', '0')); $mode = intval(input('mode', '0'));
$code = $this->prefix . md5(uniqid('t', true) . rand(10000, 99999)); $data = LoginService::qrcode(LoginService::gcode(), $mode);
$text = url('wechat/api.login/oauth', [], false, true) . "?code={$code}&mode={$mode}"; $this->success('登录二维码', $data);
// 生成二维码并返回结果
$qrcode = MediaService::getQrcode($text);
$this->success('获取二维码成功', ['code' => $code, 'image' => $qrcode->getDataUri()]);
} }
/** /**
* 微信授权结果处理 * 微信授权处理
* @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException * @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception * @throws \think\admin\Exception
@ -64,41 +48,25 @@ class Login extends Controller
*/ */
public function oauth() public function oauth()
{ {
$this->code = input('code', ''); $data = $this->_vali(['auth.default' => '', 'mode.default' => '0']);
$this->mode = input('mode', '0'); if (LoginService::oauth($data['auth'], intval($data['mode']))) {
if (stripos($this->code, $this->prefix) === 0) { $this->fetch('success', ['message' => '授权成功']);
$this->url = $this->request->url(true);
$this->fans = WechatService::getWebOauthInfo($this->url, $this->mode);
if (isset($this->fans['openid'])) {
$this->fans['token'] = md5(uniqid('t', true) . rand(10000, 99999));
$this->app->cache->set("wxlogin{$this->code}", $this->fans, $this->expire);
$this->app->cache->set($this->fans['openid'], $this->fans['token'], $this->expire);
$this->message = '授权成功';
$this->fetch('success');
} else {
$this->message = '授权失败';
$this->fetch('failed');
}
} else { } else {
$this->message = '授权失败'; $this->fetch('failed', ['message' => '授权失败']);
$this->fetch('failed');
} }
} }
/** /**
* 获取授权信息 * 获取授权信息
* 用定时器请求这个接口 * 用定时器请求这个接口
* @throws \think\exception\HttpResponseException
*/ */
public function query() public function query()
{ {
$this->code = input('code', ''); $data = $this->_vali(['code.require' => '编号不能为空！']);
if (stripos($this->code, $this->prefix) === 0) { if ($fans = LoginService::query($data['code'])) {
$this->ckey = "wxlogin{$this->code}"; $this->success('获取授权信息', $fans);
$this->fans = $this->app->cache->get($this->ckey, new \stdClass());
$this->success('获取授权信息', $this->fans);
} else { } else {
$this->error("授权CODE不能为空！"); $this->error('未获取到授权！');
} }
} }
} }

107
app/wechat/service/LoginService.php Normal file
View File

@ -0,0 +1,107 @@
<?php
// +----------------------------------------------------------------------
// | Wechat Plugin for ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
// +----------------------------------------------------------------------
// | 官方网站: https://thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// | 免责声明 ( https://thinkadmin.top/disclaimer )
// +----------------------------------------------------------------------
// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
namespace app\wechat\service;
use think\admin\Library;
/**
* 微信扫码登录服务
* @class LoginService
* @package app\wechat\service
*/
class LoginService
{
private const expire = 3600;
private const prefix = 'wxlogin';
/**
* 生成请求编号
* @return string
*/
public static function gcode(): string
{
return md5(uniqid(strval(rand(0, 10000)), true));
}
/**
* 生成授权码
* @param string $code 请求编号
* @return string
*/
public static function gauth(string $code): string
{
return self::prefix . md5($code);
}
/**
* 生成授权二维码
* @param string $code 请求编号
* @param integer $mode 授权模式
* @return array
*/
public static function qrcode(string $code, int $mode = 0): array
{
$data = ['auth' => self::gauth($code), 'mode' => $mode];
$image = MediaService::getQrcode(sysuri('wechat/api.login/oauth', $data, false, true));
return ['code' => $code, 'auth' => $data['auth'], 'image' => $image->getDataUri()];
}
/**
* 发起网页授权处理
* @param string $auth 授权编号
* @param integer $mode 授权模式
* @return boolean
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function oauth(string $auth = '', int $mode = 0): bool
{
if (stripos($auth, self::prefix) === 0) {
$url = Library::$sapp->request->url(true);
$fans = WechatService::getWebOauthInfo($url, $mode);
if (isset($fans['openid'])) {
Library::$sapp->cache->set($auth, $fans, self::expire);
return true;
}
}
return false;
}
/**
* 检查是否授权
* @param string $code 请求编号
* @return ?array
*/
public static function query(string $code): ?array
{
return Library::$sapp->cache->get(self::gauth($code));
}
/**
* 删除授权缓存
* @param string $code
* @return bool
*/
public static function remove(string $code): bool
{
return Library::$sapp->cache->delete(self::gauth($code));
}
}

244
app/wechat/view/menu/index.html
View File

@ -34,60 +34,64 @@
<div class="layui-card-body" ng-if="list.length<1"> <div class="layui-card-body" ng-if="list.length<1">
<blockquote class="layui-elem-quote border-0 text-center">请在左侧创建菜单...</blockquote> <blockquote class="layui-elem-quote border-0 text-center">请在左侧创建菜单...</blockquote>
</div> </div>
<div class="layui-card-body" ng-if="list.length>0"> <div class="layui-card-body">
<form class="layui-form menu-form padding-right-40" autocomplete="off"> <form class="layui-form padding-right-40" name="menu" role="form" onsubmit="return false">
<div class="layui-form-item margin-top-20"> <div ng-if="list.length>0">
<label class="layui-form-label">菜单名称</label>
<div class="layui-input-block">
<input required name="menu-name" ng-model="item.name" class="layui-input" placeholder="请输入菜单名称">
<span class="help-block">字数不超过13个汉字或40个字母</span>
</div>
</div>
<div class="layui-form-item margin-top-20" ng-if="!item.sub_button||item.sub_button.length<1">
<label class="layui-form-label label-required">菜单类型</label>
<div class="layui-input-block">
{foreach $menuTypes as $key => $type}
<label class="think-radio layui-elip"><input lay-ignore type="radio" ng-model="item.type" name="menu-type" value="{$key}"> {$type}</label>
{/foreach}
</div>
</div>
<div class="layui-form-item margin-top-20" ng-if="item.type==='customservice'">
<label class="layui-form-label">提示文字</label>
<div class="layui-input-block">
<textarea required class="layui-textarea" ng-model="item.content"></textarea>
</div>
</div>
<div class="layui-form-item margin-top-20" ng-if="(!item.sub_button||item.sub_button.length<1)&&item.type==='click'">
<label class="layui-form-label">匹配规则</label>
<div class="layui-input-block">
<select required class="layui-select" lay-filter="key" lay-search>
<option value="{{x.keys}}" ng-selected="x.keys===item.key" ng-repeat="x in keys" ng-bind="x.keys"></option>
</select>
</div>
</div>
<div class="layui-form-item margin-top-20" ng-if="item.type==='view'">
<label class="layui-form-label">跳转链接</label>
<div class="layui-input-block">
<textarea required class="layui-textarea" ng-model="item.url" placeholder="请输入跳转链接"></textarea>
</div>
</div>
<div ng-if="item.type==='miniprogram'">
<div class="layui-form-item margin-top-20"> <div class="layui-form-item margin-top-20">
<label class="layui-form-label">小程序链接</label> <label class="layui-form-label">菜单名称</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" required class="layui-input" ng-model="item.url" placeholder="请输入小程序链接"> <input required vali-name="菜单名称" ng-model="item.name" class="layui-input" placeholder="请输入菜单名称">
<span class="help-block">字数不超过13个汉字或40个字母</span>
</div> </div>
</div> </div>
<div class="layui-form-item margin-top-20"> <div class="layui-form-item margin-top-20" ng-if="!item.sub_button||item.sub_button.length<1">
<label class="layui-form-label">小程序APPID</label> <label class="layui-form-label label-required">菜单类型</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" required class="layui-input" ng-model="item.appid" placeholder="请输入小程序APPID"> {foreach $menuTypes as $key => $type}
<label class="think-radio layui-elip">
<input lay-ignore type="radio" ng-model="item.type" name="menu-type" value="{$key}"> {$type}
</label>
{/foreach}
</div> </div>
</div> </div>
<div class="layui-form-item margin-top-20"> <div class="layui-form-item margin-top-20" ng-if="item.type==='customservice'">
<label class="layui-form-label">小程序页面</label> <label class="layui-form-label">提示文字</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" required class="layui-input" ng-model="item.pagepath" placeholder="请输入小程序页面"> <textarea required vali-name="提示文字" class="layui-textarea" ng-model="item.content"></textarea>
</div>
</div>
<div class="layui-form-item margin-top-20" ng-if="(!item.sub_button||item.sub_button.length<1)&&item.type==='click'">
<label class="layui-form-label">匹配规则</label>
<div class="layui-input-block">
<select required class="layui-select" lay-filter="key" lay-search>
<option value="{{x.keys}}" ng-selected="x.keys===item.key" ng-repeat="x in keys" ng-bind="x.keys"></option>
</select>
</div>
</div>
<div class="layui-form-item margin-top-20" ng-if="item.type==='view'">
<label class="layui-form-label">跳转链接</label>
<div class="layui-input-block">
<textarea required pattern="url" class="layui-textarea" vali-name="跳转链接" ng-model="item.url" placeholder="请输入跳转链接"></textarea>
</div>
</div>
<div ng-if="item.type==='miniprogram'">
<div class="layui-form-item margin-top-20">
<label class="layui-form-label">小程序链接</label>
<div class="layui-input-block">
<input type="text" required vali-name="小程序链接" class="layui-input" ng-model="item.url" placeholder="请输入小程序链接">
</div>
</div>
<div class="layui-form-item margin-top-20">
<label class="layui-form-label">小程序APPID</label>
<div class="layui-input-block">
<input type="text" required vali-name="小程序APPID" class="layui-input" ng-model="item.appid" placeholder="请输入小程序APPID">
</div>
</div>
<div class="layui-form-item margin-top-20">
<label class="layui-form-label">小程序页面</label>
<div class="layui-input-block">
<input type="text" required vali-name="小程序页面" class="layui-input" ng-model="item.pagepath" placeholder="请输入小程序页面">
</div>
</div> </div>
</div> </div>
</div> </div>
@ -110,90 +114,86 @@
<script> <script>
require(['angular'], function () { require(['angular'], function () {
var $form = $('.menu-form').vali(); $('#MenuEditor').removeClass('layui-hide');
var $vali = $form.vali().data('validate'); $('form[name=menu]').vali(null, function () {
$('#MenuEditor.layui-hide').removeClass('layui-hide');
var app = angular.module("MenuEditor", []).run(callback); var vali = this, app = angular.module('MenuEditor', []).run(callback);
angular.bootstrap(document.getElementById(app.name), [app.name]); angular.bootstrap(document.getElementById(app.name), [app.name]);
function callback($rootScope) { function callback($rootScope) {
$rootScope.item = {}, $rootScope.list = [], $rootScope.keys = []; $rootScope.item = {}, $rootScope.list = [], $rootScope.keys = [];
$.form.load('{:url("index")}', {output: 'json'}, 'get', function (ret) { $.form.load('{:request()->url()}', {output: 'json'}, 'get', function (ret) {
return $rootScope.$apply(function () { $rootScope.$apply(function () {
$rootScope.keys = ret.data.keysdata || [], $rootScope.list = ret.data.menudata || []; $rootScope.keys = ret.data.keysdata || [], $rootScope.list = ret.data.menudata || [];
if ($rootScope.list.length < 1) $rootScope.list = [{name: '请输入名称', type: 'click', sub_button: []}]; if ($rootScope.list.length < 1) $rootScope.list = [{name: '请输入名称', type: 'click', sub_button: []}];
for (var i in $rootScope.list) $rootScope.list[i].sub_button = $rootScope.list[i].sub_button || []; for (var i in $rootScope.list) $rootScope.list[i].sub_button = $rootScope.list[i].sub_button || [];
$rootScope.list[0].show = true, $rootScope.list[0].active = true, $rootScope.item = $rootScope.list[0]; $rootScope.list[0].show = true, $rootScope.list[0].active = true, $rootScope.item = $rootScope.list[0];
}), false; });
}); return false;
});
// 动态计算宽度 // 动态计算宽度
$rootScope.getItemStyle = function (list) { $rootScope.getItemStyle = function (list) {
return 'width:' + (100 / (list.length >= 3 ? 3 : (list.length + 1))) + '%'; return 'width:' + (100 / (list.length >= 3 ? 3 : (list.length + 1))) + '%';
}; };
// 增加菜单选项 // 增加菜单选项
$rootScope.addItem = function (list) { $rootScope.addItem = function (list) {
$vali.checkAllInput(); if (!vali.checkAllInput()) return;
if ($form.find('.validate-error').size() > 0) { list.push({name: '请输入名称', type: 'click', sub_button: []});
return $.msg.tips('表单验证不成功，请输入需要的内容！'); };
}
list.push({name: '请输入名称', type: 'click', sub_button: []});
};
// 移除菜单 // 移除菜单
$rootScope.delItem = function (one, two) { $rootScope.delItem = function (one, two) {
var tmp = [], _two = null; var tmp = [], _two = null;
if (two) { if (two) {
for (var i in one.sub_button) if (one.sub_button[i] !== two) { for (var i in one.sub_button) if (one.sub_button[i] !== two) {
tmp.push(one.sub_button[i]); tmp.push(one.sub_button[i]);
if (one.sub_button[i].active) _two = one.sub_button[i]; if (one.sub_button[i].active) _two = one.sub_button[i];
}
one.sub_button = tmp;
return $rootScope.setActiveItem(one, _two);
} }
one.sub_button = tmp; for (var i in $rootScope.list) if (one !== $rootScope.list[i]) tmp.push($rootScope.list[i]);
return $rootScope.setActiveItem(one, _two); $rootScope.list = tmp;
if ($rootScope.list.length > 1) $rootScope.setActiveItem($rootScope.list[0])
};
// 切换选择菜单
$rootScope.setActiveItem = function (one, two) {
if (!vali.checkAllInput()) return;
$rootScope.list.forEach(function (item) {
item.show = item === one;
item.active = two ? false : (item === one)
item.sub_button.forEach(function (subitem) {
subitem.active = subitem === two;
});
});
$rootScope.item = two || one || {};
$rootScope.item.type = $rootScope.item.type || 'click';
if ($rootScope.item.type === 'click') setTimeout(function () {
layui.form.render('select'), ($rootScope.item.key = $('[lay-filter="key"]').val());
}, 50);
};
// 下拉列表处理
$rootScope.$watch('item', function () {
if ($rootScope.item.type === 'click') setTimeout(function () {
layui.form.render('select'), ($rootScope.item.key = $('[lay-filter="key"]').val());
}, 50)
}, true);
layui.form.on('select(key)', function (data) {
$rootScope.item.key = data.value;
});
// 提交数据
$rootScope.submit = function () {
if (!vali.checkAllInput()) return false;
$.form.load('{:url("push")}', {data: angular.toJson($rootScope.list)}, 'post');
} }
for (var i in $rootScope.list) if (one !== $rootScope.list[i]) tmp.push($rootScope.list[i]);
$rootScope.list = tmp;
if ($rootScope.list.length > 1) $rootScope.setActiveItem($rootScope.list[0])
};
// 切换选择菜单
$rootScope.setActiveItem = function (one, two) {
for (var i in $rootScope.list) {
$rootScope.list[i].show = ($rootScope.list[i] === one);
$rootScope.list[i].active = two ? false : ($rootScope.list[i] === one);
}
for (var i in $rootScope.list) for (var j in $rootScope.list[i].sub_button) {
$rootScope.list[i].sub_button[j].active = ($rootScope.list[i].sub_button[j] === two)
}
$rootScope.item = two || one || {};
$rootScope.item.type = $rootScope.item.type || 'click';
if ($rootScope.item.type === 'click') setTimeout(function () {
layui.form.render('select');
$rootScope.item.key = $('[lay-filter="key"]').val();
}, 50);
};
// 下拉列表处理
$rootScope.$watch('item', function () {
if ($rootScope.item.type === 'click') setTimeout(function () {
layui.form.render('select');
$rootScope.item.key = $('[lay-filter="key"]').val();
}, 50)
}, true);
layui.form.on('select(key)', function (data) {
$rootScope.item.key = data.value;
});
// 提交数据
$rootScope.submit = function () {
$vali.checkAllInput();
if ($form.find('.validate-error').size() > 0) return false;
$.form.load('{:url("push")}', {data: angular.toJson($rootScope.list)}, 'post');
} }
} });
}); });
</script> </script>

239
app/wechat/view/news/form.html
View File

@ -81,135 +81,130 @@
require(['angular', 'ckeditor'], function () { require(['angular', 'ckeditor'], function () {
var editor; var editor;
var $form = $('form[name="news"]'); $('form[name="news"]').vali(null, function () {
var $vali = $form.vali().data('validate'); var vali = this, app = angular.module("NewsEditor", []).run(callback);
angular.bootstrap(document.getElementById(app.name), [app.name]);
var app = angular.module("NewsEditor", []).run(callback); function callback($rootScope) {
angular.bootstrap(document.getElementById(app.name), [app.name]); $rootScope.list = [];
$rootScope.item = {};
function callback($rootScope) { $.form.load('{:request()->url()}', {output: 'json'}, 'get', function (ret) {
$rootScope.list = []; $rootScope.$apply(function () {
$rootScope.item = {}; apply((ret.data || {articles: []}).articles || []);
$.form.load('{:request()->url()}', {output: 'json'}, 'get', function (ret) {
return $rootScope.$apply(function () {
apply((ret.data || {articles: []}).articles || []);
}), false;
});
function apply(list) {
if (list.length < 1) list.push({
title: '新建图文', author: '管理员', content: '文章内容',
read_num: 0, local_url: '__FULL__/static/theme/img/image.png',
});
for (var i in list) {
list[i].active = false;
list[i].style = "background-image:url('" + list[i].local_url + "')";
}
$rootScope.list = list;
$rootScope.item = $rootScope.list[0];
$rootScope.setItemValue('active', true);
$('.layui-card-body.layui-hide').removeClass('layui-hide');
setTimeout(function () {
if (editor) editor.destroy();
editor = window.createEditor('[name="content"]');
if (typeof editor !== 'undefined') {
editor.setData($rootScope.item.content);
$vali.checkAllInput();
} else $('[name="content"]').on('editor.init', function (event, myEditor) {
myEditor.setData($rootScope.item.content);
editor = myEditor;
$vali.checkAllInput();
}); });
}, 100); return false;
} });
$rootScope.upItem = function (index, $event) { function apply(list) {
$event.stopPropagation(); if (list.length < 1) list.push({
var tmp = [], cur = $rootScope.list[index]; title: '新建图文', author: '管理员', content: '文章内容',
if (index < 1) return false; read_num: 0, local_url: '__FULL__/static/theme/img/image.png',
for (var i in $rootScope.list) { });
(parseInt(i) === parseInt(index) - 1) && tmp.push(cur); for (var i in list) {
(parseInt(i) !== parseInt(index)) && tmp.push($rootScope.list[i]); list[i].active = false;
} list[i].style = "background-image:url('" + list[i].local_url + "')";
apply(tmp); }
}; $rootScope.list = list;
$rootScope.dnItem = function (index, $event) { $rootScope.item = $rootScope.list[0];
$event.stopPropagation();
var tmp = [], cur = $rootScope.list[index];
if (index > $rootScope.list.length - 2) return false;
for (var i in $rootScope.list) {
(parseInt(i) !== parseInt(index)) && tmp.push($rootScope.list[i]);
(parseInt(i) === parseInt(index) + 1) && tmp.push(cur);
}
apply(tmp);
};
$rootScope.delItem = function (index, $event) {
$event.stopPropagation();
var list = $rootScope.list, temp = [];
for (var i in list) (parseInt(i) !== parseInt(index)) && temp.push(list[i]);
apply(temp);
};
$rootScope.setItem = function (index, $event) {
$event.stopPropagation();
$vali.checkAllInput();
if ($form.find('.validate-error').size() > 0) return 0;
if (editor.getData().length < 1) {
return $.msg.tips('文章内容不能为空，请输入文章内容！');
}
for (var i in $rootScope.list) if (parseInt(i) !== parseInt(index)) {
$rootScope.list[i].active = false;
} else {
$rootScope.item.content = editor.getData();
$rootScope.item = $rootScope.list[i];
editor.setData($rootScope.item.content);
$rootScope.setItemValue('active', true); $rootScope.setItemValue('active', true);
$('.layui-card-body.layui-hide').removeClass('layui-hide');
setTimeout(function () {
if (editor) editor.destroy();
editor = window.createEditor('[name="content"]');
if (typeof editor !== 'undefined') {
editor.setData($rootScope.item.content);
vali.checkAllInput();
} else $('[name="content"]').on('editor.init', function (event, myEditor) {
(editor = myEditor).setData($rootScope.item.content);
vali.checkAllInput();
});
}, 100);
} }
};
$rootScope.setItemValue = function (name, value) { $rootScope.upItem = function (index, $event) {
$rootScope.item[name] = value; $event.stopPropagation();
$rootScope.item.style = "background-image:url('" + $rootScope.item.local_url + "')"; var tmp = [], cur = $rootScope.list[index];
}; if (index < 1) return false;
$rootScope.addItem = function () { for (var i in $rootScope.list) {
if ($rootScope.list.length > 7) { (parseInt(i) === parseInt(index) - 1) && tmp.push(cur);
return $.msg.tips('最多允许增加7篇文章哦！'); (parseInt(i) !== parseInt(index)) && tmp.push($rootScope.list[i]);
} }
$rootScope.list.push({ apply(tmp);
title: '新建图文', };
author: '管理员', $rootScope.dnItem = function (index, $event) {
content: '文章内容', $event.stopPropagation();
read_num: 0, var tmp = [], cur = $rootScope.list[index];
local_url: '__FULL__/static/theme/img/image.png', if (index > $rootScope.list.length - 2) return false;
style: "background-image:url('__FULL__/static/theme/img/image.png')" for (var i in $rootScope.list) {
(parseInt(i) !== parseInt(index)) && tmp.push($rootScope.list[i]);
(parseInt(i) === parseInt(index) + 1) && tmp.push(cur);
}
apply(tmp);
};
$rootScope.delItem = function (index, $event) {
$event.stopPropagation();
var list = $rootScope.list, temp = [];
for (var i in list) (parseInt(i) !== parseInt(index)) && temp.push(list[i]);
apply(temp);
};
$rootScope.setItem = function (index, $event) {
$event.stopPropagation();
if (!vali.checkAllInput()) return;
if (editor.getData().length < 1) {
return $.msg.notify('操作提示', '文章内容不能为空，请输入内容！', 3000, {type: 'error', width: '400px'})
}
for (var i in $rootScope.list) if (parseInt(i) !== parseInt(index)) {
$rootScope.list[i].active = false;
} else {
$rootScope.item.content = editor.getData();
$rootScope.item = $rootScope.list[i];
editor.setData($rootScope.item.content);
$rootScope.setItemValue('active', true);
}
};
$rootScope.setItemValue = function (name, value) {
$rootScope.item[name] = value;
$rootScope.item.style = "background-image:url('" + $rootScope.item.local_url + "')";
};
$rootScope.addItem = function () {
if ($rootScope.list.length >= 7) {
return $.msg.notify('操作提示', '最多允许增加 7 篇文章哦！', 3000, {type: 'error', width: '400px'})
}
$rootScope.list.push({
title: '新建图文',
author: '管理员',
content: '文章内容',
read_num: 0,
local_url: '__FULL__/static/theme/img/image.png',
style: "background-image:url('__FULL__/static/theme/img/image.png')"
});
};
$rootScope.submit = function () {
if (!vali.checkAllInput()) return false;
$rootScope.item.content = editor.getData();
var data = [];
for (var i in $rootScope.list) data.push({
id: $rootScope.list[i].id,
title: $rootScope.list[i].title,
author: $rootScope.list[i].author,
digest: $rootScope.list[i].digest,
content: $rootScope.list[i].content,
read_num: $rootScope.list[i].read_num,
local_url: $rootScope.list[i].local_url,
show_cover_pic: $rootScope.list[i].show_cover_pic ? 1 : 0,
content_source_url: $rootScope.list[i].content_source_url,
});
$.form.load('{:request()->url()}', {data: data}, "post");
};
$('[name="local_url"]').on('change', function () {
var value = this.value;
$rootScope.$apply(function () {
$rootScope.setItemValue('local_url', value);
});
}); });
}; }
$rootScope.submit = function () { });
$vali.checkAllInput();
if ($form.find('.validate-error').size() > 0) {
return $.msg.tips('表单验证不成功，请输入需要的内容！');
}
$rootScope.item.content = editor.getData();
var data = [];
for (var i in $rootScope.list) data.push({
id: $rootScope.list[i].id,
title: $rootScope.list[i].title,
author: $rootScope.list[i].author,
digest: $rootScope.list[i].digest,
content: $rootScope.list[i].content,
read_num: $rootScope.list[i].read_num,
local_url: $rootScope.list[i].local_url,
show_cover_pic: $rootScope.list[i].show_cover_pic ? 1 : 0,
content_source_url: $rootScope.list[i].content_source_url,
});
$.form.load('{:request()->url()}', {data: data}, "post");
};
$('[name="local_url"]').on('change', function (value) {
value = this.value;
$rootScope.$apply(function () {
$rootScope.setItemValue('local_url', value);
});
});
}
}); });
</script> </script>
{/block} {/block}

26
public/static/admin.js
View File

@ -23,6 +23,7 @@ layui.config({base: baseRoot + 'plugs/layui_exts/'});
window.form = layui.form, window.layer = layui.layer; window.form = layui.form, window.layer = layui.layer;
window.laytpl = layui.laytpl, window.laydate = layui.laydate; window.laytpl = layui.laytpl, window.laydate = layui.laydate;
window.jQuery = window.$ = window.jQuery || window.$ || layui.$; window.jQuery = window.$ = window.jQuery || window.$ || layui.$;
window.jQuery.ajaxSetup({xhrFields: {withCredentials: true}});
/*! 配置 require 参数 */ /*! 配置 require 参数 */
require.config({ require.config({
@ -61,7 +62,7 @@ require.config({
}, shim: { }, shim: {
'jszip': {deps: ['filesaver']}, 'jszip': {deps: ['filesaver']},
'excel': {deps: [baseRoot + 'plugs/layui_exts/excel.js']}, 'excel': {deps: [baseRoot + 'plugs/layui_exts/excel.js']},
'notify': {deps: ['css!' + baseRoot + 'plugs/notify/light.css']}, 'notify': {deps: ['css!' + baseRoot + 'plugs/notify/theme.css']},
'cropper': {deps: ['css!' + baseRoot + 'plugs/cropper/cropper.min.css']}, 'cropper': {deps: ['css!' + baseRoot + 'plugs/cropper/cropper.min.css']},
'websocket': {deps: [baseRoot + 'plugs/socket/swfobject.js']}, 'websocket': {deps: [baseRoot + 'plugs/socket/swfobject.js']},
'ckeditor5': {deps: ['jquery', 'upload', 'css!' + baseRoot + 'plugs/ckeditor5/ckeditor.css']}, 'ckeditor5': {deps: ['jquery', 'upload', 'css!' + baseRoot + 'plugs/ckeditor5/ckeditor.css']},
@ -203,7 +204,7 @@ $(function () {
// https://www.jq22.com/demo/jquerygrowl-notification202104021049 // https://www.jq22.com/demo/jquerygrowl-notification202104021049
this.notify = function (title, message, time, option) { this.notify = function (title, message, time, option) {
require(['notify'], function (Notify) { require(['notify'], function (Notify) {
Notify.notify(Object.assign({title: title || '', description: message || '', position: 'top-right', closeTimeout: time || 3000}, (option || {}))); Notify.notify(Object.assign({title: title || '', description: message || '', position: 'top-right', closeTimeout: time || 3000, width: '400px'}, option || {}));
}); });
}; };
/*! 页面加载层 */ /*! 页面加载层 */
@ -572,22 +573,21 @@ $(function () {
var $this = $(this), tags = this.value ? this.value.split(',') : []; var $this = $(this), tags = this.value ? this.value.split(',') : [];
var $text = $('<textarea class="layui-input layui-input-inline layui-tag-input"></textarea>'); var $text = $('<textarea class="layui-input layui-input-inline layui-tag-input"></textarea>');
var $tags = $('<div class="layui-tags"></div>').append($text); var $tags = $('<div class="layui-tags"></div>').append($text);
$this.parent().append($tags), $text.off('keydown blur'), (tags.length > 0 && showTags(tags)); $this.parent().append($tags) && $text.off('keydown blur') && (tags.length > 0 && showTags(tags));
$text.on('blur keydown', function (event, value) { $text.on('blur keydown', function (event, value) {
if (event.keyCode === 13 || event.type === 'blur') { if (event.keyCode === 13 || event.type === 'blur') {
event.preventDefault(), (value = $text.val().replace(/^\s*|\s*$/g, '')); event.preventDefault(), (value = $text.val().replace(/^\s*|\s*$/g, ''));
if (tags.indexOf($(this).val()) > -1) return layer.msg('该标签已经存在！'); if (tags.indexOf($(this).val()) > -1) return $.msg.notify('温馨提示', '该标签已经存在！', 3000, {type: 'error', width: 280});
if (value.length > 0) tags.push(value), $this.val(tags.join(',')), showTags([value]), this.focus(), $text.val(''); else if (value.length > 0) tags.push(value), $this.val(tags.join(',')), showTags([value]), this.focus(), $text.val('');
} }
}); });
function showTags(tagsArr) { function showTags(tagsArr) {
$(tagsArr).each(function (idx, text, elem) { $(tagsArr).each(function (idx, text) {
elem = $('<div class="layui-tag"></div>').html(text + '<i class="layui-icon">&#x1006;</i>'); $('<div class="layui-tag"></div>').data('value', text).on('click', 'i', function () {
elem.on('click', 'i', function (tagText, tagIdx) { tags.splice(tags.indexOf($(this).parent().data('value')), 1);
tagText = $(this).parent().text(), tagIdx = tags.indexOf(tagText); $this.val(tags.join(',')) && $(this).parent().remove();
tags.splice(tagIdx, 1), $(this).parent().remove(), $this.val(tags.join(',')); }).insertBefore($text).html(text + '<i class="layui-icon">&#x1006;</i>');
}), $tags.append(elem, $text);
}); });
} }
}); });
@ -753,9 +753,9 @@ $(function () {
/*! 创建表单验证 */ /*! 创建表单验证 */
$.vali = function (form, done, init) { $.vali = function (form, done, init) {
require(['validate'], function (Validate) { require(['validate'], function (Validate) {
/** @type {import("./plugs/admin/validate")|Validate} */ /** @type {import("./plugs/admin/validate")|Validate}*/
var vali = $(form).data('validate') || new Validate(form, onConfirm); var vali = $(form).data('validate') || new Validate(form, onConfirm);
typeof init === 'function' && init.call(vali, $(form).formToJson()); typeof init === 'function' && init.call(vali, $(form).formToJson(), vali);
typeof done === 'function' && vali.addDoneEvent(done); typeof done === 'function' && vali.addDoneEvent(done);
}); });
}; };

2
public/static/plugs/layui/css/layui.css
View File

File diff suppressed because one or more lines are too long

2
public/static/plugs/layui/layui.js
View File

File diff suppressed because one or more lines are too long

31
public/static/plugs/notify/light.css → public/static/plugs/notify/theme.css
View File

@ -1,27 +1,27 @@
.growl-notification { .growl-notification {
/* min-height: 56px; */
width: 320px; width: 320px;
z-index: 99999999; z-index: 99999999;
position: fixed; position: fixed;
word-break: break-all;
background: #fff; background: #fff;
box-shadow: 0 0 30px 0 rgba(0, 0, 0, .1);
border-radius: 4px; border-radius: 4px;
box-shadow: 0 0 6px 1px rgba(0, 0, 0, .2)
} }
.growl-notification:before { .growl-notification:before {
border-radius: 4px 0 0 4px; top: 0;
left: 0;
width: 4px;
bottom: 0; bottom: 0;
content: ""; content: "";
left: 0;
position: absolute; position: absolute;
top: 0; border-radius: 4px 0 0 4px;
width: 4px
} }
.growl-notification__progress { .growl-notification__progress {
display: none;
width: 100%; width: 100%;
height: 100%; height: 100%;
display: none;
position: absolute; position: absolute;
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
} }
@ -40,7 +40,7 @@
display: flex; display: flex;
padding: 10px 25px; padding: 10px 25px;
position: relative; position: relative;
line-height: 1.6em; line-height: 2em;
align-items: center; align-items: center;
} }
@ -81,12 +81,12 @@
} }
.growl-notification__close { .growl-notification__close {
top: 8px;
right: 8px;
cursor: pointer; cursor: pointer;
position: absolute;
font-size: 12px; font-size: 12px;
line-height: 12px; line-height: 12px;
position: absolute;
right: 8px;
top: 8px;
transition: color .1s transition: color .1s
} }
@ -110,17 +110,18 @@
.growl-notification__title { .growl-notification__title {
color: #333; color: #333;
font-size: 16px; font-size: 15px;
font-weight: 600; font-weight: 600;
} }
.growl-notification__desc { .growl-notification__desc {
color: #000 color: #333;
font-size: 13px;
} }
.growl-notification__title + .growl-notification__desc { .growl-notification__title + .growl-notification__desc {
color: rgba(0, 0, 0, .6); color: rgba(0, 0, 0, .7);
margin-top: 5px; font-size: 14px;
} }
.growl-notification--close-on-click { .growl-notification--close-on-click {

14
public/static/theme/css/_custom.less
View File

@ -954,6 +954,20 @@ input:not(.layui-hide,[type=hidden]) {
position: relative; position: relative;
transform: scale(1); transform: scale(1);
text-align: center; text-align: center;
overflow: hidden;
&::before {
top: 0;
left: 0;
right: 0;
bottom: 0;
width: 100%;
height: 100%;
content: '';
display: block;
position: absolute;
background: rgba(0, 0, 0, .3);
}
&::after { &::after {
left: 50%; left: 50%;

4
public/static/theme/css/_display.less
View File

@ -177,6 +177,10 @@ form.layui-form fieldset {
.layui-nav { .layui-nav {
.layui-nav-item { .layui-nav-item {
.layui-elip {
padding-right: 35px !important;
}
.layui-nav-more { .layui-nav-more {
right: 15px; right: 15px;
font-size: 14px !important; font-size: 14px !important;

1
public/static/theme/css/_layout.less
View File

@ -100,7 +100,6 @@
} }
+ a.layui-elip { + a.layui-elip {
padding-right: 35px;
img { img {
width: 20px; width: 20px;

2
public/static/theme/css/console.css
View File

File diff suppressed because one or more lines are too long

2
public/static/theme/css/console.css.map
View File

File diff suppressed because one or more lines are too long