diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 62f7b4a1f..bfa0cbb2e 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -18,7 +18,6 @@ namespace app\admin\controller; use think\admin\Controller; use think\admin\service\AdminService; use think\admin\service\MenuService; -use think\exception\HttpResponseException; /** * 后台界面入口 @@ -101,37 +100,4 @@ class Index extends Controller } } - /** - * 网站压缩发布 - * @login true - */ - public function optimize() - { - try { - $this->app->console->call('optimize:route'); - $this->app->console->call('optimize:schema'); - $this->success('网站缓存加速成功！'); - } catch (HttpResponseException $exception) { - throw $exception; - } catch (\Exception $e) { - $this->error($e->getMessage()); - } - } - - /** - * 清理运行缓存 - * @login true - */ - public function clear() - { - try { - $this->app->console->call('clear'); - $this->success('清理网站缓存成功！'); - } catch (HttpResponseException $exception) { - throw $exception; - } catch (\Exception $e) { - $this->error($e->getMessage()); - } - } - } diff --git a/app/admin/controller/api/Config.php b/app/admin/controller/api/Config.php new file mode 100644 index 000000000..5ab7aabe8 --- /dev/null +++ b/app/admin/controller/api/Config.php @@ -0,0 +1,10 @@ +fetch(realpath(__DIR__ . '/../../view/api/icon.html')); } + /** + * 网站压缩发布 + * @login true + */ + public function optimize() + { + try { + $this->app->console->call('optimize:route'); + $this->app->console->call('optimize:schema'); + $this->success('网站缓存加速成功！'); + } catch (HttpResponseException $exception) { + throw $exception; + } catch (\Exception $e) { + $this->error($e->getMessage()); + } + } + + /** + * 清理运行缓存 + * @login true + */ + public function clear() + { + try { + $this->app->console->call('clear'); + $this->success('清理网站缓存成功！'); + } catch (HttpResponseException $exception) { + throw $exception; + } catch (\Exception $e) { + $this->error($e->getMessage()); + } + } + + /** + * 当前运行模式 + * @login true + */ + public function debug() + { + if (input('state')) { + SystemService::instance()->productMode(true); + $this->success('已切换为生产模式！'); + } else { + SystemService::instance()->productMode(false); + $this->success('已切换为开发模式！'); + } + } + } diff --git a/app/admin/view/error.tpl b/app/admin/view/error.tpl new file mode 100644 index 000000000..53daea770 --- /dev/null +++ b/app/admin/view/error.tpl @@ -0,0 +1,574 @@ +' . end($names) . ''; +} +} + +if (!function_exists('parse_file')) { +function parse_file($file, $line) +{ +return '' . basename($file) . " line {$line}" . ''; +} +} + +if (!function_exists('parse_args')) { +function parse_args($args) +{ +$result = []; +foreach ($args as $key => $item) { +switch (true) { +case is_object($item): +$value = sprintf('object(%s)', parse_class(get_class($item))); +break; +case is_array($item): +if (count($item) > 3) { +$value = sprintf('[%s, ...]', parse_args(array_slice($item, 0, 3))); +} else { +$value = sprintf('[%s]', parse_args($item)); +} +break; +case is_string($item): +if (strlen($item) > 20) { +$value = sprintf( +'\'%s...\'', +htmlentities($item), +htmlentities(substr($item, 0, 20)) +); +} else { +$value = sprintf("'%s'", htmlentities($item)); +} +break; +case is_int($item): +case is_float($item): +$value = $item; +break; +case is_null($item): +$value = 'null'; +break; +case is_bool($item): +$value = '' . ($item ? 'true' : 'false') . ''; +break; +case is_resource($item): +$value = 'resource'; +break; +default: +$value = htmlentities(str_replace("\n", '', var_export(strval($item), true))); +break; +} + +$result[] = is_int($key) ? $value : "'{$key}' => {$value}"; +} + +return implode(', ', $result); +} +} +if (!function_exists('echo_value')) { +function echo_value($val) +{ +if (is_array($val) || is_object($val)) { +echo htmlentities(json_encode($val, JSON_PRETTY_PRINT)); +} elseif (is_bool($val)) { +echo $val ? 'true' : 'false'; +} elseif (is_scalar($val)) { +echo htmlentities($val); +} else { +echo 'Resource'; +} +} +} +?> + + + + + 系统发生错误 + + + + + + $trace) { ?> +
+
+
+
+

+
+

+
+
+ +
+ 
     $value) { ?>
  1. ">
+
+ +
+

Call Stack

+
    +
    2. + +
  2. + +
    3. + +
+
+
+ + +
+

+
+ + + +
+

Exception Datas

+ $value) { ?> + + + + + + + $val) { ?> + + + + + + + +
empty
+ +
+ + + +
+

Environment Variables

+ $value) { ?> + + + + + + + $val) { ?> + + + + + + + +
empty
+ +
+ + + + + + + diff --git a/app/admin/view/index/index.html b/app/admin/view/index/index.html index c6fbbeaac..13062be4d 100644 --- a/app/admin/view/index/index.html +++ b/app/admin/view/index/index.html @@ -48,10 +48,18 @@ {if session('user.username')}
  • +
    + + {if $app->isDebug()} + + {else} + + {/if} +
    基本资料
    安全设置
    -
    缓存加速
    -
    清理缓存
    +
    缓存加速
    +
    清理缓存
    退出登录
    {:session('user.username')} diff --git a/composer.lock b/composer.lock index 1462a5405..7af664413 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "c161f6c8dec3e80a5efb82342f55e0273d530c3f" + "reference": "bf0d7accc9fc460d33954f2a9f7969fbfcb40c89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c161f6c8dec3e80a5efb82342f55e0273d530c3f", - "reference": "c161f6c8dec3e80a5efb82342f55e0273d530c3f", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bf0d7accc9fc460d33954f2a9f7969fbfcb40c89", + "reference": "bf0d7accc9fc460d33954f2a9f7969fbfcb40c89", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-04-03T02:28:18+00:00" + "time": "2020-04-08T02:44:51+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/config/app.php b/config/app.php index 68713ec58..1d8e68801 100644 --- a/config/app.php +++ b/config/app.php @@ -35,11 +35,11 @@ return [ // 禁止URL访问的应用列表（自动多应用模式有效） 'deny_app_list' => [], // 异常页面的模板文件 - 'exception_tmpl' => app()->getThinkPath() . 'tpl/think_exception.tpl', + 'exception_tmpl' => app()->getAppPath() . 'admin/view/error.tpl', // 错误显示信息,非调试模式有效 'error_message' => '页面错误！请稍后再试～', // 显示错误信息 - 'show_error_msg' => true, + 'show_error_msg' => app()->isDebug(), // 当前应用版本号 'thinkadmin_ver' => 'v6', ]; \ No newline at end of file diff --git a/public/index.php b/public/index.php index c8daac2f8..a1aedb0dc 100644 --- a/public/index.php +++ b/public/index.php @@ -15,12 +15,16 @@ namespace think; +use think\admin\service\SystemService; + require __DIR__ . '/../vendor/autoload.php'; -$http = (new App())->debug(true)->http; +$app = new App(); -$response = $http->run(); +$debug = !SystemService::instance()->productMode(); + +$response = $app->debug($debug)->http->run(); $response->send(); -$http->end($response); +$app->http->end($response); \ No newline at end of file diff --git a/public/static/admin.js b/public/static/admin.js index 5ca607cb1..5a8a6680c 100644 --- a/public/static/admin.js +++ b/public/static/admin.js @@ -174,9 +174,8 @@ $(function () { }; // 以HASH打开新网页 this.href = function (url, obj) { - if (url !== '#') { - window.location.href = '#' + $.menu.parseUri(url, obj); - } else if (obj && obj.getAttribute('data-menu-node')) { + if (url !== '#') window.location.href = '#' + $.menu.parseUri(url, obj); + else if (obj && obj.getAttribute('data-menu-node')) { $('[data-menu-node^="' + obj.getAttribute('data-menu-node') + '-"][data-open!="#"]:first').trigger('click'); } }; @@ -184,32 +183,27 @@ $(function () { this.load = function (url, data, method, callback, loading, tips, time, headers) { var index = loading !== false ? $.msg.loading(tips) : 0; if (typeof data === 'object' && typeof data['_token_'] === 'string') { - headers = headers || {}; - headers['User-Form-Token'] = data['_token_']; - delete data['_token_']; + headers = headers || {}, headers['User-Form-Token'] = data['_token_'], delete data['_token_']; } $.ajax({ - data: data || {}, type: method || 'GET', url: $.menu.parseUri(url), beforeSend: function (xhr) { + data: data || {}, type: method || 'GET', url: $.menu.parseUri(url), beforeSend: function (xhr, i) { if (typeof Pace === 'object' && loading !== false) Pace.restart(); - if (typeof headers === 'object') for (var i in headers) xhr.setRequestHeader(i, headers[i]); - }, error: function (XMLHttpRequest) { - if (XMLHttpRequest.responseText.indexOf('exception') > -1) layer.open({ - title: XMLHttpRequest.status + ' - ' + XMLHttpRequest.statusText, type: 2, - area: '800px', content: 'javascript:void(0)', success: function ($element, index) { - try { - layer.full(index); - $element.find('iframe')[0].contentWindow.document.write(XMLHttpRequest.responseText); - $element.find('.layui-layer-setwin').css({right: '35px', top: '28px'}).find('a').css({marginLeft: 0}); - $element.find('.layui-layer-title').css({color: 'red', height: '70px', lineHeight: '70px', fontSize: '22px', textAlign: 'center', fontWeight: 700}); - } catch (e) { - layer.close(index); - } - } - }); - if (parseInt(XMLHttpRequest.status) === 200) { - this.success(XMLHttpRequest.responseText); - } else { + if (typeof headers === 'object') for (i in headers) xhr.setRequestHeader(i, headers[i]); + }, error: function (XMLHttpRequest, $dialog, dialogIdx, iframe) { + if (parseInt(XMLHttpRequest.status) !== 200 && XMLHttpRequest.responseText.indexOf('Call Stack') > -1) try { + dialogIdx = layer.open({title: XMLHttpRequest.status + ' - ' + XMLHttpRequest.statusText, type: 2, move: false, content: 'javascript:;'}); + layer.full(dialogIdx), $dialog = $('#layui-layer' + dialogIdx), iframe = $dialog.find('iframe').get(0); + (iframe.contentDocument || iframe.contentWindow.document).write(XMLHttpRequest.responseText); + $dialog.find('.layui-layer-setwin').css({right: '35px', top: '28px'}).find('a').css({marginLeft: 0}); + $dialog.find('.layui-layer-title').css({color: 'red', height: '70px', lineHeight: '70px', fontSize: '22px', textAlign: 'center', fontWeight: 700}); + } catch (e) { + layer.close(dialogIdx); + } + layer.closeAll('loading'); + if (parseInt(XMLHttpRequest.status) !== 200) { $.msg.tips('E' + XMLHttpRequest.status + ' - 服务器繁忙，请稍候再试！'); + } else { + this.success(XMLHttpRequest.responseText); } }, success: function (ret) { if (typeof callback === 'function' && callback.call(that, ret) === false) return false; @@ -293,6 +287,11 @@ $(function () { }; // 后台菜单动作初始化 this.listen = function () { + /*! 初始化操作*/ + layui.form.render(); + layui.form.on('switch(ThinkAdminDebug)', function (data) { + jQuery.post(webRoot + '?s=admin/api.plugs/debug', {state: data.elem.checked ? 1 : 0}); + }); // 菜单模式切换 (function ($menu, miniClass) { // Mini 菜单模式切换及显示 @@ -829,4 +828,5 @@ $(function () { /*! 初始化事件 */ $.menu.listen(); $.vali.listen(); + }); diff --git a/public/static/theme/css/console.css b/public/static/theme/css/console.css index a9d0315c3..1b4c4282d 100644 --- a/public/static/theme/css/console.css +++ b/public/static/theme/css/console.css @@ -468,16 +468,8 @@ label.think-radio { .layui-layout.layui-layout-left-hide [data-target-menu-type] { display: none; } -/* 浏览器DEBUG */ -.version-debug { - width: 100%; - color: #fff; - height: 100px; - font-size: 20px; - text-align: center; - line-height: 100px; - margin-bottom: 40px; - background-color: #E90D24; +.think-switch-button .layui-form-switch { + margin-top: 0; } .input-right-icon { top: 0; diff --git a/public/static/theme/css/console.css.map b/public/static/theme/css/console.css.map index 2bf621059..5e7410387 100644 --- a/public/static/theme/css/console.css.map +++ b/public/static/theme/css/console.css.map @@ -1 +1 @@ -{"version":3,"sources":["console.less","console.form.less","console.layui.less","console.layout.less","console.custom.less"],"names":[],"mappings":"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","file":"console.css"} \ No newline at end of file +{"version":3,"sources":["console.less","console.form.less","console.layui.less","console.layout.less","console.custom.less"],"names":[],"mappings":"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","file":"console.css"} \ No newline at end of file diff --git a/public/static/theme/css/console.layout.less b/public/static/theme/css/console.layout.less index c9004b555..9d4a54568 100644 --- a/public/static/theme/css/console.layout.less +++ b/public/static/theme/css/console.layout.less @@ -208,16 +208,8 @@ } } -/* 浏览器DEBUG */ -.version-debug { - width: 100%; - color: #fff; - height: 100px; - font-size: 20px; - text-align: center; - line-height: 100px; - margin-bottom: 40px; - background-color: #E90D24 +.think-switch-button .layui-form-switch { + margin-top: 0 } .input-right-icon { diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 4e1ac5453..a6e8e1bd7 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -197,6 +197,7 @@ return array( 'app\\admin\\controller\\Oplog' => $baseDir . '/app/admin/controller/Oplog.php', 'app\\admin\\controller\\Queue' => $baseDir . '/app/admin/controller/Queue.php', 'app\\admin\\controller\\User' => $baseDir . '/app/admin/controller/User.php', + 'app\\admin\\controller\\api\\Config' => $baseDir . '/app/admin/controller/api/Config.php', 'app\\admin\\controller\\api\\Plugs' => $baseDir . '/app/admin/controller/api/Plugs.php', 'app\\admin\\controller\\api\\Queue' => $baseDir . '/app/admin/controller/api/Queue.php', 'app\\admin\\controller\\api\\Update' => $baseDir . '/app/admin/controller/api/Update.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 136fc87bd..b6244f5c9 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -330,6 +330,7 @@ class ComposerStaticInit4ceee63a2cdf20349907f5909444af96 'app\\admin\\controller\\Oplog' => __DIR__ . '/../..' . '/app/admin/controller/Oplog.php', 'app\\admin\\controller\\Queue' => __DIR__ . '/../..' . '/app/admin/controller/Queue.php', 'app\\admin\\controller\\User' => __DIR__ . '/../..' . '/app/admin/controller/User.php', + 'app\\admin\\controller\\api\\Config' => __DIR__ . '/../..' . '/app/admin/controller/api/Config.php', 'app\\admin\\controller\\api\\Plugs' => __DIR__ . '/../..' . '/app/admin/controller/api/Plugs.php', 'app\\admin\\controller\\api\\Queue' => __DIR__ . '/../..' . '/app/admin/controller/api/Queue.php', 'app\\admin\\controller\\api\\Update' => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index fe19a5ef5..628e42b6e 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": "c161f6c8dec3e80a5efb82342f55e0273d530c3f" + "reference": "bf0d7accc9fc460d33954f2a9f7969fbfcb40c89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c161f6c8dec3e80a5efb82342f55e0273d530c3f", - "reference": "c161f6c8dec3e80a5efb82342f55e0273d530c3f", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bf0d7accc9fc460d33954f2a9f7969fbfcb40c89", + "reference": "bf0d7accc9fc460d33954f2a9f7969fbfcb40c89", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-04-03T02:28:18+00:00", + "time": "2020-04-08T02:44:51+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 14346171e..00069f6b2 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php index afba01c40..4386c632e 100644 --- a/vendor/zoujingli/think-library/src/command/Install.php +++ b/vendor/zoujingli/think-library/src/command/Install.php @@ -69,6 +69,8 @@ class Install extends Command 'config/session.php', 'config/trace.php', 'config/view.php', + 'public/index.php', + 'public/router.php', ], 'ignore' => [], ], @@ -113,8 +115,8 @@ class Install extends Command list($state, $mode, $name) = InstallService::instance()->fileSynchronization($file); if ($state) { if ($mode === 'add') $this->output->writeln("--- {$name} added successfully"); - if ($mode === 'mod') $this->output->writeln("--- {$name} updated successfully"); - if ($mode === 'del') $this->output->writeln("--- {$name} deleted successfully"); + if ($mode === 'mod') $this->output->writeln("--- {$name} update successfully"); + if ($mode === 'del') $this->output->writeln("--- {$name} delete successfully"); } else { if ($mode === 'add') $this->output->writeln("--- {$name} add failed"); if ($mode === 'mod') $this->output->writeln("--- {$name} update failed"); diff --git a/vendor/zoujingli/think-library/src/command/queue/ListenQueue.php b/vendor/zoujingli/think-library/src/command/queue/ListenQueue.php index 52f200b8a..7c3116132 100644 --- a/vendor/zoujingli/think-library/src/command/queue/ListenQueue.php +++ b/vendor/zoujingli/think-library/src/command/queue/ListenQueue.php @@ -50,8 +50,8 @@ class ListenQueue extends Queue $output->writeln('============ LISTENING ============'); while (true) { $where = [['status', '=', '1'], ['exec_time', '<=', time()]]; - $this->app->db->name($this->table)->where($where)->order('exec_time asc')->chunk(100, function (Collection $list) { - foreach ($list as $vo) try { + $this->app->db->name($this->table)->where($where)->order('exec_time asc')->chunk(100, function (Collection $result) { + foreach ($result->toArray() as $vo) try { $command = $this->process->think("xtask:_work {$vo['code']} -"); if (count($this->process->query($command)) > 0) { $this->output->writeln("Already in progress -> [{$vo['code']}] {$vo['title']}"); diff --git a/vendor/zoujingli/think-library/src/command/queue/StartQueue.php b/vendor/zoujingli/think-library/src/command/queue/StartQueue.php index 41c55b220..d7a2dee17 100644 --- a/vendor/zoujingli/think-library/src/command/queue/StartQueue.php +++ b/vendor/zoujingli/think-library/src/command/queue/StartQueue.php @@ -47,8 +47,7 @@ class StartQueue extends Queue if (count($result = $this->process->query($command)) > 0) { $output->info("Listening main process {$result['0']['pid']} has started"); } else { - $this->process->create($command); - sleep(1); + [$this->process->create($command), sleep(1)]; if (count($result = $this->process->query($command)) > 0) { $output->info("Listening main process {$result['0']['pid']} started successfully"); } else { diff --git a/vendor/zoujingli/think-library/src/extend/HttpExtend.php b/vendor/zoujingli/think-library/src/extend/HttpExtend.php index 34aa7fda7..bcaeccee3 100644 --- a/vendor/zoujingli/think-library/src/extend/HttpExtend.php +++ b/vendor/zoujingli/think-library/src/extend/HttpExtend.php @@ -173,9 +173,7 @@ class HttpExtend */ private static function getUserAgent() { - if (!empty($_SERVER['HTTP_USER_AGENT'])) { - return $_SERVER['HTTP_USER_AGENT']; - } + if (!empty($_SERVER['HTTP_USER_AGENT'])) return $_SERVER['HTTP_USER_AGENT']; $agents = [ "Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0.1", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/536.11 (KHTML, like Gecko) Chrome/20.0.1132.57 Safari/536.11", diff --git a/vendor/zoujingli/think-library/src/extend/JsonRpcClient.php b/vendor/zoujingli/think-library/src/extend/JsonRpcClient.php index 734954515..3009fcff5 100644 --- a/vendor/zoujingli/think-library/src/extend/JsonRpcClient.php +++ b/vendor/zoujingli/think-library/src/extend/JsonRpcClient.php @@ -40,8 +40,8 @@ class JsonRpcClient */ public function __construct($proxy) { - $this->id = CodeExtend::uniqidNumber(); $this->proxy = $proxy; + $this->id = CodeExtend::uniqidNumber(); } /** diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php index ff2827a9b..c75b7dd91 100644 --- a/vendor/zoujingli/think-library/src/service/SystemService.php +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -197,4 +197,15 @@ class SystemService extends Service return true; } + /** + * 设置运行环境模式 + * @param null|boolean $state + * @return boolean + */ + public function productMode($state = null) + { + $lock = "{$this->app->getRootPath()}runtime/.product.mode"; + return is_null($state) ? file_exists($lock) : ($state ? touch($lock) : @unlink($lock)); + } + } \ No newline at end of file