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

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-04-16 15:39:52 +08:00
parent 13090cd996
commit c1b307b717
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -909,12 +909,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "86bd9b95fc7080aa642c803446cde65acbaccedc" "reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/86bd9b95fc7080aa642c803446cde65acbaccedc", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8901d45d4435751d74cca5ffc247c9b75c64a9c8",
"reference": "86bd9b95fc7080aa642c803446cde65acbaccedc", "reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -958,7 +958,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2020-04-16T07:24:06+00:00" "time": "2020-04-16T07:34:14+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",

8
vendor/composer/installed.json vendored
View File

@ -935,12 +935,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "86bd9b95fc7080aa642c803446cde65acbaccedc" "reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/86bd9b95fc7080aa642c803446cde65acbaccedc", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8901d45d4435751d74cca5ffc247c9b75c64a9c8",
"reference": "86bd9b95fc7080aa642c803446cde65acbaccedc", "reference": "8901d45d4435751d74cca5ffc247c9b75c64a9c8",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -956,7 +956,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-04-16T07:24:06+00:00", "time": "2020-04-16T07:34:14+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-04-16 15:26:23 // This file is automatically generated at:2020-04-16 15:39:28
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

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

@ -204,17 +204,18 @@ class SystemService extends Service
*/ */
public function productMode($state = null) public function productMode($state = null)
{ {
if (is_string($state)) { if (is_null($state)) {
$this->setRuntime([], $state ? 'product' : 'developoer'); return $this->bindRuntime();
return !$this->app->debug(empty($state))->isDebug(); } else {
return $this->setRuntime([], $state ? 'product' : 'developoer');
} }
return !$this->app->debug($this->getRuntime('app_run') !== 'product')->isDebug();
} }
/** /**
* 设置实时运行配置 * 设置实时运行配置
* @param array|null $map 应用映射 * @param array|null $map 应用映射
* @param string|null $run 支持模式 * @param string|null $run 支持模式
* @return boolean 是否调试模式
*/ */
public function setRuntime($map = [], $run = null) public function setRuntime($map = [], $run = null)
{ {
@ -226,7 +227,7 @@ class SystemService extends Service
$data['app_run'] = is_null($run) ? $data['app_run'] : $run; $data['app_run'] = is_null($run) ? $data['app_run'] : $run;
$data['app_map'] = is_null($map) ? [] : array_merge($data['app_map'], $map); $data['app_map'] = is_null($map) ? [] : array_merge($data['app_map'], $map);
file_put_contents($file, json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); file_put_contents($file, json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
$this->bindRuntime($data); return $this->bindRuntime($data);
} }
/** /**
@ -247,6 +248,7 @@ class SystemService extends Service
/** /**
* 绑定应用实时配置 * 绑定应用实时配置
* @param array $data 配置数据 * @param array $data 配置数据
* @return boolean 是否调试模式
*/ */
public function bindRuntime($data = []) public function bindRuntime($data = [])
{ {
@ -260,7 +262,7 @@ class SystemService extends Service
$this->app->config->set(['app_map' => array_merge($maps, $data['app_map'])], 'app'); $this->app->config->set(['app_map' => array_merge($maps, $data['app_map'])], 'app');
} }
// 动态设置当前运行模式 // 动态设置当前运行模式
$this->app->debug($data['app_run'] !== 'product'); return $this->app->debug($data['app_run'] !== 'product')->isDebug();
} }
/** /**