From e7bcba6d8606ef9f96bdd39b01ffb4f6918417ee Mon Sep 17 00:00:00 2001 From: Anyon Date: Tue, 10 Dec 2019 10:34:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/wechat/controller/Menu.php | 17 ++++++++--------- app/wechat/view/menu/index.html | 4 ++-- composer.lock | 8 ++++---- vendor/composer/autoload_classmap.php | 5 +++++ vendor/composer/autoload_static.php | 5 +++++ vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- vendor/zoujingli/think-library/src/common.php | 4 ++-- .../think-library/src/service/TokenService.php | 2 +- 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/app/wechat/controller/Menu.php b/app/wechat/controller/Menu.php index 7d79034b3..c9d86dbea 100644 --- a/app/wechat/controller/Menu.php +++ b/app/wechat/controller/Menu.php @@ -30,7 +30,7 @@ class Menu extends Controller * 微信菜单的类型 * @var array */ - protected $menuType = [ + protected $menuTypes = [ 'click' => '匹配规则', 'view' => '跳转网页', 'miniprogram' => '打开小程序', @@ -54,12 +54,11 @@ class Menu extends Controller public function index() { if ($this->request->get('output') === 'json') { - $where = [['keys', 'notin', ['subscribe', 'default']], ['status', 'eq', '1']]; + $where = [['keys', 'notin', ['subscribe', 'default']], ['status', '=', '1']]; $keys = $this->app->db->name('WechatKeys')->where($where)->order('sort desc,id desc')->select(); $this->success('获取数据成功!', ['menudata' => sysdata('menudata'), 'keysdata' => $keys]); } else { $this->title = '微信菜单定制'; - $this->menuTypes = $this->menuType; $this->fetch(); } } @@ -68,7 +67,7 @@ class Menu extends Controller * 编辑微信菜单 * @auth true */ - public function edit() + public function push() { if ($this->request->isPost()) { $data = $this->request->post('data'); @@ -85,7 +84,7 @@ class Menu extends Controller } } else { try { - sysdata('menudata', $this->_buildMenuData($menudata = json_decode($data, true))); + sysdata('menudata', $this->_buildMenuData(json_decode($data, true))); WechatService::WeChatMenu()->create(['button' => sysdata('menudata')]); sysoplog('微信管理', '发布微信菜单成功'); $this->success('保存发布菜单成功！', ''); @@ -104,7 +103,7 @@ class Menu extends Controller * @param array $list * @return array */ - private function _buildMenuData(array $list) + private function _buildMenuData(array $list): array { foreach ($list as &$vo) { unset($vo['active'], $vo['show']); @@ -155,12 +154,12 @@ class Menu extends Controller { try { WechatService::WeChatMenu()->delete(); - $this->success('菜单取消成功，重新关注可立即生效！', ''); + $this->success('菜单取消成功，重新关注可立即生效！'); } catch (HttpResponseException $exception) { sysoplog('微信管理', '取消微信菜单成功'); throw $exception; - } catch (\Exception $e) { - $this->error("菜单取消失败，请稍候再试！
{$e->getMessage()}"); + } catch (\Exception $exception) { + $this->error("菜单取消失败，请稍候再试！
{$exception->getMessage()}"); } } diff --git a/app/wechat/view/menu/index.html b/app/wechat/view/menu/index.html index 05f1a5109..4999b6042 100644 --- a/app/wechat/view/menu/index.html +++ b/app/wechat/view/menu/index.html @@ -96,7 +96,7 @@
- {if auth("edit")} + {if auth("push")} {/if} {if auth("cancel")} @@ -194,7 +194,7 @@ $rootScope.submit = function () { $vali.checkAllInput(); if ($form.find('.validate-error').size() > 0) return false; - $.form.load('{:url("edit")}', {data: angular.toJson($rootScope.list)}, 'post'); + $.form.load('{:url("push")}', {data: angular.toJson($rootScope.list)}, 'post'); } } }) diff --git a/composer.lock b/composer.lock index 7b1e58abe..c69aba37c 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "1246ce655df8db112a60bf57037a9a17f4b11d77" + "reference": "030a60c13c6d8d15a6ce507edaf47ee384835983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1246ce655df8db112a60bf57037a9a17f4b11d77", - "reference": "1246ce655df8db112a60bf57037a9a17f4b11d77", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/030a60c13c6d8d15a6ce507edaf47ee384835983", + "reference": "030a60c13c6d8d15a6ce507edaf47ee384835983", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-12-09T10:17:25+00:00" + "time": "2019-12-10T02:15:54+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index fb3ce256e..45803a914 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -202,6 +202,11 @@ return array( 'app\\admin\\controller\\api\\Update' => $baseDir . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => $baseDir . '/app/admin/controller/api/Upload.php', 'app\\index\\controller\\Index' => $baseDir . '/app/index/controller/Index.php', + 'app\\wechat\\command\\Fans' => $baseDir . '/app/wechat/command/Fans.php', + 'app\\wechat\\command\\fans\\FansAll' => $baseDir . '/app/wechat/command/fans/FansAll.php', + 'app\\wechat\\command\\fans\\FansBlack' => $baseDir . '/app/wechat/command/fans/FansBlack.php', + 'app\\wechat\\command\\fans\\FansList' => $baseDir . '/app/wechat/command/fans/FansList.php', + 'app\\wechat\\command\\fans\\FansTags' => $baseDir . '/app/wechat/command/fans/FansTags.php', 'app\\wechat\\controller\\Config' => $baseDir . '/app/wechat/controller/Config.php', 'app\\wechat\\controller\\Fans' => $baseDir . '/app/wechat/controller/Fans.php', 'app\\wechat\\controller\\Keys' => $baseDir . '/app/wechat/controller/Keys.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index b29fff53f..79b174dda 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -342,6 +342,11 @@ class ComposerStaticInitada0e677dd8f1307ba83d0cf07626e6c 'app\\admin\\controller\\api\\Update' => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => __DIR__ . '/../..' . '/app/admin/controller/api/Upload.php', 'app\\index\\controller\\Index' => __DIR__ . '/../..' . '/app/index/controller/Index.php', + 'app\\wechat\\command\\Fans' => __DIR__ . '/../..' . '/app/wechat/command/Fans.php', + 'app\\wechat\\command\\fans\\FansAll' => __DIR__ . '/../..' . '/app/wechat/command/fans/FansAll.php', + 'app\\wechat\\command\\fans\\FansBlack' => __DIR__ . '/../..' . '/app/wechat/command/fans/FansBlack.php', + 'app\\wechat\\command\\fans\\FansList' => __DIR__ . '/../..' . '/app/wechat/command/fans/FansList.php', + 'app\\wechat\\command\\fans\\FansTags' => __DIR__ . '/../..' . '/app/wechat/command/fans/FansTags.php', 'app\\wechat\\controller\\Config' => __DIR__ . '/../..' . '/app/wechat/controller/Config.php', 'app\\wechat\\controller\\Fans' => __DIR__ . '/../..' . '/app/wechat/controller/Fans.php', 'app\\wechat\\controller\\Keys' => __DIR__ . '/../..' . '/app/wechat/controller/Keys.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index c627beddd..cc5057f17 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -935,12 +935,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "1246ce655df8db112a60bf57037a9a17f4b11d77" + "reference": "030a60c13c6d8d15a6ce507edaf47ee384835983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1246ce655df8db112a60bf57037a9a17f4b11d77", - "reference": "1246ce655df8db112a60bf57037a9a17f4b11d77", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/030a60c13c6d8d15a6ce507edaf47ee384835983", + "reference": "030a60c13c6d8d15a6ce507edaf47ee384835983", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-12-09T10:17:25+00:00", + "time": "2019-12-10T02:15:54+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 06bf0eb2f..dfa9bf30b 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 23c0233b4..926541611 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -100,9 +100,9 @@ if (!function_exists('sysdata')) { function sysdata($name, $value = null) { if (is_null($value)) { - return SystemService::instance()->get($name); + return SystemService::instance()->getData($name); } else { - return SystemService::instance()->set($name, $value); + return SystemService::instance()->setData($name, $value); } } } diff --git a/vendor/zoujingli/think-library/src/service/TokenService.php b/vendor/zoujingli/think-library/src/service/TokenService.php index b148388bf..4a09dd319 100644 --- a/vendor/zoujingli/think-library/src/service/TokenService.php +++ b/vendor/zoujingli/think-library/src/service/TokenService.php @@ -46,7 +46,7 @@ class TokenService extends Service // 读取缓存并检查是否有效 $cache = $this->app->session->get($token, []); if (empty($cache['node']) || empty($cache['time']) || empty($cache['token'])) return false; - if ($cache['token'] !== $token || $cache['time'] + 600 < time() || $cache['node'] !== $node) return false; + if ($cache['time'] + 600 < time() || strtolower($cache['node']) !== strtolower($node)) return false; return true; }