From 9bd04ab275fdf273ce15aed8f8bd15ce4f95c0a9 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 19 Jan 2024 23:37:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/DownloadController.php | 2 +- .../channel/AppSettingController.php | 51 ---- .../channel/MnpSettingsController.php | 50 ---- .../channel/OfficialAccountMenuController.php | 71 ------ .../OfficialAccountReplyController.php | 138 ----------- .../OfficialAccountSettingController.php | 50 ---- .../channel/OpenSettingController.php | 52 ---- .../channel/WebPageSettingController.php | 52 ---- .../setting/CustomerServiceController.php | 49 ---- .../setting/HotSearchController.php | 54 ----- .../setting/TransactionSettingsController.php | 51 ---- app/admin/lists/article/ArticleLists.php | 83 ------- .../channel/OfficialAccountReplyLists.php | 80 ------ app/admin/logic/article/ArticleCateLogic.php | 127 ---------- app/admin/logic/article/ArticleLogic.php | 121 ---------- app/admin/logic/channel/AppSettingLogic.php | 56 ----- app/admin/logic/channel/MnpSettingsLogic.php | 72 ------ .../channel/OfficialAccountMenuLogic.php | 228 ------------------ .../channel/OfficialAccountReplyLogic.php | 217 ----------------- .../channel/OfficialAccountSettingLogic.php | 76 ------ app/admin/logic/channel/OpenSettingLogic.php | 55 ----- .../logic/channel/WebPageSettingLogic.php | 59 ----- .../logic/decorate/DecorateDataLogic.php | 56 ----- .../logic/decorate/DecoratePageLogic.php | 67 ----- .../logic/decorate/DecorateTabbarLogic.php | 80 ------ .../logic/setting/CustomerServiceLogic.php | 65 ----- app/admin/logic/setting/HotSearchLogic.php | 75 ------ app/admin/logic/setting/StorageLogic.php | 3 +- .../setting/TransactionSettingsLogic.php | 64 ----- app/admin/logic/setting/system/CacheLogic.php | 4 +- .../validate/channel/MnpSettingsValidate.php | 36 --- .../channel/OfficialAccountReplyValidate.php | 72 ------ .../OfficialAccountSettingValidate.php | 38 --- .../validate/channel/OpenSettingValidate.php | 34 --- .../channel/WebPageSettingValidate.php | 33 --- .../setting/TransactionSettingsValidate.php | 51 ---- app/api/controller/IndexController.php | 2 +- app/common/model/article/Article.php | 12 - .../model/channel/OfficialAccountReply.php | 28 --- composer.json | 3 +- 40 files changed, 6 insertions(+), 2511 deletions(-) delete mode 100755 app/admin/controller/channel/AppSettingController.php delete mode 100755 app/admin/controller/channel/MnpSettingsController.php delete mode 100755 app/admin/controller/channel/OfficialAccountMenuController.php delete mode 100755 app/admin/controller/channel/OfficialAccountReplyController.php delete mode 100755 app/admin/controller/channel/OfficialAccountSettingController.php delete mode 100755 app/admin/controller/channel/OpenSettingController.php delete mode 100755 app/admin/controller/channel/WebPageSettingController.php delete mode 100755 app/admin/controller/setting/CustomerServiceController.php delete mode 100755 app/admin/controller/setting/HotSearchController.php delete mode 100755 app/admin/controller/setting/TransactionSettingsController.php delete mode 100644 app/admin/lists/article/ArticleLists.php delete mode 100755 app/admin/lists/channel/OfficialAccountReplyLists.php delete mode 100755 app/admin/logic/article/ArticleCateLogic.php delete mode 100755 app/admin/logic/article/ArticleLogic.php delete mode 100755 app/admin/logic/channel/AppSettingLogic.php delete mode 100755 app/admin/logic/channel/MnpSettingsLogic.php delete mode 100755 app/admin/logic/channel/OfficialAccountMenuLogic.php delete mode 100755 app/admin/logic/channel/OfficialAccountReplyLogic.php delete mode 100755 app/admin/logic/channel/OfficialAccountSettingLogic.php delete mode 100755 app/admin/logic/channel/OpenSettingLogic.php delete mode 100755 app/admin/logic/channel/WebPageSettingLogic.php delete mode 100755 app/admin/logic/decorate/DecorateDataLogic.php delete mode 100755 app/admin/logic/decorate/DecoratePageLogic.php delete mode 100755 app/admin/logic/decorate/DecorateTabbarLogic.php delete mode 100755 app/admin/logic/setting/CustomerServiceLogic.php delete mode 100755 app/admin/logic/setting/HotSearchLogic.php delete mode 100755 app/admin/logic/setting/TransactionSettingsLogic.php delete mode 100755 app/admin/validate/channel/MnpSettingsValidate.php delete mode 100755 app/admin/validate/channel/OfficialAccountReplyValidate.php delete mode 100755 app/admin/validate/channel/OfficialAccountSettingValidate.php delete mode 100755 app/admin/validate/channel/OpenSettingValidate.php delete mode 100755 app/admin/validate/channel/WebPageSettingValidate.php delete mode 100755 app/admin/validate/setting/TransactionSettingsValidate.php delete mode 100644 app/common/model/article/Article.php delete mode 100755 app/common/model/channel/OfficialAccountReply.php diff --git a/app/admin/controller/DownloadController.php b/app/admin/controller/DownloadController.php index 8d5cdc4..8bb4f31 100644 --- a/app/admin/controller/DownloadController.php +++ b/app/admin/controller/DownloadController.php @@ -6,7 +6,7 @@ namespace app\admin\controller; use app\common\cache\ExportCache; use app\common\service\JsonService; -use think\facade\Cache; +use support\Cache; class DownloadController extends BaseAdminController { diff --git a/app/admin/controller/channel/AppSettingController.php b/app/admin/controller/channel/AppSettingController.php deleted file mode 100755 index 032038c..0000000 --- a/app/admin/controller/channel/AppSettingController.php +++ /dev/null @@ -1,51 +0,0 @@ -data($result); - } - - - /** - * @notes App设置 - * @author 乔峰 - * @date 2022/3/29 10:25 - */ - public function setConfig() - { - $params = $this->request->post(); - AppSettingLogic::setConfig($params); - return $this->success('操作成功', [], 1, 1); - } -} \ No newline at end of file diff --git a/app/admin/controller/channel/MnpSettingsController.php b/app/admin/controller/channel/MnpSettingsController.php deleted file mode 100755 index 603ab6d..0000000 --- a/app/admin/controller/channel/MnpSettingsController.php +++ /dev/null @@ -1,50 +0,0 @@ -getConfig(); - return $this->data($result); - } - - /** - * @notes 设置小程序配置 - * @author ljj - * @date 2022/2/16 9:51 上午 - */ - public function setConfig() - { - $params = (new MnpSettingsValidate())->post()->goCheck(); - (new MnpSettingsLogic())->setConfig($params); - return $this->success('操作成功', [], 1, 1); - } -} \ No newline at end of file diff --git a/app/admin/controller/channel/OfficialAccountMenuController.php b/app/admin/controller/channel/OfficialAccountMenuController.php deleted file mode 100755 index 075c543..0000000 --- a/app/admin/controller/channel/OfficialAccountMenuController.php +++ /dev/null @@ -1,71 +0,0 @@ -request->post(); - $result = OfficialAccountMenuLogic::save($params); - if(false === $result) { - return $this->fail(OfficialAccountMenuLogic::getError()); - } - return $this->success('保存成功',[],1,1); - } - - - /** - * @notes 保存发布菜单 - * @author 乔峰 - * @date 2022/3/29 10:42 - */ - public function saveAndPublish() - { - $params = $this->request->post(); - $result = OfficialAccountMenuLogic::saveAndPublish($params); - if($result) { - return $this->success('保存并发布成功',[],1,1); - } - return $this->fail(OfficialAccountMenuLogic::getError()); - } - - - - /** - * @notes 查看菜单详情 - * @author 乔峰 - * @date 2022/3/29 10:42 - */ - public function detail() - { - $result = OfficialAccountMenuLogic::detail(); - return $this->data($result); - } -} \ No newline at end of file diff --git a/app/admin/controller/channel/OfficialAccountReplyController.php b/app/admin/controller/channel/OfficialAccountReplyController.php deleted file mode 100755 index a94775f..0000000 --- a/app/admin/controller/channel/OfficialAccountReplyController.php +++ /dev/null @@ -1,138 +0,0 @@ -dataLists(new OfficialAccountReplyLists()); - } - - - /** - * @notes 添加回复(关注/关键词/默认) - * @author 乔峰 - * @date 2022/3/29 10:58 - */ - public function add() - { - $params = (new OfficialAccountReplyValidate())->post()->goCheck('add'); - $result = OfficialAccountReplyLogic::add($params); - if ($result) { - return $this->success('操作成功', [], 1, 1); - } - return $this->fail(OfficialAccountReplyLogic::getError()); - } - - - /** - * @notes 查看回复详情 - * @author 乔峰 - * @date 2022/3/29 10:58 - */ - public function detail() - { - $params = (new OfficialAccountReplyValidate())->goCheck('detail'); - $result = OfficialAccountReplyLogic::detail($params); - return $this->data($result); - } - - - /** - * @notes 编辑回复(关注/关键词/默认) - * @author 乔峰 - * @date 2022/3/29 10:58 - */ - public function edit() - { - $params = (new OfficialAccountReplyValidate())->post()->goCheck('edit'); - $result = OfficialAccountReplyLogic::edit($params); - if ($result) { - return $this->success('操作成功', [], 1, 1); - } - return $this->fail(OfficialAccountReplyLogic::getError()); - } - - - /** - * @notes 删除回复(关注/关键词/默认) - * @author 乔峰 - * @date 2022/3/29 10:59 - */ - public function delete() - { - $params = (new OfficialAccountReplyValidate())->post()->goCheck('delete'); - OfficialAccountReplyLogic::delete($params); - return $this->success('操作成功', [], 1, 1); - } - - - /** - * @notes 更新排序 - * @author 乔峰 - * @date 2022/3/29 10:59 - */ - public function sort() - { - $params = (new OfficialAccountReplyValidate())->post()->goCheck('sort'); - OfficialAccountReplyLogic::sort($params); - return $this->success('操作成功', [], 1, 1); - } - - - /** - * @notes 更新状态 - * @author 乔峰 - * @date 2022/3/29 10:59 - */ - public function status() - { - $params = (new OfficialAccountReplyValidate())->post()->goCheck('status'); - OfficialAccountReplyLogic::status($params); - return $this->success('操作成功', [], 1, 1); - } - - - /** - * @notes 微信公众号回调 - * @throws \ReflectionException - * @author 乔峰 - * @date 2022/3/29 10:59 - */ - public function index() - { - OfficialAccountReplyLogic::index(); - } -} \ No newline at end of file diff --git a/app/admin/controller/channel/OfficialAccountSettingController.php b/app/admin/controller/channel/OfficialAccountSettingController.php deleted file mode 100755 index 4f7f50e..0000000 --- a/app/admin/controller/channel/OfficialAccountSettingController.php +++ /dev/null @@ -1,50 +0,0 @@ -getConfig(); - return $this->data($result); - } - - /** - * @notes 设置公众号配置 - * @author ljj - * @date 2022/2/16 10:09 上午 - */ - public function setConfig() - { - $params = (new OfficialAccountSettingValidate())->post()->goCheck(); - (new OfficialAccountSettingLogic())->setConfig($params); - return $this->success('操作成功',[],1,1); - } -} \ No newline at end of file diff --git a/app/admin/controller/channel/OpenSettingController.php b/app/admin/controller/channel/OpenSettingController.php deleted file mode 100755 index e34af0d..0000000 --- a/app/admin/controller/channel/OpenSettingController.php +++ /dev/null @@ -1,52 +0,0 @@ -data($result); - } - - - /** - * @notes 微信开放平台设置 - * @author 乔峰 - * @date 2022/3/29 11:03 - */ - public function setConfig() - { - $params = (new OpenSettingValidate())->post()->goCheck(); - OpenSettingLogic::setConfig($params); - return $this->success('操作成功', [], 1, 1); - } -} \ No newline at end of file diff --git a/app/admin/controller/channel/WebPageSettingController.php b/app/admin/controller/channel/WebPageSettingController.php deleted file mode 100755 index b4f7162..0000000 --- a/app/admin/controller/channel/WebPageSettingController.php +++ /dev/null @@ -1,52 +0,0 @@ -data($result); - } - - - /** - * @notes H5设置 - * @author 乔峰 - * @date 2022/3/29 10:36 - */ - public function setConfig() - { - $params = (new WebPageSettingValidate())->post()->goCheck(); - WebPageSettingLogic::setConfig($params); - return $this->success('操作成功', [], 1, 1); - } -} \ No newline at end of file diff --git a/app/admin/controller/setting/CustomerServiceController.php b/app/admin/controller/setting/CustomerServiceController.php deleted file mode 100755 index caaf427..0000000 --- a/app/admin/controller/setting/CustomerServiceController.php +++ /dev/null @@ -1,49 +0,0 @@ -data($result); - } - - /** - * @notes 设置客服设置 - * @author ljj - * @date 2022/2/15 12:11 下午 - */ - public function setConfig() - { - $params = $this->request->post(); - CustomerServiceLogic::setConfig($params); - return $this->success('设置成功', [], 1, 1); - } -} \ No newline at end of file diff --git a/app/admin/controller/setting/HotSearchController.php b/app/admin/controller/setting/HotSearchController.php deleted file mode 100755 index 0b3b620..0000000 --- a/app/admin/controller/setting/HotSearchController.php +++ /dev/null @@ -1,54 +0,0 @@ -data($result); - } - - - /** - * @notes 设置热门搜索 - * @author 乔峰 - * @date 2022/9/5 19:00 - */ - public function setConfig() - { - $params = $this->request->post(); - $result = HotSearchLogic::setConfig($params); - if (false === $result) { - return $this->fail(HotSearchLogic::getError() ?: '系统错误'); - } - return $this->success('设置成功', [], 1, 1); - } -} \ No newline at end of file diff --git a/app/admin/controller/setting/TransactionSettingsController.php b/app/admin/controller/setting/TransactionSettingsController.php deleted file mode 100755 index 18ab825..0000000 --- a/app/admin/controller/setting/TransactionSettingsController.php +++ /dev/null @@ -1,51 +0,0 @@ -data($result); - } - - /** - * @notes 设置交易设置 - * @author ljj - * @date 2022/2/15 11:50 上午 - */ - public function setConfig() - { - $params = (new TransactionSettingsValidate())->post()->goCheck('setConfig'); - TransactionSettingsLogic::setConfig($params); - return $this->success('操作成功',[],1,1); - } -} \ No newline at end of file diff --git a/app/admin/lists/article/ArticleLists.php b/app/admin/lists/article/ArticleLists.php deleted file mode 100644 index b80a3dd..0000000 --- a/app/admin/lists/article/ArticleLists.php +++ /dev/null @@ -1,83 +0,0 @@ - ['title'], - '=' => ['cid', 'is_show'] - ]; - } - - /** - * @notes 设置支持排序字段 - * @return array - * @author heshihu - * @date 2022/2/9 15:11 - */ - public function setSortFields(): array - { - return ['create_time' => 'create_time', 'id' => 'id']; - } - - /** - * @notes 设置默认排序 - * @return array - * @author heshihu - * @date 2022/2/9 15:08 - */ - public function setDefaultOrder(): array - { - return ['sort' => 'desc', 'id' => 'desc']; - } - - /** - * @notes 获取管理列表 - * @return array - * @author heshihu - * @date 2022/2/21 17:11 - */ - public function lists(): array - { - $ArticleLists = Article::where($this->searchWhere) - ->append(['cate_name', 'click']) - ->limit($this->limitOffset, $this->limitLength) - ->order($this->sortOrder) - ->select() - ->toArray(); - - return $ArticleLists; - } - - /** - * @notes 获取数量 - * @return int - * @author heshihu - * @date 2022/2/9 15:12 - */ - public function count(): int - { - return Article::where($this->searchWhere)->count(); - } - - public function extend() - { - return []; - } -} \ No newline at end of file diff --git a/app/admin/lists/channel/OfficialAccountReplyLists.php b/app/admin/lists/channel/OfficialAccountReplyLists.php deleted file mode 100755 index 89e0028..0000000 --- a/app/admin/lists/channel/OfficialAccountReplyLists.php +++ /dev/null @@ -1,80 +0,0 @@ - ['reply_type'] - ]; - } - - - /** - * @notes 回复列表 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author 乔峰 - * @date 2022/3/30 15:02 - */ - public function lists(): array - { - $field = 'id,name,keyword,matching_type,content,content_type,status,sort'; - $field .= ',matching_type as matching_type_desc,content_type as content_type_desc,status as status_desc'; - - $lists = OfficialAccountReply::field($field) - ->where($this->searchWhere) - ->order(['sort' => 'desc', 'id' => 'desc']) - ->limit($this->limitOffset, $this->limitLength) - ->select() - ->toArray(); - - return $lists; - } - - - /** - * @notes 回复记录数 - * @return int - * @author 乔峰 - * @date 2022/3/30 15:02 - */ - public function count(): int - { - $count = OfficialAccountReply::where($this->searchWhere)->count(); - - return $count; - } -} \ No newline at end of file diff --git a/app/admin/logic/article/ArticleCateLogic.php b/app/admin/logic/article/ArticleCateLogic.php deleted file mode 100755 index e66e423..0000000 --- a/app/admin/logic/article/ArticleCateLogic.php +++ /dev/null @@ -1,127 +0,0 @@ - $params['name'], - 'is_show' => $params['is_show'], - 'sort' => $params['sort'] ?? 0 - ]); - } - - - /** - * @notes 编辑资讯分类 - * @param array $params - * @return bool - * @author heshihu - * @date 2022/2/21 17:50 - */ - public static function edit(array $params) : bool - { - try { - ArticleCate::update([ - 'id' => $params['id'], - 'name' => $params['name'], - 'is_show' => $params['is_show'], - 'sort' => $params['sort'] ?? 0 - ]); - return true; - } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 删除资讯分类 - * @param array $params - * @author heshihu - * @date 2022/2/21 17:52 - */ - public static function delete(array $params) - { - ArticleCate::destroy($params['id']); - } - - /** - * @notes 查看资讯分类详情 - * @param $params - * @return array - * @author heshihu - * @date 2022/2/21 17:54 - */ - public static function detail($params) : array - { - return ArticleCate::findOrEmpty($params['id'])->toArray(); - } - - /** - * @notes 更改资讯分类状态 - * @param array $params - * @return bool - * @author heshihu - * @date 2022/2/21 18:04 - */ - public static function updateStatus(array $params) - { - ArticleCate::update([ - 'id' => $params['id'], - 'is_show' => $params['is_show'] - ]); - return true; - } - - - /** - * @notes 文章分类数据 - * @return array - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException - * @author 乔峰 - * @date 2022/10/13 10:53 - */ - public static function getAllData() - { - return ArticleCate::where(['is_show' => YesNoEnum::YES]) - ->order(['sort' => 'desc', 'id' => 'desc']) - ->select() - ->toArray(); - } - -} \ No newline at end of file diff --git a/app/admin/logic/article/ArticleLogic.php b/app/admin/logic/article/ArticleLogic.php deleted file mode 100755 index 28331f9..0000000 --- a/app/admin/logic/article/ArticleLogic.php +++ /dev/null @@ -1,121 +0,0 @@ - $params['title'], - 'desc' => $params['desc'] ?? '', - 'author' => $params['author'] ?? '', //作者 - 'sort' => $params['sort'] ?? 0, // 排序 - 'abstract' => $params['abstract'], // 文章摘要 - 'click_virtual' => $params['click_virtual'] ?? 0, - 'image' => $params['image'] ? FileService::setFileUrl($params['image']) : '', - 'cid' => $params['cid'], - 'is_show' => $params['is_show'], - 'content' => $params['content'] ?? '', - ]); - } - - - /** - * @notes 编辑资讯 - * @param array $params - * @return bool - * @author heshihu - * @date 2022/2/22 10:12 - */ - public static function edit(array $params) : bool - { - try { - Article::update([ - 'id' => $params['id'], - 'title' => $params['title'], - 'desc' => $params['desc'] ?? '', // 简介 - 'author' => $params['author'] ?? '', //作者 - 'sort' => $params['sort'] ?? 0, // 排序 - 'abstract' => $params['abstract'], // 文章摘要 - 'click_virtual' => $params['click_virtual'] ?? 0, - 'image' => $params['image'] ? FileService::setFileUrl($params['image']) : '', - 'cid' => $params['cid'], - 'is_show' => $params['is_show'], - 'content' => $params['content'] ?? '', - ]); - return true; - } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 删除资讯 - * @param array $params - * @author heshihu - * @date 2022/2/22 10:17 - */ - public static function delete(array $params) - { - Article::destroy($params['id']); - } - - /** - * @notes 查看资讯详情 - * @param $params - * @return array - * @author heshihu - * @date 2022/2/22 10:15 - */ - public static function detail($params) : array - { - return Article::findOrEmpty($params['id'])->toArray(); - } - - /** - * @notes 更改资讯状态 - * @param array $params - * @return bool - * @author heshihu - * @date 2022/2/22 10:18 - */ - public static function updateStatus(array $params) - { - Article::update([ - 'id' => $params['id'], - 'is_show' => $params['is_show'] - ]); - return true; - } -} \ No newline at end of file diff --git a/app/admin/logic/channel/AppSettingLogic.php b/app/admin/logic/channel/AppSettingLogic.php deleted file mode 100755 index 52e8641..0000000 --- a/app/admin/logic/channel/AppSettingLogic.php +++ /dev/null @@ -1,56 +0,0 @@ - ConfigService::get('app', 'ios_download_url', ''), - 'android_download_url' => ConfigService::get('app', 'android_download_url', ''), - 'download_title' => ConfigService::get('app', 'download_title', ''), - ]; - return $config; - } - - - /** - * @notes App设置 - * @param $params - * @author 乔峰 - * @date 2022/3/29 10:26 - */ - public static function setConfig($params) - { - ConfigService::set('app', 'ios_download_url', $params['ios_download_url'] ?? ''); - ConfigService::set('app', 'android_download_url', $params['android_download_url'] ?? ''); - ConfigService::set('app', 'download_title', $params['download_title'] ?? ''); - } -} \ No newline at end of file diff --git a/app/admin/logic/channel/MnpSettingsLogic.php b/app/admin/logic/channel/MnpSettingsLogic.php deleted file mode 100755 index 5d85df7..0000000 --- a/app/admin/logic/channel/MnpSettingsLogic.php +++ /dev/null @@ -1,72 +0,0 @@ - ConfigService::get('mnp_setting', 'name', ''), - 'original_id' => ConfigService::get('mnp_setting', 'original_id', ''), - 'qr_code' => $qrCode, - 'app_id' => ConfigService::get('mnp_setting', 'app_id', ''), - 'app_secret' => ConfigService::get('mnp_setting', 'app_secret', ''), - 'request_domain' => 'https://'.$domainName, - 'socket_domain' => 'wss://'.$domainName, - 'upload_file_domain' => 'https://'.$domainName, - 'download_file_domain' => 'https://'.$domainName, - 'udp_domain' => 'udp://'.$domainName, - 'business_domain' => $domainName, - ]; - - return $config; - } - - /** - * @notes 设置小程序配置 - * @param $params - * @author ljj - * @date 2022/2/16 9:51 上午 - */ - public function setConfig($params) - { - $qrCode = isset($params['qr_code']) ? FileService::setFileUrl($params['qr_code']) : ''; - - ConfigService::set('mnp_setting','name', $params['name'] ?? ''); - ConfigService::set('mnp_setting','original_id',$params['original_id'] ?? ''); - ConfigService::set('mnp_setting','qr_code',$qrCode); - ConfigService::set('mnp_setting','app_id',$params['app_id']); - ConfigService::set('mnp_setting','app_secret',$params['app_secret']); - } -} \ No newline at end of file diff --git a/app/admin/logic/channel/OfficialAccountMenuLogic.php b/app/admin/logic/channel/OfficialAccountMenuLogic.php deleted file mode 100755 index b4e9d02..0000000 --- a/app/admin/logic/channel/OfficialAccountMenuLogic.php +++ /dev/null @@ -1,228 +0,0 @@ -getMessage()); - return false; - } - } - - - /** - * @notes 一级菜单校验 - * @param $menu - * @throws \Exception - * @author 乔峰 - * @date 2022/3/29 10:55 - */ - public static function checkMenu($menu) - { - if (empty($menu) || !is_array($menu)) { - throw new \Exception('请设置正确格式菜单'); - } - - if (count($menu) > 3) { - throw new \Exception('一级菜单超出限制(最多3个)'); - } - - foreach ($menu as $item) { - if (!is_array($item)) { - throw new \Exception('一级菜单项须为数组格式'); - } - - if (empty($item['name'])) { - throw new \Exception('请输入一级菜单名称'); - } - - if (false == $item['has_menu']) { - if (empty($item['type'])) { - throw new \Exception('一级菜单未选择菜单类型'); - } - if (!in_array($item['type'], OfficialAccountEnum::MENU_TYPE)) { - throw new \Exception('一级菜单类型错误'); - } - self::checkType($item); - } - - if (true == $item['has_menu'] && empty($item['sub_button'])) { - throw new \Exception('请配置子菜单'); - } - - self::checkType($item); - - if (!empty($item['sub_button'])) { - self::checkSubButton($item['sub_button']); - } - } - } - - - /** - * @notes 二级菜单校验 - * @param $subButtion - * @throws \Exception - * @author 乔峰 - * @date 2022/3/29 10:55 - */ - public static function checkSubButton($subButtion) - { - if (!is_array($subButtion)) { - throw new \Exception('二级菜单须为数组格式'); - } - - if (count($subButtion) > 5) { - throw new \Exception('二级菜单超出限制(最多5个)'); - } - - foreach ($subButtion as $subItem) { - if (!is_array($subItem)) { - throw new \Exception('二级菜单项须为数组'); - } - - if (empty($subItem['name'])) { - throw new \Exception('请输入二级菜单名称'); - } - - if (empty($subItem['type']) || !in_array($subItem['type'], OfficialAccountEnum::MENU_TYPE)) { - throw new \Exception('二级未选择菜单类型或菜单类型错误'); - } - - self::checkType($subItem); - } - } - - - /** - * @notes 菜单类型校验 - * @param $item - * @throws \Exception - * @author 乔峰 - * @date 2022/3/29 10:55 - */ - public static function checkType($item) - { - switch ($item['type']) { - // 关键字 - case 'click': - if (empty($item['key'])) { - throw new \Exception('请输入关键字'); - } - break; - // 跳转网页链接 - case 'view': - if (empty($item['url'])) { - throw new \Exception('请输入网页链接'); - } - break; - // 小程序 - case 'miniprogram': - if (empty($item['url'])) { - throw new \Exception('请输入网页链接'); - } - if (empty($item['appid'])) { - throw new \Exception('请输入appid'); - } - if (empty($item['pagepath'])) { - throw new \Exception('请输入小程序路径'); - } - break; - } - } - - /** - * @notes 保存发布菜单 - * @param $params - * @return bool - * @throws \GuzzleHttp\Exception\GuzzleException - * @author 乔峰 - * @date 2022/3/29 10:55 - */ - public static function saveAndPublish($params) - { - try { - self::checkMenu($params); - - $officialAccountSetting = (new OfficialAccountSettingLogic())->getConfig(); - if (empty($officialAccountSetting['app_id']) || empty($officialAccountSetting['app_secret'])) { - throw new \Exception('请先配置好微信公众号'); - } - - $app = Factory::officialAccount([ - 'app_id' => $officialAccountSetting['app_id'], - 'secret' => $officialAccountSetting['app_secret'], - 'response_type' => 'array', - ]); - - $result = $app->menu->create($params); - if ($result['errcode'] == 0) { - ConfigService::set('oa_setting', 'menu', $params); - return true; - } - - self::setError('保存发布菜单失败' . json_encode($result)); - return false; - - } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 查看菜单详情 - * @return array|int|mixed|string|null - * @author 乔峰 - * @date 2022/3/29 10:56 - */ - public static function detail() - { - $data = ConfigService::get('oa_setting', 'menu', []); - - if (!empty($data)) { - foreach ($data as &$item) { - $item['has_menu'] = !empty($item['has_menu']); - } - } - - return $data; - } -} \ No newline at end of file diff --git a/app/admin/logic/channel/OfficialAccountReplyLogic.php b/app/admin/logic/channel/OfficialAccountReplyLogic.php deleted file mode 100755 index cc5d8ab..0000000 --- a/app/admin/logic/channel/OfficialAccountReplyLogic.php +++ /dev/null @@ -1,217 +0,0 @@ - $params['reply_type']])->update(['status' => YesNoEnum::NO]); - } - OfficialAccountReply::create($params); - return true; - } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 查看回复详情 - * @param $params - * @return array - * @author 乔峰 - * @date 2022/3/29 11:00 - */ - public static function detail($params) - { - $field = 'id,name,keyword,reply_type,matching_type,content_type,content,status,sort'; - $field .= ',reply_type as reply_type_desc, matching_type as matching_type_desc, content_type as content_type_desc, status as status_desc'; - return OfficialAccountReply::field($field)->findOrEmpty($params['id'])->toArray(); - } - - - /** - * @notes 编辑回复(关注/关键词/默认) - * @param $params - * @return bool - * @author 乔峰 - * @date 2022/3/29 11:01 - */ - public static function edit($params) - { - try { - // 关键字回复排序值须大于0 - if ($params['reply_type'] == OfficialAccountEnum::REPLY_TYPE_KEYWORD && $params['sort'] <= 0) { - throw new \Exception('排序值须大于0'); - } - if ($params['reply_type'] != OfficialAccountEnum::REPLY_TYPE_KEYWORD && $params['status']) { - // 非关键词回复只能有一条记录处于启用状态，所以将该回复类型下的已有记录置为禁用状态 - OfficialAccountReply::where(['reply_type' => $params['reply_type']])->update(['status' => YesNoEnum::NO]); - } - OfficialAccountReply::update($params); - return true; - } catch (\Exception $e) { - self::setError($e->getMessage()); - return false; - } - } - - - /** - * @notes 删除回复(关注/关键词/默认) - * @param $params - * @author 乔峰 - * @date 2022/3/29 11:01 - */ - public static function delete($params) - { - OfficialAccountReply::destroy($params['id']); - } - - - /** - * @notes 更新排序 - * @param $params - * @author 乔峰 - * @date 2022/3/29 11:01 - */ - public static function sort($params) - { - $params['sort'] = $params['new_sort']; - OfficialAccountReply::update($params); - } - - - /** - * @notes 更新状态 - * @param $params - * @author 乔峰 - * @date 2022/3/29 11:01 - */ - public static function status($params) - { - $reply = OfficialAccountReply::findOrEmpty($params['id']); - $reply->status = !$reply->status; - $reply->save(); - } - - /** - * @notes 微信公众号回调 - * @throws \EasyWeChat\Kernel\Exceptions\BadRequestException - * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException - * @throws \EasyWeChat\Kernel\Exceptions\InvalidConfigException - * @throws \ReflectionException - * @author 乔峰 - * @date 2022/3/29 11:01 - */ - public static function index() - { - // 确认此次GET请求来自微信服务器，原样返回echostr参数内容，接入生效，成为开发者成功 - if (isset($_GET['echostr'])) { - echo $_GET['echostr']; - exit; - } - - $officialAccountSetting = (new OfficialAccountSettingLogic())->getConfig(); - $config = [ - 'app_id' => $officialAccountSetting['app_id'], - 'secret' => $officialAccountSetting['app_secret'], - 'response_type' => 'array', - ]; - $app = Factory::officialAccount($config); - - $app->server->push(function ($message) { - switch ($message['MsgType']) { // 消息类型 - case OfficialAccountEnum::MSG_TYPE_EVENT: // 事件 - switch ($message['Event']) { - case OfficialAccountEnum::EVENT_SUBSCRIBE: // 关注事件 - $reply_content = OfficialAccountReply::where(['reply_type' => OfficialAccountEnum::REPLY_TYPE_FOLLOW, 'status' => YesNoEnum::YES]) - ->value('content'); - - if (empty($reply_content)) { - // 未启用关注回复 或 关注回复内容为空 - $reply_content = OfficialAccountReply::where(['reply_type' => OfficialAccountEnum::REPLY_TYPE_DEFAULT, 'status' => YesNoEnum::YES]) - ->value('content'); - } - if ($reply_content) { - $text = new Text($reply_content); - return $text; - } - break; - } - break; - - case OfficialAccountEnum::MSG_TYPE_TEXT: // 文本 - $reply_list = OfficialAccountReply::where(['reply_type' => OfficialAccountEnum::REPLY_TYPE_KEYWORD, 'status' => YesNoEnum::YES]) - ->order('sort asc') - ->select(); - $reply_content = ''; - foreach ($reply_list as $reply) { - switch ($reply['matching_type']) { - case OfficialAccountEnum::MATCHING_TYPE_FULL: - $reply['keyword'] === $message['Content'] && $reply_content = $reply['content']; - break; - case OfficialAccountEnum::MATCHING_TYPE_FUZZY: - stripos($message['Content'], $reply['keyword']) !== false && $reply_content = $reply['content']; - break; - } - if ($reply_content) { - break; // 得到回复文本，中止循环 - } - } - //消息回复为空的话，找默认回复 - if (empty($reply_content)) { - $reply_content = OfficialAccountReply::where(['reply_type' => OfficialAccountEnum::REPLY_TYPE_DEFAULT, 'status' => YesNoEnum::YES]) - ->value('content'); - } - if ($reply_content) { - $text = new Text($reply_content); - return $text; - } - break; - } - }); - $response = $app->server->serve(); - $response->send(); - } -} \ No newline at end of file diff --git a/app/admin/logic/channel/OfficialAccountSettingLogic.php b/app/admin/logic/channel/OfficialAccountSettingLogic.php deleted file mode 100755 index 29d6837..0000000 --- a/app/admin/logic/channel/OfficialAccountSettingLogic.php +++ /dev/null @@ -1,76 +0,0 @@ - ConfigService::get('oa_setting', 'name', ''), - 'original_id' => ConfigService::get('oa_setting', 'original_id', ''), - 'qr_code' => $qrCode, - 'app_id' => ConfigService::get('oa_setting', 'app_id', ''), - 'app_secret' => ConfigService::get('oa_setting', 'app_secret', ''), - // url()方法返回Url实例，通过与空字符串连接触发该实例的__toString()方法以得到路由地址 - 'url' => url('admin/wechat.official_account_reply/index', [],'',true).'', - 'token' => ConfigService::get('oa_setting', 'token'), - 'encoding_aes_key' => ConfigService::get('oa_setting', 'encoding_aes_key', ''), - 'encryption_type' => ConfigService::get('oa_setting', 'encryption_type'), - 'business_domain' => $domainName, - 'js_secure_domain' => $domainName, - 'web_auth_domain' => $domainName, - ]; - return $config; - } - - /** - * @notes 设置公众号配置 - * @param $params - * @author ljj - * @date 2022/2/16 10:08 上午 - */ - public function setConfig($params) - { - $qrCode = isset($params['qr_code']) ? FileService::setFileUrl($params['qr_code']) : ''; - - ConfigService::set('oa_setting','name', $params['name'] ?? ''); - ConfigService::set('oa_setting','original_id', $params['original_id'] ?? ''); - ConfigService::set('oa_setting','qr_code', $qrCode); - ConfigService::set('oa_setting','app_id',$params['app_id']); - ConfigService::set('oa_setting','app_secret',$params['app_secret']); - ConfigService::set('oa_setting','token',$params['token'] ?? ''); - ConfigService::set('oa_setting','encoding_aes_key',$params['encoding_aes_key'] ?? ''); - ConfigService::set('oa_setting','encryption_type',$params['encryption_type']); - } -} \ No newline at end of file diff --git a/app/admin/logic/channel/OpenSettingLogic.php b/app/admin/logic/channel/OpenSettingLogic.php deleted file mode 100755 index 0fb394c..0000000 --- a/app/admin/logic/channel/OpenSettingLogic.php +++ /dev/null @@ -1,55 +0,0 @@ - ConfigService::get('open_platform', 'app_id', ''), - 'app_secret' => ConfigService::get('open_platform', 'app_secret', ''), - ]; - - return $config; - } - - - /** - * @notes 微信开放平台设置 - * @param $params - * @author 乔峰 - * @date 2022/3/29 11:03 - */ - public static function setConfig($params) - { - ConfigService::set('open_platform', 'app_id', $params['app_id'] ?? ''); - ConfigService::set('open_platform', 'app_secret', $params['app_secret'] ?? ''); - } -} \ No newline at end of file diff --git a/app/admin/logic/channel/WebPageSettingLogic.php b/app/admin/logic/channel/WebPageSettingLogic.php deleted file mode 100755 index b8243d2..0000000 --- a/app/admin/logic/channel/WebPageSettingLogic.php +++ /dev/null @@ -1,59 +0,0 @@ - ConfigService::get('web_page', 'status', 1), - // 关闭后渠道后访问页面 0-空页面 1-自定义链接 - 'page_status' => ConfigService::get('web_page', 'page_status', 0), - // 自定义链接 - 'page_url' => ConfigService::get('web_page', 'page_url', ''), - 'url' => request()->domain() . '/mobile' - ]; - return $config; - } - - - /** - * @notes H5设置 - * @param $params - * @author 乔峰 - * @date 2022/3/29 10:34 - */ - public static function setConfig($params) - { - ConfigService::set('web_page', 'status', $params['status']); - ConfigService::set('web_page', 'page_status', $params['page_status']); - ConfigService::set('web_page', 'page_url', $params['page_url']); - } -} \ No newline at end of file diff --git a/app/admin/logic/decorate/DecorateDataLogic.php b/app/admin/logic/decorate/DecorateDataLogic.php deleted file mode 100755 index acb9841..0000000 --- a/app/admin/logic/decorate/DecorateDataLogic.php +++ /dev/null @@ -1,56 +0,0 @@ - 1]) - ->field($field) - ->order(['id' => 'desc']) - ->limit($limit) - ->append(['click']) - ->hidden(['click_virtual', 'click_actual']) - ->select()->toArray(); - } - - - - - -} \ No newline at end of file diff --git a/app/admin/logic/decorate/DecoratePageLogic.php b/app/admin/logic/decorate/DecoratePageLogic.php deleted file mode 100755 index 396e29b..0000000 --- a/app/admin/logic/decorate/DecoratePageLogic.php +++ /dev/null @@ -1,67 +0,0 @@ -toArray(); - } - - - /** - * @notes 保存装修配置 - * @param $params - * @return bool - * @author 乔峰 - * @date 2022/9/15 9:37 - */ - public static function save($params) - { - $pageData = DecoratePage::where(['id' => $params['id']])->findOrEmpty(); - if ($pageData->isEmpty()) { - self::$error = '信息不存在'; - return false; - } - DecoratePage::update([ - 'id' => $params['id'], - 'type' => $params['type'], - 'data' => $params['data'], - ]); - return true; - } - - - -} \ No newline at end of file diff --git a/app/admin/logic/decorate/DecorateTabbarLogic.php b/app/admin/logic/decorate/DecorateTabbarLogic.php deleted file mode 100755 index f1058ae..0000000 --- a/app/admin/logic/decorate/DecorateTabbarLogic.php +++ /dev/null @@ -1,80 +0,0 @@ - $style, 'list' => $list]; - } - - - /** - * @notes 底部导航保存 - * @param $params - * @return bool - * @throws \Exception - * @author 乔峰 - * @date 2022/9/7 17:19 - */ - public static function save($params): bool - { - $model = new DecorateTabbar(); - // 删除旧配置数据 - $model->where('id', '>', 0)->delete(); - - // 保存数据 - $tabbars = $params['list'] ?? []; - $data = []; - foreach ($tabbars as $item) { - $data[] = [ - 'name' => $item['name'], - 'selected' => FileService::setFileUrl($item['selected']), - 'unselected' => FileService::setFileUrl($item['unselected']), - 'link' => $item['link'], - ]; - } - $model->saveAll($data); - - if (!empty($params['style'])) { - ConfigService::set('tabbar', 'style', $params['style']); - } - return true; - } - -} \ No newline at end of file diff --git a/app/admin/logic/setting/CustomerServiceLogic.php b/app/admin/logic/setting/CustomerServiceLogic.php deleted file mode 100755 index 2d8af50..0000000 --- a/app/admin/logic/setting/CustomerServiceLogic.php +++ /dev/null @@ -1,65 +0,0 @@ - $qrCode, - 'wechat' => ConfigService::get('customer_service', 'wechat', ''), - 'phone' => ConfigService::get('customer_service', 'phone', ''), - 'service_time' => ConfigService::get('customer_service', 'service_time', ''), - ]; - return $config; - } - - /** - * @notes 设置客服设置 - * @param $params - * @author ljj - * @date 2022/2/15 12:11 下午 - */ - public static function setConfig($params) - { - $allowField = ['qr_code','wechat','phone','service_time']; - foreach($params as $key => $value) { - if(in_array($key, $allowField)) { - if ($key == 'qr_code') { - $value = FileService::setFileUrl($value); - } - ConfigService::set('customer_service', $key, $value); - } - } - } -} \ No newline at end of file diff --git a/app/admin/logic/setting/HotSearchLogic.php b/app/admin/logic/setting/HotSearchLogic.php deleted file mode 100755 index 9a706d4..0000000 --- a/app/admin/logic/setting/HotSearchLogic.php +++ /dev/null @@ -1,75 +0,0 @@ - ConfigService::get('hot_search', 'status', 0), - // 热门搜索数据 - 'data' => HotSearch::field(['name', 'sort'])->order(['sort' => 'desc', 'id' =>'desc'])->select()->toArray(), - ]; - } - - - /** - * @notes 设置热门搜搜 - * @param $params - * @return bool - * @author 乔峰 - * @date 2022/9/5 18:58 - */ - public static function setConfig($params) - { - try { - if (!empty($params['data'])) { - $model = (new HotSearch()); - $model->where('id', '>', 0)->delete(); - $model->saveAll($params['data']); - } - - $status = empty($params['status']) ? 0 : $params['status']; - ConfigService::set('hot_search', 'status', $status); - - return true; - } catch (\Exception $e) { - self::$error = $e->getMessage(); - return false; - } - } - - -} \ No newline at end of file diff --git a/app/admin/logic/setting/StorageLogic.php b/app/admin/logic/setting/StorageLogic.php index 9bfab28..93b61c0 100755 --- a/app/admin/logic/setting/StorageLogic.php +++ b/app/admin/logic/setting/StorageLogic.php @@ -17,8 +17,7 @@ namespace app\admin\logic\setting; use app\common\logic\BaseLogic; use app\common\service\ConfigService; -use think\facade\Cache; - +use support\Cache; /** * 存储设置逻辑层 diff --git a/app/admin/logic/setting/TransactionSettingsLogic.php b/app/admin/logic/setting/TransactionSettingsLogic.php deleted file mode 100755 index 99d26f8..0000000 --- a/app/admin/logic/setting/TransactionSettingsLogic.php +++ /dev/null @@ -1,64 +0,0 @@ - ConfigService::get('transaction', 'cancel_unpaid_orders', 1), - 'cancel_unpaid_orders_times' => ConfigService::get('transaction', 'cancel_unpaid_orders_times', 30), - 'verification_orders' => ConfigService::get('transaction', 'verification_orders', 1), - 'verification_orders_times' => ConfigService::get('transaction', 'verification_orders_times', 24), - ]; - - return $config; - } - - /** - * @notes 设置交易设置 - * @param $params - * @author ljj - * @date 2022/2/15 11:49 上午 - */ - public static function setConfig($params) - { - ConfigService::set('transaction', 'cancel_unpaid_orders', $params['cancel_unpaid_orders']); - ConfigService::set('transaction', 'verification_orders', $params['verification_orders']); - - if (isset($params['cancel_unpaid_orders_times'])) { - ConfigService::set('transaction', 'cancel_unpaid_orders_times', $params['cancel_unpaid_orders_times']); - } - - if (isset($params['verification_orders_times'])) { - ConfigService::set('transaction', 'verification_orders_times', $params['verification_orders_times']); - } - } -} \ No newline at end of file diff --git a/app/admin/logic/setting/system/CacheLogic.php b/app/admin/logic/setting/system/CacheLogic.php index 5335460..09fc478 100755 --- a/app/admin/logic/setting/system/CacheLogic.php +++ b/app/admin/logic/setting/system/CacheLogic.php @@ -15,7 +15,7 @@ namespace app\admin\logic\setting\system; use app\common\logic\BaseLogic; -use think\facade\Cache; +use support\Cache; /** * 系统缓存逻辑 @@ -32,6 +32,6 @@ class CacheLogic extends BaseLogic public static function clear() { Cache::clear(); - del_target_dir(app()->getRootPath().'runtime/file',true); + del_target_dir(runtime_path() .'/file',true); } } \ No newline at end of file diff --git a/app/admin/validate/channel/MnpSettingsValidate.php b/app/admin/validate/channel/MnpSettingsValidate.php deleted file mode 100755 index 4c5d72a..0000000 --- a/app/admin/validate/channel/MnpSettingsValidate.php +++ /dev/null @@ -1,36 +0,0 @@ - 'require', - 'app_secret' => 'require', - ]; - - protected $message = [ - 'app_id.require' => '请填写AppID', - 'app_secret.require' => '请填写AppSecret', - ]; -} \ No newline at end of file diff --git a/app/admin/validate/channel/OfficialAccountReplyValidate.php b/app/admin/validate/channel/OfficialAccountReplyValidate.php deleted file mode 100755 index 57adb28..0000000 --- a/app/admin/validate/channel/OfficialAccountReplyValidate.php +++ /dev/null @@ -1,72 +0,0 @@ - 'require|integer', - 'reply_type' => 'require|in:1,2,3', - 'name' => 'require', - 'content_type' => 'require|in:1', - 'content' => 'require', - 'status' => 'require|in:0,1', - 'keyword' => 'requireIf:reply_type,2', - 'matching_type' => 'requireIf:reply_type,2|in:1,2', - 'sort' => 'requireIf:reply_type,2', - 'reply_num' => 'requireIf:reply_type,2|in:1', - 'new_sort' => 'require|integer|egt:0', - ]; - - protected $message = [ - 'reply_type.require' => '请输入回复类型', - 'reply_type.in' => '回复类型状态值错误', - 'name.require' => '请输入规则名称', - 'content_type.require' => '请选择内容类型', - 'content_type.in' => '内容类型状态值有误', - 'content.require' => '请输入回复内容', - 'status.require' => '请选择启用状态', - 'status.in' => '启用状态值错误', - 'keyword.requireIf' => '请输入关键词', - 'matching_type.requireIf' => '请选择匹配类型', - 'matching_type.in' => '匹配类型状态值错误', - 'sort.requireIf' => '请输入排序值', - 'sort.integer' => '排序值须为整型', - 'sort.egt' => '排序值须大于或等于0', - 'reply_num.requireIf' => '请选择回复数量', - 'reply_num.in' => '回复数量状态值错误', - 'id.require' => '参数缺失', - 'id.integer' => '参数格式错误', - 'new_sort.require' => '请输入新排序值', - 'new_sort.integer' => '新排序值须为整型', - 'new_sort.egt' => '新排序值须大于或等于0', - ]; - - protected $scene = [ - 'add' => ['reply_type', 'name', 'content_type', 'content', 'status', 'keyword', 'matching_type', 'sort', 'reply_num'], - 'detail' => ['id'], - 'delete' => ['id'], - 'sort' => ['id', 'new_sort'], - 'status' => ['id'], - 'edit' => ['id', 'reply_type', 'name', 'content_type', 'content', 'status','keyword', 'matching_type', 'sort', 'reply_num'] - ]; -} \ No newline at end of file diff --git a/app/admin/validate/channel/OfficialAccountSettingValidate.php b/app/admin/validate/channel/OfficialAccountSettingValidate.php deleted file mode 100755 index e93f8a0..0000000 --- a/app/admin/validate/channel/OfficialAccountSettingValidate.php +++ /dev/null @@ -1,38 +0,0 @@ - 'require', - 'app_secret' => 'require', - 'encryption_type' => 'require|in:1,2,3', - ]; - - protected $message = [ - 'app_id.require' => '请填写AppID', - 'app_secret.require' => '请填写AppSecret', - 'encryption_type.require' => '请选择消息加密方式', - 'encryption_type.in' => '消息加密方式状态值错误', - ]; -} \ No newline at end of file diff --git a/app/admin/validate/channel/OpenSettingValidate.php b/app/admin/validate/channel/OpenSettingValidate.php deleted file mode 100755 index 1dae8ca..0000000 --- a/app/admin/validate/channel/OpenSettingValidate.php +++ /dev/null @@ -1,34 +0,0 @@ - 'require', - 'app_secret' => 'require', - ]; - - protected $message = [ - 'app_id.require' => '请输入appId', - 'app_secret.require' => '请输入appSecret', - ]; -} \ No newline at end of file diff --git a/app/admin/validate/channel/WebPageSettingValidate.php b/app/admin/validate/channel/WebPageSettingValidate.php deleted file mode 100755 index 23c8833..0000000 --- a/app/admin/validate/channel/WebPageSettingValidate.php +++ /dev/null @@ -1,33 +0,0 @@ - 'require|in:0,1' - ]; - - protected $message = [ - 'status.require' => '请选择启用状态', - 'status.in' => '启用状态值有误', - ]; -} \ No newline at end of file diff --git a/app/admin/validate/setting/TransactionSettingsValidate.php b/app/admin/validate/setting/TransactionSettingsValidate.php deleted file mode 100755 index f03f859..0000000 --- a/app/admin/validate/setting/TransactionSettingsValidate.php +++ /dev/null @@ -1,51 +0,0 @@ - 'require|in:0,1', - 'cancel_unpaid_orders_times' => 'requireIf:cancel_unpaid_orders,1|integer|gt:0', - 'verification_orders' => 'require|in:0,1', - 'verification_orders_times' => 'requireIf:verification_orders,1|integer|gt:0', - ]; - - protected $message = [ - 'cancel_unpaid_orders.require' => '请选择系统取消待付款订单方式', - 'cancel_unpaid_orders.in' => '系统取消待付款订单状态值有误', - 'cancel_unpaid_orders_times.requireIf' => '系统取消待付款订单时间未填写', - 'cancel_unpaid_orders_times.integer' => '系统取消待付款订单时间须为整型', - 'cancel_unpaid_orders_times.gt' => '系统取消待付款订单时间须大于0', - - 'verification_orders.require' => '请选择系统自动核销订单方式', - 'verification_orders.in' => '系统自动核销订单状态值有误', - 'verification_orders_times.requireIf' => '系统自动核销订单时间未填写', - 'verification_orders_times.integer' => '系统自动核销订单时间须为整型', - 'verification_orders_times.gt' => '系统自动核销订单时间须大于0', - ]; - - public function sceneSetConfig() - { - return $this->only(['cancel_unpaid_orders','cancel_unpaid_orders_times','verification_orders','verification_orders_times']); - } -} \ No newline at end of file diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 0457c30..5ada15b 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -5,7 +5,7 @@ use WebSocket\Client; class IndexController{ public function index(){ - + var_dump(runtime_path()); } diff --git a/app/common/model/article/Article.php b/app/common/model/article/Article.php deleted file mode 100644 index f6576a3..0000000 --- a/app/common/model/article/Article.php +++ /dev/null @@ -1,12 +0,0 @@ -