From 02538ca533f82bb3c42a290256e467fa8d8b6dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Tue, 14 Feb 2023 12:32:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/Service.php | 23 +++++++++++- app/admin/controller/Auth.php | 2 +- app/admin/controller/Base.php | 2 +- app/admin/controller/Config.php | 2 +- app/admin/controller/File.php | 2 +- app/admin/controller/Index.php | 2 +- app/admin/controller/Login.php | 2 +- app/admin/controller/Menu.php | 2 +- app/admin/controller/Oplog.php | 2 +- app/admin/controller/Queue.php | 2 +- app/admin/controller/User.php | 2 +- app/admin/controller/api/Plugs.php | 2 +- app/admin/controller/api/Queue.php | 2 +- app/admin/controller/api/System.php | 2 +- app/admin/controller/api/Upload.php | 2 +- app/admin/route/demo.php | 2 +- app/index/controller/Index.php | 14 ++----- app/wechat/Service.php | 3 +- app/wechat/command/Auto.php | 3 +- app/wechat/command/Fans.php | 3 +- app/wechat/controller/Auto.php | 3 +- app/wechat/controller/Config.php | 3 +- app/wechat/controller/Fans.php | 3 +- app/wechat/controller/Keys.php | 3 +- app/wechat/controller/Menu.php | 3 +- app/wechat/controller/News.php | 3 +- app/wechat/controller/api/Js.php | 3 +- app/wechat/controller/api/Login.php | 3 +- app/wechat/controller/api/Push.php | 5 +-- app/wechat/controller/api/Test.php | 3 +- app/wechat/controller/api/View.php | 3 +- app/wechat/model/WechatAuto.php | 3 +- app/wechat/model/WechatFans.php | 3 +- app/wechat/model/WechatFansTags.php | 3 +- app/wechat/model/WechatKeys.php | 3 +- app/wechat/model/WechatMedia.php | 3 +- app/wechat/model/WechatNews.php | 3 +- app/wechat/model/WechatNewsArticle.php | 3 +- app/wechat/service/AutoService.php | 3 +- app/wechat/service/FansService.php | 3 +- app/wechat/service/MediaService.php | 3 +- app/wechat/service/WechatService.php | 6 ++- composer.json | 6 --- config/app.php | 18 ++++----- config/cache.php | 22 ++++++++--- config/cookie.php | 12 +++--- config/database.php | 32 +++++++++++----- config/filesystem.php | 37 ------------------- config/lang.php | 9 ++--- config/log.php | 8 ++-- config/route.php | 8 ++-- config/session.php | 8 ++-- config/view.php | 10 ++--- .../20221013031925_install_admin.php | 2 +- .../20221013031926_install_admin_data.php | 24 ++---------- .../20221013045829_install_wechat.php | 3 +- .../20221013045830_install_wechat_data.php | 7 +++- public/.htaccess | 8 ---- public/static/extra/script.js | 29 +++++++++++++-- public/static/extra/style.css | 14 ++++++- 60 files changed, 208 insertions(+), 196 deletions(-) delete mode 100644 config/filesystem.php delete mode 100644 public/.htaccess diff --git a/app/admin/Service.php b/app/admin/Service.php index 9556fb79f..0d447a9dc 100644 --- a/app/admin/Service.php +++ b/app/admin/Service.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin @@ -43,6 +43,25 @@ class Service extends Plugin */ public static function menu(): array { - return []; + return [ + [ + 'name' => '系统配置', + 'subs' => [ + ['name' => '系统参数配置', 'icon' => 'layui-icon layui-icon-set', 'node' => 'admin/config/index'], + ['name' => '系统任务管理', 'icon' => 'layui-icon layui-icon-log', 'node' => 'admin/queue/index'], + ['name' => '系统日志管理', 'icon' => 'layui-icon layui-icon-form', 'node' => 'admin/oplog/index'], + ['name' => '数据字典管理', 'icon' => 'layui-icon layui-icon-code-circle', 'node' => 'admin/base/index'], + ['name' => '系统文件管理', 'icon' => 'layui-icon layui-icon-carousel', 'node' => 'admin/file/index'], + ['name' => '系统菜单管理', 'icon' => 'layui-icon layui-icon-layouts', 'node' => 'admin/menu/index'], + ], + ], + [ + 'name' => '权限管理', + 'subs' => [ + ['name' => '访问权限管理', 'icon' => 'layui-icon layui-icon-vercode', 'node' => 'admin/auth/index'], + ['name' => '系统用户管理', 'icon' => 'layui-icon layui-icon-username', 'node' => 'admin/user/index'], + ], + ], + ]; } } \ No newline at end of file diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php index 21090442c..be8e4c2ca 100644 --- a/app/admin/controller/Auth.php +++ b/app/admin/controller/Auth.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/Base.php b/app/admin/controller/Base.php index c9f55e9d1..1a95b1372 100644 --- a/app/admin/controller/Base.php +++ b/app/admin/controller/Base.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php index 7cb5f1df6..d638dbd72 100644 --- a/app/admin/controller/Config.php +++ b/app/admin/controller/Config.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/File.php b/app/admin/controller/File.php index 3aaefe325..996899a4f 100644 --- a/app/admin/controller/File.php +++ b/app/admin/controller/File.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 0a2e17cc6..6d67486e0 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php index 343ccc38c..5df6355f0 100644 --- a/app/admin/controller/Login.php +++ b/app/admin/controller/Login.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php index 70a12d627..25a493bd1 100644 --- a/app/admin/controller/Menu.php +++ b/app/admin/controller/Menu.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php index c37074144..8693dc30f 100644 --- a/app/admin/controller/Oplog.php +++ b/app/admin/controller/Oplog.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php index e2ecaaa88..05591e287 100644 --- a/app/admin/controller/Queue.php +++ b/app/admin/controller/Queue.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index ad39bb4b0..9319ffc9d 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/api/Plugs.php b/app/admin/controller/api/Plugs.php index 110d7d09b..316f5625c 100644 --- a/app/admin/controller/api/Plugs.php +++ b/app/admin/controller/api/Plugs.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/api/Queue.php b/app/admin/controller/api/Queue.php index 2c96c7907..1aa0cef4e 100644 --- a/app/admin/controller/api/Queue.php +++ b/app/admin/controller/api/Queue.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/api/System.php b/app/admin/controller/api/System.php index 32894ece4..bd3d9fa5d 100644 --- a/app/admin/controller/api/System.php +++ b/app/admin/controller/api/System.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php index 61638accc..a0cbe22b4 100644 --- a/app/admin/controller/api/Upload.php +++ b/app/admin/controller/api/Upload.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/admin/route/demo.php b/app/admin/route/demo.php index d39292f51..929d8a7f1 100644 --- a/app/admin/route/demo.php +++ b/app/admin/route/demo.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index 36ae54071..ea343c450 100644 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -1,31 +1,25 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- namespace app\index\controller; use think\admin\Controller; -/** - * Class Index - * @package app\index\controller - */ class Index extends Controller { public function index() { $this->redirect(sysuri('admin/login/index')); } -} \ No newline at end of file +} diff --git a/app/wechat/Service.php b/app/wechat/Service.php index 5c7d65ab0..2e9a9f88e 100644 --- a/app/wechat/Service.php +++ b/app/wechat/Service.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat; diff --git a/app/wechat/command/Auto.php b/app/wechat/command/Auto.php index 5d5532a5f..21f00cf9b 100644 --- a/app/wechat/command/Auto.php +++ b/app/wechat/command/Auto.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\command; diff --git a/app/wechat/command/Fans.php b/app/wechat/command/Fans.php index 0e8e981cd..e32a9dfec 100644 --- a/app/wechat/command/Fans.php +++ b/app/wechat/command/Fans.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\command; diff --git a/app/wechat/controller/Auto.php b/app/wechat/controller/Auto.php index 070e01f85..06b5665a5 100644 --- a/app/wechat/controller/Auto.php +++ b/app/wechat/controller/Auto.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller; diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php index 9c90455f6..eb78eaeca 100644 --- a/app/wechat/controller/Config.php +++ b/app/wechat/controller/Config.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller; diff --git a/app/wechat/controller/Fans.php b/app/wechat/controller/Fans.php index f5bea9217..9f3e5a1b8 100644 --- a/app/wechat/controller/Fans.php +++ b/app/wechat/controller/Fans.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller; diff --git a/app/wechat/controller/Keys.php b/app/wechat/controller/Keys.php index 128db8e6e..f9d03fdd8 100644 --- a/app/wechat/controller/Keys.php +++ b/app/wechat/controller/Keys.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller; diff --git a/app/wechat/controller/Menu.php b/app/wechat/controller/Menu.php index d1fd53702..4be1ffa47 100644 --- a/app/wechat/controller/Menu.php +++ b/app/wechat/controller/Menu.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller; diff --git a/app/wechat/controller/News.php b/app/wechat/controller/News.php index 5fd4474fa..66a7d557b 100644 --- a/app/wechat/controller/News.php +++ b/app/wechat/controller/News.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller; diff --git a/app/wechat/controller/api/Js.php b/app/wechat/controller/api/Js.php index c512b2f71..80c59d507 100644 --- a/app/wechat/controller/api/Js.php +++ b/app/wechat/controller/api/Js.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller\api; diff --git a/app/wechat/controller/api/Login.php b/app/wechat/controller/api/Login.php index a5bdea354..c9505bc2f 100644 --- a/app/wechat/controller/api/Login.php +++ b/app/wechat/controller/api/Login.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller\api; diff --git a/app/wechat/controller/api/Push.php b/app/wechat/controller/api/Push.php index 98f1e4f45..86078348e 100644 --- a/app/wechat/controller/api/Push.php +++ b/app/wechat/controller/api/Push.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- @@ -299,9 +299,6 @@ class Push extends Controller * 同步粉丝状态 * @param boolean $state 订阅状态 * @return boolean - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ private function _setUserInfo(bool $state): bool { diff --git a/app/wechat/controller/api/Test.php b/app/wechat/controller/api/Test.php index 6679fa131..cf2b7d20c 100644 --- a/app/wechat/controller/api/Test.php +++ b/app/wechat/controller/api/Test.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller\api; diff --git a/app/wechat/controller/api/View.php b/app/wechat/controller/api/View.php index 6fbb5cf25..27a3e3b9e 100644 --- a/app/wechat/controller/api/View.php +++ b/app/wechat/controller/api/View.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\controller\api; diff --git a/app/wechat/model/WechatAuto.php b/app/wechat/model/WechatAuto.php index 206ad0ba4..c3ecc69c4 100644 --- a/app/wechat/model/WechatAuto.php +++ b/app/wechat/model/WechatAuto.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\model; diff --git a/app/wechat/model/WechatFans.php b/app/wechat/model/WechatFans.php index 1f7d23532..26ee95f37 100644 --- a/app/wechat/model/WechatFans.php +++ b/app/wechat/model/WechatFans.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\model; diff --git a/app/wechat/model/WechatFansTags.php b/app/wechat/model/WechatFansTags.php index 045787f77..29d206796 100644 --- a/app/wechat/model/WechatFansTags.php +++ b/app/wechat/model/WechatFansTags.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\model; diff --git a/app/wechat/model/WechatKeys.php b/app/wechat/model/WechatKeys.php index a05a2e684..194a5bb7c 100644 --- a/app/wechat/model/WechatKeys.php +++ b/app/wechat/model/WechatKeys.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\model; diff --git a/app/wechat/model/WechatMedia.php b/app/wechat/model/WechatMedia.php index f9b36dde7..f6186d817 100644 --- a/app/wechat/model/WechatMedia.php +++ b/app/wechat/model/WechatMedia.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\model; diff --git a/app/wechat/model/WechatNews.php b/app/wechat/model/WechatNews.php index 520cb4008..0aab501cb 100644 --- a/app/wechat/model/WechatNews.php +++ b/app/wechat/model/WechatNews.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\model; diff --git a/app/wechat/model/WechatNewsArticle.php b/app/wechat/model/WechatNewsArticle.php index bc30d1ac1..1ac595a6a 100644 --- a/app/wechat/model/WechatNewsArticle.php +++ b/app/wechat/model/WechatNewsArticle.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\model; diff --git a/app/wechat/service/AutoService.php b/app/wechat/service/AutoService.php index 24b9fbe93..efccf36bf 100644 --- a/app/wechat/service/AutoService.php +++ b/app/wechat/service/AutoService.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\service; diff --git a/app/wechat/service/FansService.php b/app/wechat/service/FansService.php index 61395868c..cb450925b 100644 --- a/app/wechat/service/FansService.php +++ b/app/wechat/service/FansService.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\service; diff --git a/app/wechat/service/MediaService.php b/app/wechat/service/MediaService.php index 21980ef2c..3e0313bd7 100644 --- a/app/wechat/service/MediaService.php +++ b/app/wechat/service/MediaService.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\service; diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php index 82b2c7c20..584d64bf9 100644 --- a/app/wechat/service/WechatService.php +++ b/app/wechat/service/WechatService.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- namespace app\wechat\service; @@ -114,7 +115,8 @@ class WechatService extends Service $data['sign'] = md5("{$data['class']}#{$appid}#{$appkey}#{$data['time']}#{$data['nostr']}"); // 创建远程连接，默认使用 JSON-RPC 方式调用接口 $token = enbase64url(json_encode($data, JSON_UNESCAPED_UNICODE)); - return new JsonRpcClient("https://open.cuci.cc/service/api.client/jsonrpc?not_init_session=1&token={$token}"); + $jsonrpc = sysconf('wechat.service_jsonrpc') ?: 'https://open.cuci.cc/service/api.client/jsonrpc?not_init_session=1&token=TOKEN'; + return new JsonRpcClient(str_replace('=TOKEN', "={$token}", $jsonrpc)); } } diff --git a/composer.json b/composer.json index b71c2f765..96131ae77 100644 --- a/composer.json +++ b/composer.json @@ -28,12 +28,6 @@ "app\\": "app" } }, - "scripts": { - "post-autoload-dump": [ - "@php think service:discover", - "@php think vendor:publish" - ] - }, "config": { "allow-plugins": { "zoujingli/think-install": true diff --git a/config/app.php b/config/app.php index 1f52662b0..e1e20b201 100644 --- a/config/app.php +++ b/config/app.php @@ -1,17 +1,15 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- return [ @@ -38,14 +36,12 @@ return [ // CORS 授权请求方法 'cors_methods' => 'GET,PUT,POST,PATCH,DELETE', // CORS 跨域头部字段 - 'cors_headers' => 'Api-Type,Api-Name,Api-Uuid,Api-Token,User-Form-Token,User-Token,Token', - // 显示错误的消息，仅产品模式有效 + 'cors_headers' => 'Api-Type,Api-Name,Api-Uuid,Jwt-Token,Api-Token,User-Form-Token,User-Token,Token', + // 显示错误消息内容，仅生产模式有效 'error_message' => '页面错误！请稍后再试～', - // 异常模板路径配置，仅开发模式有效 - 'exception_tmpl' => app()->getRootPath() . 'app/admin/view/error.php', // 异常状态模板配置，仅生产模式有效 'http_exception_template' => [ - 404 => app()->getRootPath() . 'public/static/theme/err/404.html', - 500 => app()->getRootPath() . 'public/static/theme/err/500.html', + 404 => syspath('public/static/theme/err/404.html'), + 500 => syspath('public/static/theme/err/500.html'), ], ]; \ No newline at end of file diff --git a/config/cache.php b/config/cache.php index 2d0f293a9..0df23750b 100644 --- a/config/cache.php +++ b/config/cache.php @@ -1,17 +1,15 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- return [ @@ -33,5 +31,19 @@ return [ // 序列化机制 'serialize' => [], ], + 'safe' => [ + // 驱动方式 + 'type' => 'File', + // 缓存保存目录 + 'path' => syspath('safefile/cache/'), + // 缓存名称前缀 + 'prefix' => '', + // 缓存有效期 0 表示永久缓存 + 'expire' => 0, + // 缓存标签前缀 + 'tag_prefix' => 'tag:', + // 序列化机制 + 'serialize' => [], + ], ], ]; \ No newline at end of file diff --git a/config/cookie.php b/config/cookie.php index 091cebc91..a3b0d3528 100644 --- a/config/cookie.php +++ b/config/cookie.php @@ -1,17 +1,15 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- return [ @@ -26,7 +24,7 @@ return [ // 是否使用 setcookie 'setcookie' => true, // cookie 安全传输，只支持 https 协议 - 'secure' => app()->request->isSsl(), + 'secure' => request()->isSsl(), // samesite 安全设置，支持 'strict' 'lax' 'none' - 'samesite' => app()->request->isSsl() ? 'none' : 'lax', + 'samesite' => request()->isSsl() ? 'none' : 'lax', ]; diff --git a/config/database.php b/config/database.php index eed0891d5..766313fa8 100644 --- a/config/database.php +++ b/config/database.php @@ -1,22 +1,20 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- return [ // 默认使用的数据库连接配置 - 'default' => 'mysql', + 'default' => 'sqlite', // 自定义时间查询规则 'time_query_rule' => [], // 自动写入时间戳字段 @@ -25,7 +23,7 @@ return [ 'datetime_format' => 'Y-m-d H:i:s', // 数据库连接配置信息 'connections' => [ - 'mysql' => [ + 'mysql' => [ // 数据库类型 'type' => 'mysql', // 服务器地址 @@ -52,14 +50,30 @@ return [ 'master_num' => 1, // 指定从服务器序号 'slave_no' => '', - // 是否严格检查字段是否存在 + // 检查字段是否存在 'fields_strict' => true, // 是否需要断线重连 'break_reconnect' => false, // 监听SQL执行日志 'trigger_sql' => true, // 开启字段类型缓存 - 'fields_cache' => !app()->isDebug(), + 'fields_cache' => isOnline(), + ], + 'sqlite' => [ + 'charset' => 'utf8', + // 数据库类型 + 'type' => 'sqlite', + // 数据库文件 + 'database' => syspath('database/sqlite.db'), + // 监听执行日志 + 'trigger_sql' => true, + // 其他参数字段 + 'deploy' => 0, + 'prefix' => '', + 'hostname' => '', + 'hostport' => '', + 'username' => '', + 'password' => '', ], ], ]; diff --git a/config/filesystem.php b/config/filesystem.php deleted file mode 100644 index 4cdcecd24..000000000 --- a/config/filesystem.php +++ /dev/null @@ -1,37 +0,0 @@ - 'local', - // 磁盘列表 - 'disks' => [ - 'local' => [ - 'type' => 'local', - 'root' => app()->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'storage', - ], - 'public' => [ - // 磁盘类型 - 'type' => 'local', - // 磁盘路径 - 'root' => app()->getRootPath() . 'public' . DIRECTORY_SEPARATOR . 'storage', - // 磁盘路径对应的外部URL路径 - 'url' => '/storage', - // 可见性 - 'visibility' => 'public', - ], - ], -]; \ No newline at end of file diff --git a/config/lang.php b/config/lang.php index 27cb11e41..9af713a4d 100644 --- a/config/lang.php +++ b/config/lang.php @@ -1,17 +1,15 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- return [ @@ -21,6 +19,7 @@ return [ 'allow_lang_list' => ['zh-cn'], // 转义为对应语言包名称 'accept_language' => [ + 'en' => 'en-us', 'zh-hans-cn' => 'zh-cn', ], // 多语言自动侦测变量名 diff --git a/config/log.php b/config/log.php index 1aa1650a8..54d8b1a6c 100644 --- a/config/log.php +++ b/config/log.php @@ -1,17 +1,15 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- return [ diff --git a/config/route.php b/config/route.php index 756fa6e52..7cae4a018 100644 --- a/config/route.php +++ b/config/route.php @@ -1,17 +1,15 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- return [ diff --git a/config/session.php b/config/session.php index b0d917f59..0d26fc92c 100644 --- a/config/session.php +++ b/config/session.php @@ -1,17 +1,15 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- return [ diff --git a/config/view.php b/config/view.php index 0dcbabd39..d5001b973 100644 --- a/config/view.php +++ b/config/view.php @@ -1,17 +1,15 @@ // +---------------------------------------------------------------------- // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- -// | 开源协议 ( https://mit-license.org ) // | 免费声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- -// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin -// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static // +---------------------------------------------------------------------- return [ @@ -26,7 +24,7 @@ return [ // 模板文件名分隔符 'view_depr' => DIRECTORY_SEPARATOR, // 模板缓存配置 - 'tpl_cache' => !app()->isDebug(), + 'tpl_cache' => isOnline(), // 模板引擎标签开始标记 'tpl_begin' => '{', // 模板引擎标签结束标记 diff --git a/database/migrations/20221013031925_install_admin.php b/database/migrations/20221013031925_install_admin.php index 716766ead..3c78be839 100644 --- a/database/migrations/20221013031925_install_admin.php +++ b/database/migrations/20221013031925_install_admin.php @@ -8,7 +8,7 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin diff --git a/database/migrations/20221013031926_install_admin_data.php b/database/migrations/20221013031926_install_admin_data.php index 03fbda6dd..62b61198c 100644 --- a/database/migrations/20221013031926_install_admin_data.php +++ b/database/migrations/20221013031926_install_admin_data.php @@ -8,12 +8,13 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin // | github 代码仓库：https://github.com/zoujingli/think-plugs-admin // +---------------------------------------------------------------------- +use app\admin\Service; use think\admin\extend\PhinxExtend; use think\admin\model\SystemConfig; use think\admin\model\SystemUser; @@ -73,26 +74,7 @@ class InstallAdminData extends Migrator [ 'name' => '系统管理', 'sort' => '100', - 'subs' => [ - [ - 'name' => '系统配置', - 'subs' => [ - ['name' => '系统参数配置', 'icon' => 'layui-icon layui-icon-set', 'node' => 'admin/config/index'], - ['name' => '系统任务管理', 'icon' => 'layui-icon layui-icon-log', 'node' => 'admin/queue/index'], - ['name' => '系统日志管理', 'icon' => 'layui-icon layui-icon-form', 'node' => 'admin/oplog/index'], - ['name' => '数据字典管理', 'icon' => 'layui-icon layui-icon-code-circle', 'node' => 'admin/base/index'], - ['name' => '系统文件管理', 'icon' => 'layui-icon layui-icon-carousel', 'node' => 'admin/file/index'], - ['name' => '系统菜单管理', 'icon' => 'layui-icon layui-icon-layouts', 'node' => 'admin/menu/index'], - ], - ], - [ - 'name' => '权限管理', - 'subs' => [ - ['name' => '访问权限管理', 'icon' => 'layui-icon layui-icon-vercode', 'node' => 'admin/auth/index'], - ['name' => '系统用户管理', 'icon' => 'layui-icon layui-icon-username', 'node' => 'admin/user/index'], - ], - ], - ], + 'subs' => Service::menu(), ], ], [ 'url|node' => 'admin/config/index' diff --git a/database/migrations/20221013045829_install_wechat.php b/database/migrations/20221013045829_install_wechat.php index f2fcfbc77..26f6cd6d1 100644 --- a/database/migrations/20221013045829_install_wechat.php +++ b/database/migrations/20221013045829_install_wechat.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- use think\migration\Migrator; diff --git a/database/migrations/20221013045830_install_wechat_data.php b/database/migrations/20221013045830_install_wechat_data.php index 862974a23..02a7b9589 100644 --- a/database/migrations/20221013045830_install_wechat_data.php +++ b/database/migrations/20221013045830_install_wechat_data.php @@ -8,9 +8,10 @@ // | 官方网站: https://thinkadmin.top // +---------------------------------------------------------------------- // | 开源协议 ( https://mit-license.org ) -// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// | 免责声明 ( https://thinkadmin.top/disclaimer ) // +---------------------------------------------------------------------- // | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat +// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat // +---------------------------------------------------------------------- use app\wechat\Service; @@ -46,6 +47,8 @@ class InstallWechatData extends Migrator 'sort' => '200', 'subs' => Service::menu(), ], - ], ['node' => 'wechat/config/options']); + ], [ + 'url|node' => 'wechat/config/options' + ]); } } diff --git a/public/.htaccess b/public/.htaccess deleted file mode 100644 index f1adcc2fa..000000000 --- a/public/.htaccess +++ /dev/null @@ -1,8 +0,0 @@ - - Options +FollowSymlinks -Multiviews - RewriteEngine On - - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L] - \ No newline at end of file diff --git a/public/static/extra/script.js b/public/static/extra/script.js index 3484f4419..bcffefdce 100644 --- a/public/static/extra/script.js +++ b/public/static/extra/script.js @@ -1,7 +1,18 @@ -// -------------------------------------------------- -// 自定义后台扩展脚本，需要在加载 admin.js 后载入 -// 使用 php think xadmin:install static 时不会更新此文件 -// -------------------------------------------------- +// +---------------------------------------------------------------------- +// | Static Plugin for ThinkAdmin +// +---------------------------------------------------------------------- +// | 官方网站: https://thinkadmin.top +// +---------------------------------------------------------------------- +// | 版权所有 2014~2023 Anyon +// +---------------------------------------------------------------------- +// | 免费声明 ( https://thinkadmin.top/disclaimer ) +// +---------------------------------------------------------------------- +// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static +// +---------------------------------------------------------------------- +// | 自定义后台扩展脚本，需要在加载 admin.js 后载入 +// | 使用 php think xadmin:install static 时不会更新此文件 +// +---------------------------------------------------------------------- + $(function () { window.$body = $('body'); @@ -27,4 +38,14 @@ $(function () { // }); /*! 其他 javascript 脚本代码 */ + + // 显示表格图片 + window.showTableImage = function (image, circle, size, title) { + if (typeof image !== 'string' || image.length < 5) { + return '-' + (title ? laytpl('{{d.title}}').render({title: title}) : ''); + } + return laytpl('
').render({ + size: size || 'ss', class: circle ? 'shadow-inset' : 'headimg-no', image: image, style: 'background-image:url(' + image + ');margin-right:0' + }) + (title ? laytpl('{{d.title}}').render({title: title}) : ''); + }; }); \ No newline at end of file diff --git a/public/static/extra/style.css b/public/static/extra/style.css index c11e852b5..0614bf5f1 100644 --- a/public/static/extra/style.css +++ b/public/static/extra/style.css @@ -1,4 +1,14 @@ -/* -------------------------------------------------- +/* +---------------------------------------------------------------------- +/* | Static Plugin for ThinkAdmin +/* +---------------------------------------------------------------------- +/* | 版权所有 2014~2023 Anyon +/* +---------------------------------------------------------------------- +/* | 官方网站: https://thinkadmin.top +/* +---------------------------------------------------------------------- +/* | 免费声明 ( https://thinkadmin.top/disclaimer ) +/* +---------------------------------------------------------------------- +/* | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-static +/* +---------------------------------------------------------------------- /* 自定义后台扩展样式，需要在加载 console.css 后载入 /* 使用 php think xadmin:install static 时不会更新此文件 -/* -------------------------------------------------- */ \ No newline at end of file +/* +---------------------------------------------------------------------- */