From 626f6a8a8eda6d02aa40bc5ec47fae41fd6828cc Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 7 Aug 2019 16:10:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/wechat/controller/Fans.php | 6 +++-- application/wechat/controller/Keys.php | 26 +++++++++++++++++++ application/wechat/controller/Menu.php | 1 + application/wechat/controller/News.php | 2 ++ vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++----- vendor/composer/autoload_static.php | 8 +++--- vendor/composer/installed.json | 8 +++--- vendor/zoujingli/think-library/src/common.php | 4 ++- 9 files changed, 52 insertions(+), 19 deletions(-) diff --git a/application/wechat/controller/Fans.php b/application/wechat/controller/Fans.php index 996c99ef2..6ec11427b 100644 --- a/application/wechat/controller/Fans.php +++ b/application/wechat/controller/Fans.php @@ -74,8 +74,8 @@ class Fans extends Controller */ public function setBlack() { - $this->applyCsrfToken(); try { + $this->applyCsrfToken(); foreach (array_chunk(explode(',', $this->request->post('openid')), 20) as $openids) { WechatService::WeChatUser()->batchBlackList($openids); Db::name('WechatFans')->whereIn('openid', $openids)->update(['is_black' => '1']); @@ -94,8 +94,8 @@ class Fans extends Controller */ public function delBlack() { - $this->applyCsrfToken(); try { + $this->applyCsrfToken(); foreach (array_chunk(explode(',', $this->request->post('openid')), 20) as $openids) { WechatService::WeChatUser()->batchUnblackList($openids); Db::name('WechatFans')->whereIn('openid', $openids)->update(['is_black' => '0']); @@ -129,6 +129,8 @@ class Fans extends Controller /** * 删除粉丝信息 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function remove() { diff --git a/application/wechat/controller/Keys.php b/application/wechat/controller/Keys.php index 9bc4b7668..caaa9eae9 100644 --- a/application/wechat/controller/Keys.php +++ b/application/wechat/controller/Keys.php @@ -87,6 +87,11 @@ class Keys extends Controller /** * 添加关键字 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function add() { @@ -98,6 +103,11 @@ class Keys extends Controller /** * 编辑关键字 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function edit() { @@ -109,6 +119,8 @@ class Keys extends Controller /** * 删除关键字 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function remove() { @@ -119,6 +131,8 @@ class Keys extends Controller /** * 禁用关键字 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function forbid() { @@ -129,6 +143,8 @@ class Keys extends Controller /** * 启用关键字 * @auth true + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function resume() { @@ -139,6 +155,11 @@ class Keys extends Controller /** * 配置关注回复 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function subscribe() { @@ -150,6 +171,11 @@ class Keys extends Controller /** * 配置默认回复 * @auth true + * @throws \think\Exception + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException + * @throws \think\exception\DbException + * @throws \think\exception\PDOException */ public function defaults() { diff --git a/application/wechat/controller/Menu.php b/application/wechat/controller/Menu.php index 35fdbae44..233982c31 100644 --- a/application/wechat/controller/Menu.php +++ b/application/wechat/controller/Menu.php @@ -47,6 +47,7 @@ class Menu extends Controller /** * 微信菜单管理 * @auth true + * @menu true * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\ModelNotFoundException diff --git a/application/wechat/controller/News.php b/application/wechat/controller/News.php index 10ed02198..a8713082e 100644 --- a/application/wechat/controller/News.php +++ b/application/wechat/controller/News.php @@ -169,6 +169,8 @@ class News extends Controller /** * 删除微信图文 + * @throws \think\Exception + * @throws \think\exception\PDOException */ public function remove() { diff --git a/vendor/autoload.php b/vendor/autoload.php index bfcebb57b..ce9b3538f 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit5db223320ef8cea4a172beae38ba2159::getLoader(); +return ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index b5cc78f86..77483574d 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit5db223320ef8cea4a172beae38ba2159 +class ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit5db223320ef8cea4a172beae38ba2159 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit5db223320ef8cea4a172beae38ba2159', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit5db223320ef8cea4a172beae38ba2159', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit0c596a9ad0569c20ea8959390edb3037', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit5db223320ef8cea4a172beae38ba2159::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit5db223320ef8cea4a172beae38ba2159 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit5db223320ef8cea4a172beae38ba2159::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire5db223320ef8cea4a172beae38ba2159($fileIdentifier, $file); + composerRequire0c596a9ad0569c20ea8959390edb3037($fileIdentifier, $file); } return $loader; } } -function composerRequire5db223320ef8cea4a172beae38ba2159($fileIdentifier, $file) +function composerRequire0c596a9ad0569c20ea8959390edb3037($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 4d49358b4..c36f2c7c9 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit5db223320ef8cea4a172beae38ba2159 +class ComposerStaticInit0c596a9ad0569c20ea8959390edb3037 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -347,9 +347,9 @@ class ComposerStaticInit5db223320ef8cea4a172beae38ba2159 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit5db223320ef8cea4a172beae38ba2159::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit5db223320ef8cea4a172beae38ba2159::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit5db223320ef8cea4a172beae38ba2159::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit0c596a9ad0569c20ea8959390edb3037::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 6313bfcfc..c14f0b8cf 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -502,12 +502,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "9c9b21c523851afd100c4122d57940eedc3d1451" + "reference": "5ea95e1f9cf0dc6b8f8bc3a39423f59b9e853c6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/9c9b21c523851afd100c4122d57940eedc3d1451", - "reference": "9c9b21c523851afd100c4122d57940eedc3d1451", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/5ea95e1f9cf0dc6b8f8bc3a39423f59b9e853c6a", + "reference": "5ea95e1f9cf0dc6b8f8bc3a39423f59b9e853c6a", "shasum": "", "mirrors": [ { @@ -526,7 +526,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-08-02T08:24:02+00:00", + "time": "2019-08-05T05:46:31+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 7edef2a7c..80db346a7 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -264,5 +264,7 @@ Console::addDefaultCommands([ // 动态加载模块配置 if (function_exists('think\__include_file')) { $root = rtrim(str_replace('\\', '/', env('app_path')), '/'); - foreach (glob("{$root}/*/sys.php") as $file) \think\__include_file($file); + foreach (glob("{$root}/*/sys.php") as $file) { + \think\__include_file($file); + } }