[更新]代码远程更新

README.md

@@ -33,6 +33,32 @@ PHP 开发技术交流（ QQ 群 513350915）
  * Gitee仓库地址：https://gitee.com/zoujingli/Think.Admin
  * GitHub仓库地址：https://github.com/zoujingli/ThinkAdmin
  
+ 框架指令
+ --
+ * 执行 `build.cmd` 可更新 `Composer` 插件，会删除并替换 `vendor` 目录
+ * 执行 `php think run` 启用本地开发环境，访问 `http://127.0.0.1:8000`
+ 
+ * 线上代码更新
+ >* 执行 `php think xsync:admin` 从线上服务更新 `admin` 模块的所有文件（注意文件安全）
+ >* 执行 `php think xsync:wechat` 从线上服务更新 `wehcat` 模块的所有文件（注意文件安全）
+ >* 执行 `php think xysnc:service` 从线上服务更新 `service` 模块的所有文件（注意文件安全）
+ >* 执行 `php think xysnc:plugs` 从线上服务更新 `plugs` 静态插件的部分文件（注意文件安全）
+ >* 执行 `php think xysnc:config` 从线上服务更新 `config` 项目配置的部分文件（注意文件安全）
+ 
+ * 微信资料管理
+ >* 执行 `php think xfans:all` 更新已经对接的公众号粉丝全部列表
+ >* 执行 `php think xfans:black` 更新已经对接的公众号黑名单列表
+ >* 执行 `php think xfans:list` 更新已经对接的公众号粉丝列表
+ >* 执行 `php think xfans:tags` 更新已经对接的公众号煯标签列表
+ >* 执行 `php think xclean:session` 清理无效的会话文件
+ >* 执行 `php think xclean:store` 清理无效的订单信息及定时任务
+ 
+ * 守护进程管理
+ >* 执行 `php think xtask:reset` 重启消息任务守护进程
+ >* 执行 `php think xtask:start` 启动消息任务守护进程
+ >* 执行 `php think xtask:state` 查询消息任务守护进程
+ >* 执行 `php think xtask:stop` 暂停消息任务守护进程
+ 
 特别感谢
 --
 |名称|版本|描述|链接|

application/admin/controller/Auth.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;
@@ -47,6 +47,7 @@ class Auth extends Controller
     /**
      * 权限授权节点
      * @return mixed
+     * @throws \ReflectionException
      * @throws \think\Exception
      * @throws \think\exception\PDOException
      */

application/admin/controller/Config.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;

application/admin/controller/Index.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;
@@ -29,6 +29,7 @@ class Index extends Controller
 
     /**
      * 显示后台首页
+     * @throws \ReflectionException
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException

application/admin/controller/Log.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;

application/admin/controller/Login.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;

application/admin/controller/Menu.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;
@@ -75,8 +75,9 @@ class Menu extends Controller
     }
 
     /**
-     * 表单数据
+     * 表单数据处理
      * @param array $vo
+     * @throws \ReflectionException
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException

application/admin/controller/Message.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;

application/admin/controller/Node.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;
@@ -33,7 +33,7 @@ class Node extends Controller
 
     /**
      * 显示节点列表
-     * @return mixed
+     * @throws \ReflectionException
      */
     public function index()
     {
@@ -51,6 +51,7 @@ class Node extends Controller
 
     /**
      * 清理无效的节点数据
+     * @throws \ReflectionException
      * @throws \think\Exception
      * @throws \think\exception\PDOException
      */

application/admin/controller/Queue.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;

application/admin/controller/User.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller;

application/admin/controller/api/Message.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller\api;

application/admin/controller/api/Plugs.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller\api;

application/admin/controller/api/Update.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\controller\api;

application/admin/queue/JobsBase.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\queue;

application/admin/service/Auth.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\service;
@@ -30,7 +30,7 @@ class Auth
      * 权限检查中间件入口
      * @param \think\Request $request
      * @param \Closure $next
-     * @return mixed|\think\response\Json|\think\response\Redirect
+     * @return mixed
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
@@ -72,18 +72,19 @@ class Auth
      * 获取系统代码节点
      * @param array $nodes
      * @return array
+     * @throws \ReflectionException
      */
     public static function get($nodes = [])
     {
-        $ignore = self::getIgnore();
+        list($ignore, $map) = [self::getIgnore(), Node::getClassTreeNode(env('app_path'))];
         $alias = Db::name('SystemNode')->column('node,is_menu,is_auth,is_login,title');
-        foreach (Node::getTree(env('app_path')) as $thr) {
+        foreach (Node::getMethodTreeNode(env('app_path')) as $thr => $title) {
             foreach ($ignore as $str) if (stripos($thr, $str) === 0) continue 2;
             $tmp = explode('/', $thr);
             list($one, $two) = ["{$tmp[0]}", "{$tmp[0]}/{$tmp[1]}"];
             $nodes[$one] = array_merge(isset($alias[$one]) ? $alias[$one] : ['node' => $one, 'title' => '', 'is_menu' => 0, 'is_auth' => 0, 'is_login' => 0], ['pnode' => '']);
-            $nodes[$two] = array_merge(isset($alias[$two]) ? $alias[$two] : ['node' => $two, 'title' => '', 'is_menu' => 0, 'is_auth' => 0, 'is_login' => 0], ['pnode' => $one]);
-            $nodes[$thr] = array_merge(isset($alias[$thr]) ? $alias[$thr] : ['node' => $thr, 'title' => '', 'is_menu' => 0, 'is_auth' => 0, 'is_login' => 0], ['pnode' => $two]);
+            $nodes[$two] = array_merge(isset($alias[$two]) ? $alias[$two] : ['node' => $two, 'title' => isset($map[$two]) ? $map[$two] : '', 'is_menu' => 0, 'is_auth' => 0, 'is_login' => 0], ['pnode' => $one]);
+            $nodes[$thr] = array_merge(isset($alias[$thr]) ? $alias[$thr] : ['node' => $thr, 'title' => $title, 'is_menu' => 0, 'is_auth' => 0, 'is_login' => 0], ['pnode' => $two]);
         }
         foreach ($nodes as &$node) list($node['is_auth'], $node['is_menu'], $node['is_login']) = [intval($node['is_auth']), intval($node['is_menu']), empty($node['is_auth']) ? intval($node['is_login']) : 1];
         return $nodes;
@@ -124,7 +125,7 @@ class Auth
 
     /**
      * 应用用户权限节点
-     * @return bool
+     * @return boolean
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
@@ -153,6 +154,7 @@ class Auth
     /**
      * 获取授权后的菜单
      * @return array
+     * @throws \ReflectionException
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException

application/admin/service/Log.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\service;

application/admin/service/Message.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\service;

application/admin/service/Queue.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\admin\service;

application/admin/sys.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 if (!function_exists('auth')) {

application/admin/view/index/main.html

@@ -16,13 +16,13 @@
     </thead>
     <tbody>
     <tr>
-        <td style="max-width:200px">framework 版本</td>
+        <td style="max-width:200px">应用组件版本</td>
         <td>{:sysconf('app_version')}</td>
         <td style="max-width:200px">产品名称</td>
         <td>framework</td>
     </tr>
     <tr>
-        <td>ThinkPHP 版本</td>
+        <td>ThinkAdmin 版本</td>
         <td>{$think_ver}</td>
         <td>在线体验</td>
         <td>
@@ -44,8 +44,8 @@
         <td>{:php_sapi_name()}</td>
         <td>项目地址</td>
         <td>
-            <a target="_blank" href="https://github.com/zoujingli/ThinkAdmin">
-                https://github.com/zoujingli/ThinkAdmin
+            <a target="_blank" href="https://github.com/zoujingli/framework">
+                https://github.com/zoujingli/framework
             </a>
         </td>
     </tr>
@@ -54,8 +54,8 @@
         <td>{$mysql_ver}</td>
         <td>BUG反馈</td>
         <td>
-            <a target="_blank" href="https://github.com/zoujingli/ThinkAdmin/issues">
-                https://github.com/zoujingli/ThinkAdmin/issues
+            <a target="_blank" href="https://github.com/zoujingli/framework/issues">
+                https://github.com/zoujingli/framework/issues
             </a>
         </td>
     </tr>
@@ -75,7 +75,7 @@
         <td>POST大小限制</td>
         <td>{:ini_get('post_max_size')}</td>
         <td>办公地址</td>
-        <td>广州市天河区东圃一横路东泷商贸中心C座316</td>
+        <td>广州市天河区东圃一横路东泷商贸中心G02</td>
     </tr>
     </tbody>
 </table>

application/service/controller/Config.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\service\controller;

application/service/controller/Index.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\service\controller;

application/service/controller/api/Client.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\service\controller\api;

application/service/controller/api/Push.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\service\controller\api;

application/service/handler/Publish.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\service\handler;

application/service/handler/Receive.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\service\handler;

application/service/handler/Wechat.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\service\handler;

application/service/logic/Build.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\service\logic;

application/service/logic/Wechat.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\service\logic;

application/wechat/command/Fans.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\command;

application/wechat/command/fans/FansAll.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\command\fans;

application/wechat/command/fans/FansBlack.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\command\fans;

application/wechat/command/fans/FansList.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\command\fans;

application/wechat/command/fans/FansTags.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\command\fans;

application/wechat/controller/Config.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\controller;

application/wechat/controller/Fans.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\controller;

application/wechat/controller/Keys.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\controller;

application/wechat/controller/Menu.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\controller;

application/wechat/controller/News.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\controller;

application/wechat/controller/api/Push.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\controller\api;

application/wechat/controller/api/Review.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\controller\api;

application/wechat/controller/api/Tools.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\controller\api;

application/wechat/queue/Jobs.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\queue;

application/wechat/service/Fans.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\service;

application/wechat/service/Media.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\service;

application/wechat/service/Wechat.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace app\wechat\service;

application/wechat/sys.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 // 注册系统指令

config/cookie.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 return [

config/log.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 return [

config/template.php

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 return [

public/static/admin.js

@@ -7,7 +7,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 // IE兼容提示

public/static/theme/css/console.css

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +--------------------------------------------------------------------*/
 
 ::-webkit-input-placeholder{color:#aaa}

public/static/theme/css/login.css

@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +--------------------------------------------------------------------*/
 
 body,html{height:100%}

think

@@ -10,7 +10,7 @@
 // +----------------------------------------------------------------------
 // | 开源协议 ( https://mit-license.org )
 // +----------------------------------------------------------------------
-// | github开源项目：https://github.com/zoujingli/ThinkAdmin
+// | github开源项目：https://github.com/zoujingli/framework
 // +----------------------------------------------------------------------
 
 namespace think;

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit407a0fe5b8b66687453d756daf4a3b35::getLoader();
+return ComposerAutoloaderInita2a5ca7b097a9d41d2230b028e215f7a::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit407a0fe5b8b66687453d756daf4a3b35
+class ComposerAutoloaderInita2a5ca7b097a9d41d2230b028e215f7a
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit407a0fe5b8b66687453d756daf4a3b35
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit407a0fe5b8b66687453d756daf4a3b35', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInita2a5ca7b097a9d41d2230b028e215f7a', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit407a0fe5b8b66687453d756daf4a3b35', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInita2a5ca7b097a9d41d2230b028e215f7a', '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\ComposerStaticInit407a0fe5b8b66687453d756daf4a3b35::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInita2a5ca7b097a9d41d2230b028e215f7a::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit407a0fe5b8b66687453d756daf4a3b35
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit407a0fe5b8b66687453d756daf4a3b35::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInita2a5ca7b097a9d41d2230b028e215f7a::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire407a0fe5b8b66687453d756daf4a3b35($fileIdentifier, $file);
+            composerRequirea2a5ca7b097a9d41d2230b028e215f7a($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire407a0fe5b8b66687453d756daf4a3b35($fileIdentifier, $file)
+function composerRequirea2a5ca7b097a9d41d2230b028e215f7a($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit407a0fe5b8b66687453d756daf4a3b35
+class ComposerStaticInita2a5ca7b097a9d41d2230b028e215f7a
 {
     public static $files = array (
         '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@@ -346,9 +346,9 @@ class ComposerStaticInit407a0fe5b8b66687453d756daf4a3b35
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit407a0fe5b8b66687453d756daf4a3b35::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit407a0fe5b8b66687453d756daf4a3b35::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit407a0fe5b8b66687453d756daf4a3b35::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInita2a5ca7b097a9d41d2230b028e215f7a::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInita2a5ca7b097a9d41d2230b028e215f7a::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInita2a5ca7b097a9d41d2230b028e215f7a::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -177,8 +177,8 @@
     },
     {
         "name": "symfony/options-resolver",
-        "version": "v3.4.23",
-        "version_normalized": "3.4.23.0",
+        "version": "v3.4.24",
+        "version_normalized": "3.4.24.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/options-resolver.git",
@@ -499,12 +499,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "5d8dbc0707782c5b68ea5600f19001e128ee39c5"
+            "reference": "ee43486ce1f064a0702f229b0ce3a52a8f9bb5dd"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/5d8dbc0707782c5b68ea5600f19001e128ee39c5",
-            "reference": "5d8dbc0707782c5b68ea5600f19001e128ee39c5",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ee43486ce1f064a0702f229b0ce3a52a8f9bb5dd",
+            "reference": "ee43486ce1f064a0702f229b0ce3a52a8f9bb5dd",
             "shasum": "",
             "mirrors": [
                 {
@@ -523,7 +523,7 @@
             "qiniu/php-sdk": "^7.2",
             "topthink/framework": "5.1.*"
         },
-        "time": "2019-04-02T08:17:16+00:00",
+        "time": "2019-04-03T05:55:15+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {

vendor/zoujingli/think-library/src/command/Sync.php

@@ -96,7 +96,7 @@ class Sync extends Command
     private static function removeEmptyDir($dir)
     {
         if (is_dir($dir) && count(scandir($dir)) === 2) {
-            rmdir($dir);
+            if (rmdir($dir)) self::removeEmptyDir(dirname($dir));
         }
     }
 

vendor/zoujingli/think-library/src/tools/Cors.php

@@ -35,7 +35,7 @@ class Cors
             header('Access-Control-Allow-Methods:GET,POST,OPTIONS');
             header('Access-Control-Allow-Origin:' . self::getOrigin($request));
             header('Access-Control-Allow-Headers:' . self::getAllows($request));
-            header('Access-Control-Expose-Headers: User-Token-Csrf');
+            header('Access-Control-Expose-Headers:User-Token-Csrf');
             header('Content-Type:text/plain charset=UTF-8');
             header('Access-Control-Max-Age:1728000');
             header('HTTP/1.0 204 No Content');

vendor/zoujingli/think-library/src/tools/Node.php

@@ -21,6 +21,13 @@ namespace library\tools;
  */
 class Node
 {
+
+    /**
+     * 控制器忽略函数
+     * @var array
+     */
+    protected static $ignore = ['initialize', 'success', 'error', 'redirect', 'fetch', 'assign', 'callback'];
+
     /**
      * 获取当前访问节点
      * @return string
@@ -32,6 +39,57 @@ class Node
         return self::parseString("{$module}/{$controller}") . '/' . strtolower($action);
     }
 
+    /**
+     * 获取方法节点列表
+     * @param string $dir 控制器根路径
+     * @param array $nodes 额外数据
+     * @return array
+     * @throws \ReflectionException
+     */
+    public static function getMethodTreeNode($dir, $nodes = [])
+    {
+        foreach (self::scanDir($dir) as $file) {
+            list($matches, $filename) = [[], str_replace(DIRECTORY_SEPARATOR, '/', $file)];
+            if (!preg_match('|/(\w+)/controller/(.+)|', $filename, $matches)) continue;
+            if (class_exists($classname = env('app_namespace') . str_replace('/', '\\', substr($matches[0], 0, -4)))) {
+                foreach ((new \ReflectionClass($classname))->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
+                    list($function, $comment) = [$method->getName(), $method->getDocComment()];
+                    if (stripos($function, '_') === 0 || in_array($function, self::$ignore)) continue;
+                    $controller = str_replace('/', '.', substr($matches[2], 0, -4));
+                    if (stripos($controller, 'api.') !== false || stripos($controller, 'wap.') !== false) continue;
+                    $node = self::parseString("{$matches[1]}/{$controller}") . '/' . strtolower($function);
+                    $nodes[$node] = preg_replace('/^\/\*\*\*(.*?)\*.*?$/', '$1', preg_replace("/\s/", '', $comment));
+                    if (stripos($nodes[$node], '@') !== false) $nodes[$node] = '';
+                }
+            }
+        }
+        return $nodes;
+    }
+
+    /**
+     * 获取控制器节点列表
+     * @param string $dir 控制器根路径
+     * @param array $nodes 额外数据
+     * @return array
+     * @throws \ReflectionException
+     */
+    public static function getClassTreeNode($dir, $nodes = [])
+    {
+        foreach (self::scanDir($dir) as $file) {
+            list($matches, $filename) = [[], str_replace(DIRECTORY_SEPARATOR, '/', $file)];
+            if (!preg_match('|/(\w+)/controller/(.+)|', $filename, $matches)) continue;
+            if (class_exists($classname = env('app_namespace') . str_replace('/', '\\', substr($matches[0], 0, -4)))) {
+                $controller = str_replace('/', '.', substr($matches[2], 0, -4));
+                if (stripos($controller, 'api.') !== false || stripos($controller, 'wap.') !== false) continue;
+                $node = self::parseString("{$matches[1]}/{$controller}");
+                $comment = (new \ReflectionClass($classname))->getDocComment();
+                $nodes[$node] = preg_replace('/^\/\*\*\*(.*?)\*.*?$/', '$1', preg_replace("/\s/", '', $comment));
+                if (stripos($nodes[$node], '@') !== false) $nodes[$node] = '';
+            }
+        }
+        return $nodes;
+    }
+
     /**
      * 获取节点列表
      * @param string $dir 控制器根路径
@@ -40,16 +98,15 @@ class Node
      */
     public static function getTree($dir, $nodes = [])
     {
-        $ignore = ['initialize', 'success', 'error', 'redirect', 'fetch', 'assign', 'callback'];
         foreach (self::scanDir($dir) as $file) {
             list($matches, $filename) = [[], str_replace(DIRECTORY_SEPARATOR, '/', $file)];
             if (!preg_match('|/(\w+)/controller/(.+)|', $filename, $matches)) continue;
-            $className = env('app_namespace') . str_replace('/', '\\', substr($matches[0], 0, -4));
-            if (class_exists($className)) foreach (get_class_methods($className) as $funcName) {
-                if (stripos($funcName, '_') === 0 || in_array($funcName, $ignore)) continue;
+            $classname = env('app_namespace') . str_replace('/', '\\', substr($matches[0], 0, -4));
+            if (class_exists($classname)) foreach (get_class_methods($classname) as $function) {
+                if (stripos($function, '_') === 0 || in_array($function, self::$ignore)) continue;
                 $controller = str_replace('/', '.', substr($matches[2], 0, -4));
                 if (stripos($controller, 'api.') !== false || stripos($controller, 'wap.') !== false) continue;
-                $nodes[] = self::parseString("{$matches[1]}/{$controller}") . '/' . strtolower($funcName);
+                $nodes[] = self::parseString("{$matches[1]}/{$controller}") . '/' . strtolower($function);
             }
         }
         return $nodes;