blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-05 19:41:44 +08:00
Code Issues Projects Releases Wiki Activity

调整运行模式判断

Browse Source
This commit is contained in:
Anyon 2020-10-29 11:06:27 +08:00
parent 9b1051e27b
commit bc819f5554
13 changed files with 158 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@ -12,11 +12,5 @@
/public/upload
/public/static/theme/css/node_modules
/public/static/theme/css/package-lock.json
/public/static/theme/css/console.custom.css
/public/static/theme/css/console.custom.css.map
/public/static/theme/css/console.dynamic.css
/public/static/theme/css/console.dynamic.css.map
/public/static/theme/css/console.layout.css
/public/static/theme/css/console.layout.css.map
/public/static/theme/css/console.layui.css
/public/static/theme/css/console.layui.css.map
/public/static/theme/css/console.*.css
/public/static/theme/css/console.*.css.map

2
app/admin/controller/Config.php
View File

@ -71,7 +71,7 @@ class Config extends Controller
if ($xpath !== 'admin' && file_exists($this->app->getBasePath() . $xpath)) {
$this->error("后台入口名称{$xpath}已经存在应用！");
}
SystemService::instance()->setRuntime([$xpath => 'admin']);
SystemService::instance()->setRuntime(null, [$xpath => 'admin']);
}
foreach ($this->request->post() as $name => $value) sysconf($name, $value);
$this->success('修改系统参数成功！', sysuri("{$xpath}/index/index") . '#' . url("{$xpath}/config/index"));

4
app/admin/controller/api/Plugs.php
View File

@ -83,10 +83,10 @@ class Plugs extends Controller
public function debug()
{
if (AdminService::instance()->isSuper()) if (input('state')) {
SystemService::instance()->setRuntime([], 'product');
SystemService::instance()->setRuntime('product');
$this->success('已切换为产品模式！');
} else {
SystemService::instance()->setRuntime([], 'debug');
SystemService::instance()->setRuntime('debug');
$this->success('已切换为开发模式！');
} else {
$this->error('只有超级管理员才能操作！');

2
public/index.php
View File

@ -19,4 +19,4 @@ use think\admin\service\SystemService;
require __DIR__ . '/../vendor/autoload.php';
SystemService::instance()->doInit(new App());
SystemService::instance()->doInit();

34
vendor/composer/installed.json vendored
View File

@ -533,17 +533,17 @@
},
{
"name": "symfony/options-resolver",
"version": "v3.4.45",
"version_normalized": "3.4.45.0",
"version": "v3.4.46",
"version_normalized": "3.4.46.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5"
"reference": "c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5",
"reference": "0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744",
"reference": "c7efc97a47b2ebaabc19d5b6c6b50f5c37c92744",
"shasum": "",
"mirrors": [
{
@ -555,13 +555,8 @@
"require": {
"php": "^5.5.9|>=7.0.8"
},
"time": "2020-07-08T17:07:26+00:00",
"time": "2020-10-24T10:57:07+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
@ -592,9 +587,6 @@
"configuration",
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v3.4.44"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -949,12 +941,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "51051855309a5752c0adb8f8d63129a43fd139ce"
"reference": "b34dc9c54a212b3f44b4231eec2218c8da1b98c1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/51051855309a5752c0adb8f8d63129a43fd139ce",
"reference": "51051855309a5752c0adb8f8d63129a43fd139ce",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b34dc9c54a212b3f44b4231eec2218c8da1b98c1",
"reference": "b34dc9c54a212b3f44b4231eec2218c8da1b98c1",
"shasum": "",
"mirrors": [
{
@ -971,7 +963,7 @@
"ext-mbstring": "*",
"topthink/framework": "^6.0"
},
"time": "2020-10-26T10:23:23+00:00",
"time": "2020-10-29T02:59:49+00:00",
"type": "library",
"extra": {
"think": {
@ -1000,11 +992,7 @@
}
],
"description": "ThinkPHP v6.0 Development Library",
"homepage": "http://thinkadmin.top",
"support": {
"issues": "https://github.com/zoujingli/ThinkLibrary/issues",
"source": "https://github.com/zoujingli/ThinkLibrary/tree/v6.0"
}
"homepage": "http://thinkadmin.top"
},
{
"name": "zoujingli/wechat-developer",

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php
// This file is automatically generated at:2020-10-27 15:53:11
// This file is automatically generated at:2020-10-29 11:05:01
declare (strict_types = 1);
return array (
0 => 'think\\admin\\Library',

7
vendor/symfony/options-resolver/composer.json vendored
View File

@ -24,10 +24,5 @@
"/Tests/"
]
},
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
}
}
"minimum-stability": "dev"
}

21
vendor/zoujingli/think-library/src/Library.php vendored
View File

@ -39,7 +39,7 @@ use function Composer\Autoload\includeFile;
class Library extends Service
{
/**
* 扩展库版本号
* 版本号
*/
const VERSION = '6.0.18';
@ -82,8 +82,8 @@ class Library extends Service
$this->app->request->setPathinfo($_SERVER['argv'][1]);
}
} else {
$isSess = $this->app->request->request('not_init_session', 0) == 0;
$notYar = stripos($this->app->request->header('user-agent', ''), 'PHP Yar RPC-') === false;
$isSess = intval($this->app->request->get('not_init_session', '0')) === 0;
$notYar = stripos($this->app->request->header('user_agent', ''), 'PHP Yar RPC-') === false;
if ($notYar && $isSess) {
// 注册会话初始化中间键
$this->app->middleware->add(SessionInit::class);
@ -105,14 +105,19 @@ class Library extends Service
} elseif (AdminService::instance()->check()) {
return $next($request)->header($header);
} elseif (AdminService::instance()->isLogin()) {
return json(['code' => 0, 'msg' => lang('think_library_not_auth')])->header($header);
return json(['code' => 0, 'info' => lang('think_library_not_auth')])->header($header);
} else {
return json(['code' => 0, 'msg' => lang('think_library_not_login'), 'url' => sysuri('admin/login/index')])->header($header);
return json(['code' => 0, 'info' => lang('think_library_not_login'), 'url' => sysuri('admin/login/index')])->header($header);
}
}, 'route');
}
// 动态加入应用函数
$SysRule = "{$this->app->getBasePath()}*/sys.php";
foreach (glob($SysRule) as $file) includeFile($file);
// 动态加入应用初始化系统函数
[$ds, $base] = [DIRECTORY_SEPARATOR, $this->app->getBasePath()];
foreach (glob("{$base}*{$ds}sys.php") as $file) includeFile($file);
// 动态加载插件初始化系统函数
$base = "{$this->app->getBasePath()}addons{$ds}";
if (file_exists($base) && is_dir($base)) {
foreach (glob("{$base}*{$ds}sys.php") as $file) includeFile($file);
}
}
}

7
vendor/zoujingli/think-library/src/multiple/BuildUrl.php vendored
View File

@ -143,6 +143,13 @@ class BuildUrl extends Url
if ($file && 0 !== strpos($request->url(), $file)) {
$file = str_replace('\\', '/', dirname($file));
}
/*=====- 插件 Addons URL 处理 - 开始 -=====*/
$name = $this->app->http->getName();
if (preg_match("#{$depr}addons-{$name}({$depr}|\.|$)#i", $request->url())) {
[$_name, $_attr] = explode($depr, $url . $depr, 2);
if ($_name === $name) $url = "addons-{$name}{$depr}" . rtrim($_attr, $depr);
}
/*=====- 插件 Addons URL 处理 - 结束 -=====*/
$url = rtrim($file, '/') . '/' . ltrim($url, '/');
// URL后缀
if ('/' == substr($url, -1) || '' == $url) {

22
vendor/zoujingli/think-library/src/multiple/Multiple.php vendored
View File

@ -131,15 +131,6 @@ class Multiple
$appName = $map['*'];
} else {
$appName = $name ?: $defaultApp;
$appPath = $this->path ?: $this->app->getBasePath() . $appName . DIRECTORY_SEPARATOR;
if (!is_dir($appPath)) {
if ($this->app->config->get('app.app_express', false)) {
$this->setApp($defaultApp);
return true;
} else {
return false;
}
}
}
if ($name) {
$this->app->request->setRoot('/' . $name);
@ -172,11 +163,16 @@ class Multiple
*/
protected function setApp(string $appName): void
{
$this->app->http->name($appName);
$appPath = $this->path ?: $this->app->getBasePath() . $appName . DIRECTORY_SEPARATOR;
if (stripos($appName, 'addons-') === 0) {
[, $appName] = explode('addons-', $appName, 2);
$this->app->setNamespace($this->app->config->get('app.app_namespace') ?: "app\\addons\\{$appName}");
$appPath = $this->path ?: $this->app->getBasePath() . 'addons' . DIRECTORY_SEPARATOR . $appName . DIRECTORY_SEPARATOR;
} else {
$appPath = $this->path ?: $this->app->getBasePath() . $appName . DIRECTORY_SEPARATOR;
$this->app->setNamespace($this->app->config->get('app.app_namespace') ?: "app\\{$appName}");
}
$this->app->setAppPath($appPath);
// 设置应用命名空间
$this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\' . $appName);
$this->app->http->name($appName);
if (is_dir($appPath)) {
$this->app->setRuntimePath($this->app->getRuntimePath() . $appName . DIRECTORY_SEPARATOR);
$this->app->http->setRoutePath($this->getRoutePath());

10
vendor/zoujingli/think-library/src/service/AdminService.php vendored
View File

@ -130,15 +130,13 @@ class AdminService extends Service
if ($force) $this->clearCache();
if (($uid = $this->app->session->get('user.id'))) {
$user = $this->app->db->name('SystemUser')->where(['id' => $uid])->find();
if (($aids = $user['authorize'])) {
$where = [['status', '=', '1'], ['id', 'in', explode(',', $aids)]];
$subsql = $this->app->db->name('SystemAuth')->field('id')->where($where)->buildSql();
$user['nodes'] = array_unique($this->app->db->name('SystemAuthNode')->whereRaw("auth in {$subsql}")->column('node'));
$this->app->session->set('user', $user);
if (!empty($user['authorize']) && !$this->isSuper()) {
$db = $this->app->db->name('SystemAuth')->field('id')->where(['status' => 1])->whereIn('id', str2arr($user['authorize']));
$user['nodes'] = array_unique($this->app->db->name('SystemAuthNode')->whereRaw("auth in {$db->buildSql()}")->column('node'));
} else {
$user['nodes'] = [];
$this->app->session->set('user', $user);
}
$this->app->session->set('user', $user);
}
return $this;
}

35
vendor/zoujingli/think-library/src/service/NodeService.php vendored
View File

@ -47,10 +47,17 @@ class NodeService extends Service
*/
public function getCurrent(string $type = ''): string
{
$prefix = $this->app->getNamespace();
$prefix = $this->app->http->getName();
if (preg_match("|\\\\addons\\\\{$prefix}$|", $this->app->getNamespace())) {
$prefix = "addons-{$this->app->http->getName()}";
}
// 获取应用前缀节点
if ($type === 'module') return $prefix;
// 获取控制器前缀节点
$middle = '\\' . $this->nameTolower($this->app->request->controller());
$suffix = ($type === 'controller') ? '' : ('\\' . $this->app->request->action());
return strtolower(strtr(substr($prefix, stripos($prefix, '\\') + 1) . $middle . $suffix, '\\', '/'));
if ($type === 'controller') return $prefix . $middle;
// 获取完整的权限节点
return strtolower(strtr($prefix . $middle . $this->app->request->action(), '\\', '/'));
}
/**
@ -60,13 +67,17 @@ class NodeService extends Service
*/
public function fullnode(?string $node = ''): string
{
if (empty($node)) return $this->getCurrent();
if (count($attrs = explode('/', $node)) === 1) {
return $this->getCurrent('controller') . '/' . strtolower($node);
} else {
$attrs[1] = $this->nameTolower($attrs[1]);
return strtolower(join('/', $attrs));
if (empty($node)) {
return $this->getCurrent();
}
switch (count($attrs = explode('/', $node))) {
case 2:
return $this->getCurrent('module') . '/' . strtolower($node);
case 1:
return $this->getCurrent('controller') . '/' . strtolower($node);
}
$attrs[1] = $this->nameTolower($attrs[1]);
return strtolower(join('/', $attrs));
}
/**
@ -103,10 +114,12 @@ class NodeService extends Service
$ignores = get_class_methods('\think\admin\Controller');
/*! 扫描所有代码控制器节点，更新节点缓存 */
foreach ($this->scanDirectory($this->app->getBasePath()) as $file) {
if (preg_match("|/(\w+)/(\w+)/controller/(.+)\.php$|i", $file, $matches)) {
$name = substr($file, strlen(strtr($this->app->getRootPath(), '\\', '/')) - 1);
if (preg_match("|^([\w/]+)/(\w+)/controller/(.+)\.php$|i", $name, $matches)) {
[, $namespace, $appname, $classname] = $matches;
$addons = preg_match('|/addons$|', $namespace) ? 'addons-' : '';
$class = new \ReflectionClass(strtr("{$namespace}/{$appname}/controller/{$classname}", '/', '\\'));
$prefix = strtolower(strtr("{$appname}/{$this->nameTolower($classname)}", '\\', '/'));
$prefix = strtolower(strtr("{$addons}{$appname}/{$this->nameTolower($classname)}", '\\', '/'));
$data[$prefix] = $this->_parseComment($class->getDocComment() ?: '', $classname);
foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
if (in_array($metname = $method->getName(), $ignores)) continue;

175
vendor/zoujingli/think-library/src/service/SystemService.php vendored
View File

@ -18,6 +18,7 @@ declare (strict_types=1);
namespace think\admin\service;
use think\admin\Service;
use think\App;
use think\db\Query;
use think\helper\Str;
@ -237,92 +238,6 @@ class SystemService extends Service
return true;
}
/**
* 判断实时运行模式
* @return boolean
*/
public function isDebug(): bool
{
return $this->getRuntime('run') !== 'product';
}
/**
* 设置运行环境模式
* @param null|boolean $state
* @return boolean
*/
public function productMode(?bool $state = null): bool
{
if (is_null($state)) {
return $this->bindRuntime();
} else {
return $this->setRuntime([], $state ? 'product' : 'debug');
}
}
/**
* 获取实时运行配置
* @param null|string $name 配置名称
* @param array $default 配置内容
* @return array|string
*/
public function getRuntime(?string $name = null, array $default = [])
{
$filename = "{$this->app->getRootPath()}runtime/config.json";
if (file_exists($filename) && is_file($filename)) {
$data = json_decode(file_get_contents($filename), true);
}
if (empty($data) || !is_array($data)) $data = [];
if (empty($data['map']) || !is_array($data['map'])) $data['map'] = [];
if (empty($data['uri']) || !is_array($data['uri'])) $data['uri'] = [];
if (empty($data['run']) || !is_string($data['run'])) $data['run'] = 'debug';
return is_null($name) ? $data : ($data[$name] ?? $default);
}
/**
* 设置实时运行配置
* @param null|array $map 应用映射
* @param null|mixed $run 支持模式
* @param null|array $uri 域名映射
* @return boolean 是否调试模式
*/
public function setRuntime(?array $map = [], ?string $run = null, ?array $uri = []): bool
{
$data = $this->getRuntime();
$data['run'] = is_string($run) ? $run : $data['run'];
$data['map'] = $this->uniqueArray($data['map'], $map);
$data['uri'] = $this->uniqueArray($data['uri'], $uri);
$filename = "{$this->app->getRootPath()}runtime/config.json";
file_put_contents($filename, json_encode($data, JSON_UNESCAPED_UNICODE));
return $this->bindRuntime($data);
}
/**
* 绑定应用实时配置
* @param array $data 配置数据
* @return boolean 是否调试模式
*/
public function bindRuntime(array $data = []): bool
{
if (empty($data)) $data = $this->getRuntime();
$bind['app_map'] = $this->app->config->get('app.app_map', []);
$bind['domain_bind'] = $this->app->config->get('app.domain_bind', []);
if (count($data['map']) > 0) $bind['app_map'] = $this->uniqueArray($bind['app_map'], $data['map']);
if (count($data['uri']) > 0) $bind['domain_bind'] = $this->uniqueArray($bind['domain_bind'], $data['uri']);
$this->app->config->set($bind, 'app');
return $this->app->debug($data['run'] !== 'product')->isDebug();
}
/**
* 获取唯一数组参数
* @param array ...$args
* @return array
*/
private function uniqueArray(...$args): array
{
return array_unique(array_reverse(array_merge(...$args)));
}
/**
* 压缩发布项目
*/
@ -344,17 +259,91 @@ class SystemService extends Service
{
$data = $this->getRuntime();
$this->app->console->call('clear');
$this->setRuntime($data['map'], $data['run'], $data['uri']);
$this->setRuntime($data['mode'], $data['appmap'], $data['domain']);
}
/**
* 初始化并运行应用
* @param \think\App $app
* 判断实时运行模式
* @return boolean
*/
public function doInit(\think\App $app): void
public function isDebug(): bool
{
$app->debug($this->isDebug());
($response = $app->http->run())->send();
$app->http->end($response);
return $this->getRuntime('mode') !== 'product';
}
/**
* 设置实时运行配置
* @param null|mixed $mode 支持模式
* @param null|array $appmap 应用映射
* @param null|array $domain 域名映射
* @return boolean 是否调试模式
*/
public function setRuntime(?string $mode = null, ?array $appmap = [], ?array $domain = []): bool
{
$data = $this->getRuntime();
$data['mode'] = $mode ?: $data['mode'];
$data['appmap'] = $this->uniqueArray($data['appmap'], $appmap);
$data['domain'] = $this->uniqueArray($data['domain'], $domain);
// 组装配置文件格式
$rows[] = "mode = {$data['mode']}";
foreach ($data['appmap'] as $key => $item) $rows[] = "appmap[{$key}] = {$item}";
foreach ($data['domain'] as $key => $item) $rows[] = "domain[{$key}] = {$item}";
$filename = $this->app->getRootPath() . 'runtime/.env';
file_put_contents($filename, "[RUNTIME]\n" . join("\n", $rows));
return $this->bindRuntime($data);
}
/**
* 获取实时运行配置
* @param null|string $name 配置名称
* @param array $default 配置内容
* @return array|string
*/
public function getRuntime(?string $name = null, array $default = [])
{
$filename = $this->app->getRootPath() . 'runtime/.env';
if (file_exists($filename)) $this->app->env->load($filename);
$data = [
'mode' => $this->app->env->get('RUNTIME_MODE') ?: 'debug',
'appmap' => $this->app->env->get('RUNTIME_APPMAP') ?: [],
'domain' => $this->app->env->get('RUNTIME_DOMAIN') ?: [],
];
return is_null($name) ? $data : ($data[$name] ?? $default);
}
/**
* 绑定应用实时配置
* @param array $data 配置数据
* @return boolean 是否调试模式
*/
public function bindRuntime(array $data = []): bool
{
if (empty($data)) $data = $this->getRuntime();
$bind['app_map'] = $this->uniqueArray($this->app->config->get('app.app_map', []), $data['appmap']);
$bind['domain_bind'] = $this->uniqueArray($this->app->config->get('app.domain_bind', []), $data['domain']);
$this->app->config->set($bind, 'app');
return $this->app->debug($data['mode'] !== 'product')->isDebug();
}
/**
* 初始化并运行主程序
* @param null|\think\App $app
*/
public function doInit(?\think\App $app = null): void
{
if (is_null($app)) $app = new App();
$http = $app->debug($this->isDebug())->http;
($response = $http->run())->send();
$http->end($response);
}
/**
* 获取唯一数组参数
* @param array ...$args
* @return array
*/
private function uniqueArray(...$args): array
{
return array_unique(array_reverse(array_merge(...$args)));
}
}