ComposerUpdate & add appMaps

app/admin/controller/Index.php

@@ -39,7 +39,7 @@ class Index extends Controller
         $this->login = AdminService::instance()->apply(true)->isLogin();
         $this->menus = MenuService::instance()->getTree();
         if (empty($this->menus) && empty($this->login)) {
-            $this->redirect(url('@admin/login'));
+            $this->redirect(sysuri('admin/login/index'));
         } else {
             $this->title = '系统管理后台';
             $this->fetch();

app/admin/controller/Login.php

@@ -39,7 +39,7 @@ class Login extends Controller
     {
         if ($this->app->request->isGet()) {
             if (AdminService::instance()->isLogin()) {
-                $this->redirect(url('@admin')->build());
+                $this->redirect(sysuri('admin/index/index'));
             } else {
                 $this->title = '系统登录';
                 $this->captchaType = 'LoginCaptcha';
@@ -84,7 +84,7 @@ class Login extends Controller
                 'login_num' => $this->app->db->raw('login_num+1'),
             ]);
             sysoplog('用户登录', '登录系统后台成功');
-            $this->success('登录成功', url('@admin')->build());
+            $this->success('登录成功', sysuri('admin/index/index'));
         }
     }
 
@@ -113,7 +113,7 @@ class Login extends Controller
     {
         $this->app->session->clear();
         $this->app->session->destroy();
-        $this->success('退出登录成功!', url('@admin/login')->build());
+        $this->success('退出登录成功!', sysuri('admin/login/index'));
     }
 
 }

app/admin/view/full.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="__ROOT__/static/plugs/layui/css/layui.css?at={:date('md')}">
     <link rel="stylesheet" href="__ROOT__/static/theme/css/console.css?at={:date('md')}">
     {block name="style"}{/block}
-    <script>window.ROOT_URL = '__ROOT__';</script>
+    <script>window.tapiRoot = '{:sysuri("admin/index/index")}'</script>
     <script src="__ROOT__/static/plugs/jquery/pace.min.js"></script>
 </head>
 

app/admin/view/index/index.html

@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="__ROOT__/static/plugs/layui/css/layui.css?at={:date('md')}">
     <link rel="stylesheet" href="__ROOT__/static/theme/css/console.css?at={:date('md')}">
     {block name="style"}{/block}
-    <script>window.ROOT_URL = '__ROOT__';</script>
+    <script>window.tapiRoot = '{:sysuri("admin/index/index")}'</script>
     <script src="__ROOT__/static/plugs/jquery/pace.min.js"></script>
 </head>
 

app/index/controller/Index.php

@@ -25,6 +25,6 @@ class Index extends Controller
 {
     public function index()
     {
-        $this->redirect(url('@admin/login'));
+        $this->redirect(sysuri('admin/login/index'));
     }
 }

composer.lock

@@ -909,12 +909,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "61019c358186f555dc95656e91cecdfe45a79166"
+                "reference": "544aec71b8d65168a9633db8ab4088c8be95d0ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/61019c358186f555dc95656e91cecdfe45a79166",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/544aec71b8d65168a9633db8ab4088c8be95d0ce",
-                "reference": "61019c358186f555dc95656e91cecdfe45a79166",
+                "reference": "544aec71b8d65168a9633db8ab4088c8be95d0ce",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -958,7 +958,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://framework.thinkadmin.top",
-            "time": "2020-04-10T02:46:12+00:00"
+            "time": "2020-04-16T05:21:38+00:00"
         },
         {
             "name": "zoujingli/wechat-developer",
@@ -1044,5 +1044,6 @@
         "ext-openssl": "*",
         "ext-mbstring": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

config/app.php

@@ -29,7 +29,7 @@ return [
     // 默认时区
     'default_timezone' => 'Asia/Shanghai',
     // 应用映射（自动多应用模式有效）
-    'app_map'          => [],
+    'app_map'          => ['system' => 'admin'],
     // 域名绑定（自动多应用模式有效）
     'domain_bind'      => [],
     // 禁止URL访问的应用列表（自动多应用模式有效）

public/index.php

@@ -21,9 +21,9 @@ require __DIR__ . '/../vendor/autoload.php';
 
 $app = new App();
 
-$debug = !SystemService::instance()->productMode();
+SystemService::instance()->productMode();
 
-$response = $app->debug($debug)->http->run();
+$response = $app->http->run();
 
 $response->send();
 

public/static/admin.js

@@ -23,6 +23,8 @@ window.baseRoot = (function (src) {
     return src.substring(0, src.lastIndexOf("/") + 1);
 })(document.scripts[document.scripts.length - 1].src);
 
+window.tapiRoot = window.tapiRoot || window.baseRoot + "?s=admin"
+
 // require 配置参数
 require.config({
     waitSeconds: 60,
@@ -33,7 +35,7 @@ require.config({
         'json': ['plugs/jquery/json.min'],
         'michat': ['plugs/michat/michat'],
         'base64': ['plugs/jquery/base64.min'],
-        'upload': [appRoot + '?s=admin/api.upload&.js'],
+        'upload': [tapiRoot + '/api.upload&.js'],
         'echarts': ['plugs/echarts/echarts.min'],
         'angular': ['plugs/angular/angular.min'],
         'ckeditor': ['plugs/ckeditor/ckeditor'],
@@ -289,7 +291,7 @@ $(function () {
         this.listen = function () {
             /*! 初始化操作 */
             layui.form.on('switch(ThinkAdminDebug)', function (data) {
-                jQuery.post(appRoot + '?s=admin/api.plugs/debug', {state: data.elem.checked ? 1 : 0});
+                jQuery.post(tapiRoot + '/api.plugs/debug', {state: data.elem.checked ? 1 : 0});
             });
             /*! 菜单模式切换 */
             (function ($menu, miniClass) {
@@ -674,9 +676,9 @@ $(function () {
 
     /*! 注册 data-icon 事件行为 */
     $body.on('click', '[data-icon]', function (field, location) {
+        location = tapiRoot + '/api.plugs/icon';
         field = $(this).attr('data-icon') || $(this).attr('data-field') || 'icon';
-        location = appRoot + '?s=admin/api.plugs/icon&field=' + field;
+        $.form.iframe(location + (location.indexOf('?') > -1 ? '&' : '?') + 'field=' + field, '图标选择');
-        $.form.iframe(location, '图标选择');
     });
 
     /*! 注册 data-copy 事件行为 */
@@ -790,7 +792,7 @@ $(function () {
                     that.$percent.addClass('layui-bg-red').removeClass('layui-bg-blue layui-bg-green');
                 }
             };
-            $.form.load(appRoot + '?s=admin/api.queue/progress', {code: code}, 'post', function (ret) {
+            $.form.load(tapiRoot + '/api.queue/progress', {code: code}, 'post', function (ret) {
                 if (ret.code) {
                     that.lines = [];
                     for (this.lineIndex in ret.data.history) {

vendor/composer/autoload_real.php

@@ -13,6 +13,9 @@ class ComposerAutoloaderInit4ceee63a2cdf20349907f5909444af96
         }
     }
 
+    /**
+     * @return \Composer\Autoload\ClassLoader
+     */
     public static function getLoader()
     {
         if (null !== self::$loader) {

vendor/composer/installed.json

@@ -935,12 +935,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "f787059635503f7bd61b2982331e4a02f0aef743"
+            "reference": "544aec71b8d65168a9633db8ab4088c8be95d0ce"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/f787059635503f7bd61b2982331e4a02f0aef743",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/544aec71b8d65168a9633db8ab4088c8be95d0ce",
-            "reference": "f787059635503f7bd61b2982331e4a02f0aef743",
+            "reference": "544aec71b8d65168a9633db8ab4088c8be95d0ce",
             "shasum": "",
             "mirrors": [
                 {
@@ -956,7 +956,7 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-04-10T03:06:33+00:00",
+        "time": "2020-04-16T05:21:38+00:00",
         "type": "library",
         "extra": {
             "think": {

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-04-10 11:09:13
+// This file is automatically generated at:2020-04-16 13:27:36
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',

vendor/zoujingli/think-library/src/Library.php

@@ -16,6 +16,7 @@
 namespace think\admin;
 
 use think\admin\service\AdminService;
+use think\admin\service\SystemService;
 use think\middleware\SessionInit;
 use think\Request;
 use think\Service;
@@ -79,6 +80,8 @@ class Library extends Service
      */
     public function boot()
     {
+        // 动态绑定运行配置
+        SystemService::instance()->bindRuntime();
         // 注册系统任务指令
         $this->commands([
             'think\admin\command\Install',

vendor/zoujingli/think-library/src/common.php

@@ -45,6 +45,20 @@ if (!function_exists('auth')) {
         return AdminService::instance()->check($node);
     }
 }
+if (!function_exists('sysuri')) {
+    /**
+     * 生成最短URL地址
+     * @param string $url 路由地址
+     * @param array $vars 变量
+     * @param boolean|string $suffix 后缀
+     * @param boolean|string $domain 域名
+     * @return string
+     */
+    function sysuri($url = '', array $vars = [], $suffix = false, $domain = false)
+    {
+        return SystemService::instance()->sysuri($url, $vars, $suffix, $domain);
+    }
+}
 if (!function_exists('sysconf')) {
     /**
      * 获取或配置系统参数

vendor/zoujingli/think-library/src/service/ExpressService.php

@@ -33,16 +33,28 @@ class ExpressService extends Service
      */
     protected $options;
 
+    /**
+     *  当前COOKIE文件
+     * @var string
+     */
+    protected $cookies;
+
     /**
      * 快递服务初始化
      * @return $this
      */
     protected function initialize()
     {
+        // 创建 CURL 请求模拟参数
         $clentip = $this->app->request->ip();
-        $cookies = "{$this->app->getRootPath()}runtime/.express.cookie";
+        $this->cookies = "{$this->app->getRootPath()}runtime/.express.cookie";
-        $headers = ['Host:express.baidu.com', "CLIENT-IP:{$clentip}", "X-FORWARDED-FOR:{$clentip}"];
+        $this->options = ['cookie_file' => $this->cookies, 'headers' => [
-        $this->options = ['cookie_file' => $cookies, 'headers' => $headers];
+            'Host:express.baidu.com', "CLIENT-IP:{$clentip}", "X-FORWARDED-FOR:{$clentip}",
+        ]];
+        // 每 10 秒重置 cookie 文件
+        if (file_exists($this->cookies) && filectime($this->cookies) + 10 < time()) {
+            @unlink($this->cookies);
+        }
         return $this;
     }
 
@@ -50,22 +62,27 @@ class ExpressService extends Service
      * 通过百度快递100应用查询物流信息
      * @param string $code 快递公司编辑
      * @param string $number 快递物流编号
+     * @param array $list 快递路径列表
      * @return array
      */
-    public function express($code, $number)
+    public function express($code, $number, $list = [])
     {
-        list($list, $cache) = [[], $this->app->cache->get($ckey = md5($code . $number))];
+        // 1-新订单,2-在途中,3-签收,4-问题件
-        if (!empty($cache)) return ['message' => 'ok', 'com' => $code, 'nu' => $number, 'data' => $cache];
+        // 0在途，1揽收，2疑难，3签收，4退签，5派件，6退回
+        $ckey = md5("{$code}{$number}");
+        $cache = $this->app->cache->get($ckey, []);
+        if (!empty($cache)) return $cache;
         for ($i = 0; $i < 6; $i++) if (is_array($result = $this->doExpress($code, $number))) {
-            if (!empty($result['data']['info']['context'])) {
+            if (isset($result['data']['info']['context']) && isset($result['data']['info']['state'])) {
-                foreach ($result['data']['info']['context'] as $vo) $list[] = [
+                $state = intval($result['data']['info']['state']);
-                    'time' => date('Y-m-d H:i:s', $vo['time']), 'context' => $vo['desc'],
+                $status = in_array($state, [0, 1, 5]) ? 2 : ($state === 3 ? 3 : 4);
-                ];
+                foreach ($result['data']['info']['context'] as $vo) $list[] = ['time' => date('Y-m-d H:i:s', $vo['time']), 'context' => $vo['desc']];
-                $this->app->cache->set($ckey, $list, 10);
+                $result = ['message' => $result['msg'], 'status' => $status, 'express' => $code, 'number' => $number, 'data' => $list];
-                return ['message' => 'ok', 'com' => $code, 'nu' => $number, 'data' => $list];
+                $this->app->cache->set($ckey, $result, 10);
+                return $result;
             }
         }
-        return ['message' => 'ok', 'com' => $code, 'nu' => $number, 'data' => $list];
+        return ['message' => '暂无轨迹信息', 'status' => 1, 'express' => $code, 'number' => $number, 'data' => $list];
     }
 
     /**
@@ -80,6 +97,7 @@ class ExpressService extends Service
             unset($data['_auto']);
             return $data;
         } else {
+            @unlink($this->cookies);
             $this->app->cache->delete('express_kuaidi_html');
             return $this->getExpressList();
         }
@@ -107,6 +125,7 @@ class ExpressService extends Service
         if (preg_match('/"expSearchApi":.*?"(.*?)",/', $this->getWapBaiduHtml(), $matches)) {
             return str_replace('\\', '', $matches[1]);
         } else {
+            @unlink($this->cookies);
             $this->app->cache->delete('express_kuaidi_html');
             return $this->getExpressQueryApi();
         }
@@ -123,7 +142,7 @@ class ExpressService extends Service
             $uniqid = str_replace('.', '', microtime(true));
             $content = HttpExtend::get("https://m.baidu.com/s?word=快递查询&rand={$uniqid}", [], $this->options);
         }
-        $this->app->cache->set('express_kuaidi_html', $content, 30);
+        $this->app->cache->set('express_kuaidi_html', $content, 10);
         return $content;
     }
 

vendor/zoujingli/think-library/src/service/SystemService.php

@@ -204,8 +204,81 @@ class SystemService extends Service
      */
     public function productMode($state = null)
     {
-        $lock = "{$this->app->getRootPath()}runtime/.product.mode";
+        if (is_null($state)) {
-        return is_null($state) ? file_exists($lock) : ($state ? touch($lock) : @unlink($lock));
+            $this->app->debug($this->getRuntime('app_run') !== 'product');
+        } else {
+            $this->setRuntime($state ? 'product' : 'developoer');
+            $this->app->debug(empty($state));
+        }
+        return !$this->app->isDebug();
+    }
+
+    /**
+     * 设置实时运行配置
+     * @param string $run 支持模式
+     * @param array $map 应用映射
+     * @return boolean
+     */
+    public function setRuntime($run = null, $map = [])
+    {
+        $data = [];
+        if (file_exists($file = "{$this->app->getRootPath()}runtime/config.json")) {
+            $data = json_decode(file_get_contents($file), true);
+            if (!is_array($data)) $data = [];
+        }
+        if (empty($data['app_map']) || !is_array($data['app_map'])) {
+            $data['app_map'] = [];
+        }
+        $data['app_map'] = is_null($map) ? [] : array_merge($data['app_map'], $map);
+        $data['app_run'] = is_null($run) && isset($data['app_run']) ? $data['app_run'] : $run;
+        return file_put_contents($file, json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
+    }
+
+    /**
+     * 获取实时运行配置
+     * @param null|string $key
+     * @return array
+     */
+    public function getRuntime($key = null)
+    {
+        $file = "{$this->app->getRootPath()}runtime/config.json";
+        if (file_exists($file) && is_array($data = json_decode(file_get_contents($file), true))) {
+            if (empty($data['app_run'])) $data['app_run'] = 'developoer';
+            if (empty($data['app_map']) || !is_array($data['app_map'])) $data['app_map'] = [];
+        } else {
+            $data = ['app_run' => 'developoer', 'app_map' => []];
+        }
+        return is_null($key) ? $data : (isset($data[$key]) ? $data[$key] : null);
+    }
+
+    /**
+     * 绑定应用实时配置
+     */
+    public function bindRuntime()
+    {
+        // 动态绑定应用映射
+        $data = $this->getRuntime();
+        if (!empty($data['app_map'])) {
+            $maps = $this->app->config->get('app.app_map', []);
+            $this->app->config->set(['app_map' => array_merge($maps, $data['app_map'])], 'app');
+        }
+        // 动态设置当前运行模式
+        $this->app->debug($data['app_run'] !== 'product');
+    }
+
+    /**
+     * 生成最短URL地址
+     * @param string $url 路由地址
+     * @param array $vars 变量
+     * @param boolean|string $suffix 后缀
+     * @param boolean|string $domain 域名
+     * @return string
+     */
+    public function sysuri($url = '', array $vars = [], $suffix = false, $domain = false)
+    {
+        $location = $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build();
+        list($d1, $d2, $d3) = [$this->app->config->get('app.default_app'), $this->app->config->get('route.default_controller'), $this->app->config->get('route.default_action'),];
+        return preg_replace(["|^/{$d1}/{$d2}/{$d3}(\.html)?$|i", "|/{$d2}/{$d3}(\.html)?$|i", "|/{$d3}(\.html)?$|i"], '', $location);
     }
 
 }