mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 19:41:44 +08:00
增加debug开关
This commit is contained in:
Anyon
parent
958b515ed0
commit
19ab1091fa
@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
10
app/admin/controller/api/Config.php
Normal file
10
app/admin/controller/api/Config.php
Normal file
@ -0,0 +1,10 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace app\admin\controller\api;
|
||||
|
||||
|
||||
class Config
|
||||
{
|
||||
|
||||
}
|
||||
@ -16,6 +16,8 @@
|
||||
namespace app\admin\controller\api;
|
||||
|
||||
use think\admin\Controller;
|
||||
use think\admin\service\SystemService;
|
||||
use think\exception\HttpResponseException;
|
||||
|
||||
/**
|
||||
* 通用插件管理
|
||||
@ -35,4 +37,52 @@ class Plugs extends Controller
|
||||
$this->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('已切换为开发模式！');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
574
app/admin/view/error.tpl
Normal file
574
app/admin/view/error.tpl
Normal file
@ -0,0 +1,574 @@
|
||||
<?php
|
||||
|
||||
if (!function_exists('parse_padding')) {
|
||||
function parse_padding($source)
|
||||
{
|
||||
$length = strlen(strval(count($source['source']) + $source['first']));
|
||||
return 40 + ($length - 1) * 8;
|
||||
}
|
||||
}
|
||||
|
||||
if (!function_exists('parse_class')) {
|
||||
function parse_class($name)
|
||||
{
|
||||
$names = explode('\\', $name);
|
||||
return '<abbr title="' . $name . '">' . end($names) . '</abbr>';
|
||||
}
|
||||
}
|
||||
|
||||
if (!function_exists('parse_file')) {
|
||||
function parse_file($file, $line)
|
||||
{
|
||||
return '<a class="toggle" title="' . "{$file} line {$line}" . '">' . basename($file) . " line {$line}" . '</a>';
|
||||
}
|
||||
}
|
||||
|
||||
if (!function_exists('parse_args')) {
|
||||
function parse_args($args)
|
||||
{
|
||||
$result = [];
|
||||
foreach ($args as $key => $item) {
|
||||
switch (true) {
|
||||
case is_object($item):
|
||||
$value = sprintf('<em>object</em>(%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(
|
||||
'\'<a class="toggle" title="%s">%s...</a>\'',
|
||||
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 = '<em>null</em>';
|
||||
break;
|
||||
case is_bool($item):
|
||||
$value = '<em>' . ($item ? 'true' : 'false') . '</em>';
|
||||
break;
|
||||
case is_resource($item):
|
||||
$value = '<em>resource</em>';
|
||||
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';
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>系统发生错误</title>
|
||||
<meta name="robots" content="noindex,nofollow"/>
|
||||
<style>
|
||||
/* Base */
|
||||
body {
|
||||
color: #333;
|
||||
font: 16px Verdana, "Helvetica Neue", helvetica, Arial, 'Microsoft YaHei', sans-serif;
|
||||
margin: 0;
|
||||
padding: 0 20px 20px;
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: 10px 0 0;
|
||||
font-size: 28px;
|
||||
font-weight: 500;
|
||||
line-height: 32px;
|
||||
}
|
||||
|
||||
h2 {
|
||||
color: #4288ce;
|
||||
font-weight: 400;
|
||||
padding: 6px 0;
|
||||
margin: 6px 0 0;
|
||||
font-size: 18px;
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
|
||||
h3 {
|
||||
margin: 12px;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
abbr {
|
||||
cursor: help;
|
||||
text-decoration: underline;
|
||||
text-decoration-style: dotted;
|
||||
}
|
||||
|
||||
a {
|
||||
color: #868686;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.line-error {
|
||||
background: #f8cbcb;
|
||||
}
|
||||
|
||||
.echo table {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.echo pre {
|
||||
padding: 16px;
|
||||
overflow: auto;
|
||||
font-size: 85%;
|
||||
line-height: 1.45;
|
||||
background-color: #f7f7f7;
|
||||
border: 0;
|
||||
border-radius: 3px;
|
||||
font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
|
||||
}
|
||||
|
||||
.echo pre > pre {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Exception Info */
|
||||
.exception {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.exception .message {
|
||||
padding: 12px;
|
||||
border: 1px solid #ddd;
|
||||
border-bottom: 0 none;
|
||||
line-height: 18px;
|
||||
font-size: 16px;
|
||||
border-top-left-radius: 4px;
|
||||
border-top-right-radius: 4px;
|
||||
font-family: Consolas, "Liberation Mono", Courier, Verdana, "微软雅黑", serif;
|
||||
}
|
||||
|
||||
.exception .code {
|
||||
float: left;
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
margin-right: 12px;
|
||||
padding: 16px;
|
||||
border-radius: 4px;
|
||||
background: #999;
|
||||
}
|
||||
|
||||
.exception .source-code {
|
||||
padding: 6px;
|
||||
border: 1px solid #ddd;
|
||||
|
||||
background: #f9f9f9;
|
||||
overflow-x: auto;
|
||||
|
||||
}
|
||||
|
||||
.exception .source-code pre {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.exception .source-code pre ol {
|
||||
margin: 0;
|
||||
color: #4288ce;
|
||||
display: inline-block;
|
||||
min-width: 100%;
|
||||
box-sizing: border-box;
|
||||
font-size: 14px;
|
||||
font-family: "Century Gothic", Consolas, "Liberation Mono", Courier, Verdana, serif;
|
||||
padding-left: < ? php echo (isset($ source) & & ! empty($ source)) ? parse_padding($ source): 40;
|
||||
? > px;
|
||||
}
|
||||
|
||||
.exception .source-code pre li {
|
||||
border-left: 1px solid #ddd;
|
||||
height: 18px;
|
||||
line-height: 18px;
|
||||
}
|
||||
|
||||
.exception .source-code pre code {
|
||||
color: #333;
|
||||
height: 100%;
|
||||
display: inline-block;
|
||||
border-left: 1px solid #fff;
|
||||
font-size: 14px;
|
||||
font-family: Consolas, "Liberation Mono", Courier, Verdana, "微软雅黑", serif;
|
||||
}
|
||||
|
||||
.exception .trace {
|
||||
padding: 6px;
|
||||
border: 1px solid #ddd;
|
||||
border-top: 0 none;
|
||||
line-height: 16px;
|
||||
font-size: 14px;
|
||||
font-family: Consolas, "Liberation Mono", Courier, Verdana, "微软雅黑", serif;
|
||||
}
|
||||
|
||||
.exception .trace h2:hover {
|
||||
text-decoration: underline;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.exception .trace ol {
|
||||
margin: 12px;
|
||||
}
|
||||
|
||||
.exception .trace ol li {
|
||||
padding: 2px 4px;
|
||||
}
|
||||
|
||||
.exception div:last-child {
|
||||
border-bottom-left-radius: 4px;
|
||||
border-bottom-right-radius: 4px;
|
||||
}
|
||||
|
||||
/* Exception Variables */
|
||||
.exception-var table {
|
||||
width: 100%;
|
||||
margin: 12px 0;
|
||||
box-sizing: border-box;
|
||||
table-layout: fixed;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.exception-var table caption {
|
||||
text-align: left;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
padding: 6px 0;
|
||||
}
|
||||
|
||||
.exception-var table caption small {
|
||||
font-weight: 300;
|
||||
display: inline-block;
|
||||
margin-left: 10px;
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
.exception-var table tbody {
|
||||
font-size: 13px;
|
||||
font-family: Consolas, "Liberation Mono", Courier, "微软雅黑", serif;
|
||||
}
|
||||
|
||||
.exception-var table td {
|
||||
padding: 0 6px;
|
||||
vertical-align: top;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
.exception-var table td:first-child {
|
||||
width: 28%;
|
||||
font-weight: bold;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.exception-var table td pre {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Copyright Info */
|
||||
.copyright {
|
||||
margin-top: 24px;
|
||||
padding: 12px 0;
|
||||
border-top: 1px solid #eee;
|
||||
}
|
||||
|
||||
/* SPAN elements with the classes below are added by prettyprint. */
|
||||
pre.prettyprint .pln {
|
||||
color: #000
|
||||
}
|
||||
|
||||
/* plain text */
|
||||
pre.prettyprint .str {
|
||||
color: #080
|
||||
}
|
||||
|
||||
/* string content */
|
||||
pre.prettyprint .kwd {
|
||||
color: #008
|
||||
}
|
||||
|
||||
/* a keyword */
|
||||
pre.prettyprint .com {
|
||||
color: #800
|
||||
}
|
||||
|
||||
/* a comment */
|
||||
pre.prettyprint .typ {
|
||||
color: #606
|
||||
}
|
||||
|
||||
/* a type name */
|
||||
pre.prettyprint .lit {
|
||||
color: #066
|
||||
}
|
||||
|
||||
/* a literal value */
|
||||
/* punctuation, lisp open bracket, lisp close bracket */
|
||||
pre.prettyprint .pun, pre.prettyprint .opn, pre.prettyprint .clo {
|
||||
color: #660
|
||||
}
|
||||
|
||||
pre.prettyprint .tag {
|
||||
color: #008
|
||||
}
|
||||
|
||||
/* a markup tag name */
|
||||
pre.prettyprint .atn {
|
||||
color: #606
|
||||
}
|
||||
|
||||
/* a markup attribute name */
|
||||
pre.prettyprint .atv {
|
||||
color: #080
|
||||
}
|
||||
|
||||
/* a markup attribute value */
|
||||
pre.prettyprint .dec, pre.prettyprint .var {
|
||||
color: #606
|
||||
}
|
||||
|
||||
/* a declaration; a variable name */
|
||||
pre.prettyprint .fun {
|
||||
color: red
|
||||
}
|
||||
|
||||
/* a function name */
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<?php if (\think\facade\App::isDebug()) { ?>
|
||||
<?php foreach ($traces as $index => $trace) { ?>
|
||||
<div class="exception">
|
||||
<div class="message">
|
||||
<div class="info">
|
||||
<div>
|
||||
<h2><?php echo "#{$index} [{$trace['code']}]" . sprintf('%s in %s', parse_class($trace['name']), parse_file($trace['file'], $trace['line'])); ?></h2>
|
||||
</div>
|
||||
<div><h1><?php echo nl2br(htmlentities($trace['message'])); ?></h1></div>
|
||||
</div>
|
||||
</div>
|
||||
<?php if (!empty($trace['source'])) { ?>
|
||||
<div class="source-code">
|
||||
<pre class="prettyprint lang-php"><ol start="<?php echo $trace['source']['first']; ?>"><?php foreach ((array)$trace['source']['source'] as $key => $value) { ?><li class="line-<?php echo " {$index}-" . ($key + $trace['source']['first']) . ($trace['line'] === $key + $trace['source']['first'] ? ' line-error' : ''); ?>"><code><?php echo htmlentities($value); ?></code></li><?php } ?></ol></pre>
|
||||
</div>
|
||||
<?php } ?>
|
||||
<div class="trace">
|
||||
<h2 data-expand="<?php echo 0 === $index ? '1' : '0'; ?>">Call Stack</h2>
|
||||
<ol>
|
||||
<li><?php echo sprintf('in %s', parse_file($trace['file'], $trace['line'])); ?></li>
|
||||
<?php foreach ((array)$trace['trace'] as $value) { ?>
|
||||
<li>
|
||||
<?php
|
||||
// Show Function
|
||||
if ($value['function']) {
|
||||
echo sprintf(
|
||||
'at %s%s%s(%s)',
|
||||
isset($value['class']) ? parse_class($value['class']) : '',
|
||||
isset($value['type']) ? $value['type'] : '',
|
||||
$value['function'],
|
||||
isset($value['args']) ? parse_args($value['args']) : ''
|
||||
);
|
||||
}
|
||||
|
||||
// Show line
|
||||
if (isset($value['file']) && isset($value['line'])) {
|
||||
echo sprintf(' in %s', parse_file($value['file'], $value['line']));
|
||||
}
|
||||
?>
|
||||
</li>
|
||||
<?php } ?>
|
||||
</ol>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
<?php } else { ?>
|
||||
<div class="exception">
|
||||
<div class="info"><h1><?php echo htmlentities($message); ?></h1></div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if (!empty($datas)) { ?>
|
||||
<div class="exception-var">
|
||||
<h2>Exception Datas</h2>
|
||||
<?php foreach ((array)$datas as $label => $value) { ?>
|
||||
<table>
|
||||
<?php if (empty($value)) { ?>
|
||||
<caption><?php echo $label; ?><small>empty</small></caption>
|
||||
<?php } else { ?>
|
||||
<caption><?php echo $label; ?></caption>
|
||||
<tbody>
|
||||
<?php foreach ((array)$value as $key => $val) { ?>
|
||||
<tr>
|
||||
<td><?php echo htmlentities($key); ?></td>
|
||||
<td><?php echo_value($val); ?></td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
</tbody>
|
||||
<?php } ?>
|
||||
</table>
|
||||
<?php } ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if (!empty($tables)) { ?>
|
||||
<div class="exception-var">
|
||||
<h2>Environment Variables</h2>
|
||||
<?php foreach ((array)$tables as $label => $value) { ?>
|
||||
<table>
|
||||
<?php if (empty($value)) { ?>
|
||||
<caption><?php echo $label; ?><small>empty</small></caption>
|
||||
<?php } else { ?>
|
||||
<caption><?php echo $label; ?></caption>
|
||||
<tbody>
|
||||
<?php foreach ((array)$value as $key => $val) { ?>
|
||||
<tr>
|
||||
<td><?php echo htmlentities($key); ?></td>
|
||||
<td><?php echo_value($val); ?></td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
</tbody>
|
||||
<?php } ?>
|
||||
</table>
|
||||
<?php } ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if (\think\facade\App::isDebug()) { ?>
|
||||
<script>
|
||||
function $(selector, node) {
|
||||
var elements;
|
||||
|
||||
node = node || document;
|
||||
if (document.querySelectorAll) {
|
||||
elements = node.querySelectorAll(selector);
|
||||
} else {
|
||||
switch (selector.substr(0, 1)) {
|
||||
case '#':
|
||||
elements = [node.getElementById(selector.substr(1))];
|
||||
break;
|
||||
case '.':
|
||||
if (document.getElementsByClassName) {
|
||||
elements = node.getElementsByClassName(selector.substr(1));
|
||||
} else {
|
||||
elements = get_elements_by_class(selector.substr(1), node);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
elements = node.getElementsByTagName();
|
||||
}
|
||||
}
|
||||
return elements;
|
||||
|
||||
function get_elements_by_class(search_class, node, tag) {
|
||||
var elements = [], eles,
|
||||
pattern = new RegExp('(^|\\s)' + search_class + '(\\s|$)');
|
||||
|
||||
node = node || document;
|
||||
tag = tag || '*';
|
||||
|
||||
eles = node.getElementsByTagName(tag);
|
||||
for (var i = 0; i < eles.length; i++) {
|
||||
if (pattern.test(eles[i].className)) {
|
||||
elements.push(eles[i])
|
||||
}
|
||||
}
|
||||
|
||||
return elements;
|
||||
}
|
||||
}
|
||||
|
||||
$.getScript = function (src, func) {
|
||||
var script = document.createElement('script');
|
||||
|
||||
script.async = 'async';
|
||||
script.src = src;
|
||||
script.onload = func || function () {
|
||||
};
|
||||
|
||||
$('head')[0].appendChild(script);
|
||||
}
|
||||
|
||||
;(function () {
|
||||
var files = $('.toggle');
|
||||
var ol = $('ol', $('.prettyprint')[0]);
|
||||
var li = $('li', ol[0]);
|
||||
|
||||
// 短路径和长路径变换
|
||||
for (var i = 0; i < files.length; i++) {
|
||||
files[i].ondblclick = function () {
|
||||
var title = this.title;
|
||||
|
||||
this.title = this.innerHTML;
|
||||
this.innerHTML = title;
|
||||
}
|
||||
}
|
||||
|
||||
(function () {
|
||||
var expand = function (dom, expand) {
|
||||
var ol = $('ol', dom.parentNode)[0];
|
||||
expand = undefined === expand ? dom.attributes['data-expand'].value === '0' : undefined;
|
||||
if (expand) {
|
||||
dom.attributes['data-expand'].value = '1';
|
||||
ol.style.display = 'none';
|
||||
dom.innerText = 'Call Stack (展开)';
|
||||
} else {
|
||||
dom.attributes['data-expand'].value = '0';
|
||||
ol.style.display = 'block';
|
||||
dom.innerText = 'Call Stack (折叠)';
|
||||
}
|
||||
};
|
||||
var traces = $('.trace');
|
||||
for (var i = 0; i < traces.length; i++) {
|
||||
var h2 = $('h2', traces[i])[0];
|
||||
expand(h2);
|
||||
h2.onclick = function () {
|
||||
expand(this);
|
||||
};
|
||||
}
|
||||
})();
|
||||
|
||||
$.getScript('//cdn.bootcss.com/prettify/r298/prettify.min.js', function () {
|
||||
prettyPrint();
|
||||
});
|
||||
})();
|
||||
</script>
|
||||
<?php } ?>
|
||||
</body>
|
||||
</html>
|
||||
@ -48,10 +48,18 @@
|
||||
{if session('user.username')}
|
||||
<li class="layui-nav-item">
|
||||
<dl class="layui-nav-child">
|
||||
<dd lay-unselect class="layui-form text-center think-switch-button">
|
||||
<a></a>
|
||||
{if $app->isDebug()}
|
||||
<input type="checkbox" lay-skin="switch" lay-text="生产模式|开发模式" lay-filter="ThinkAdminDebug">
|
||||
{else}
|
||||
<input type="checkbox" lay-skin="switch" lay-text="生产模式|开发模式" lay-filter="ThinkAdminDebug" checked>
|
||||
{/if}
|
||||
</dd>
|
||||
<dd lay-unselect><a data-modal="{:url('admin/index/info',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-set-fill margin-right-5"></i> 基本资料</a></dd>
|
||||
<dd lay-unselect><a data-modal="{:url('admin/index/pass',['id'=>session('user.id')])}"><i class="layui-icon layui-icon-component margin-right-5"></i> 安全设置</a></dd>
|
||||
<dd lay-unselect><a data-modal="{:url('admin/index/optimize')}"><i class="layui-icon layui-icon-template-1 margin-right-5"></i>缓存加速</a></dd>
|
||||
<dd lay-unselect><a data-modal="{:url('admin/index/clear')}"><i class="layui-icon layui-icon-fonts-clear margin-right-5"></i>清理缓存</a></dd>
|
||||
<dd lay-unselect><a data-load="{:url('admin/api.plugs/optimize')}"><i class="layui-icon layui-icon-template-1 margin-right-5"></i> 缓存加速</a></dd>
|
||||
<dd lay-unselect><a data-load="{:url('admin/api.plugs/clear')}"><i class="layui-icon layui-icon-fonts-clear margin-right-5"></i> 清理缓存</a></dd>
|
||||
<dd lay-unselect><a data-load="{:url('admin/login/out')}" data-confirm="确定要退出登录吗？"><i class="layui-icon layui-icon-release margin-right-5"></i> 退出登录</a></dd>
|
||||
</dl>
|
||||
<a><span><i class="layui-icon layui-icon-username margin-right-5"></i> {:session('user.username')}</span></a>
|
||||
|
||||
8
composer.lock
generated
8
composer.lock
generated
@ -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",
|
||||
|
||||
@ -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',
|
||||
];
|
||||
@ -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);
|
||||
@ -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();
|
||||
|
||||
});
|
||||
|
||||
@ -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;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -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 {
|
||||
|
||||
1
vendor/composer/autoload_classmap.php
vendored
1
vendor/composer/autoload_classmap.php
vendored
@ -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',
|
||||
|
||||
1
vendor/composer/autoload_static.php
vendored
1
vendor/composer/autoload_static.php
vendored
@ -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',
|
||||
|
||||
8
vendor/composer/installed.json
vendored
8
vendor/composer/installed.json
vendored
@ -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": {
|
||||
|
||||
2
vendor/services.php
vendored
2
vendor/services.php
vendored
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
// This file is automatically generated at:2020-04-03 10:30:55
|
||||
// This file is automatically generated at:2020-04-08 14:47:43
|
||||
declare (strict_types = 1);
|
||||
return array (
|
||||
0 => 'think\\app\\Service',
|
||||
|
||||
@ -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");
|
||||
|
||||
@ -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']}");
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -40,8 +40,8 @@ class JsonRpcClient
|
||||
*/
|
||||
public function __construct($proxy)
|
||||
{
|
||||
$this->id = CodeExtend::uniqidNumber();
|
||||
$this->proxy = $proxy;
|
||||
$this->id = CodeExtend::uniqidNumber();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -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));
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user