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 14:07:38 +08:00
parent b2caeaa99c
commit 1cc1b50306
6 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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": "544aec71b8d65168a9633db8ab4088c8be95d0ce" "reference": "b7d389ebc8fa2b14c652c1f42786bf1461c17799"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/544aec71b8d65168a9633db8ab4088c8be95d0ce", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b7d389ebc8fa2b14c652c1f42786bf1461c17799",
"reference": "544aec71b8d65168a9633db8ab4088c8be95d0ce", "reference": "b7d389ebc8fa2b14c652c1f42786bf1461c17799",
"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-16T05:21:38+00:00" "time": "2020-04-16T05:51:49+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",
@ -1044,6 +1044,5 @@
"ext-openssl": "*", "ext-openssl": "*",
"ext-mbstring": "*" "ext-mbstring": "*"
}, },
"platform-dev": [], "platform-dev": []
"plugin-api-version": "1.1.0"
} }

2
config/app.php
View File

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

3
vendor/composer/autoload_real.php vendored
View File

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

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": "544aec71b8d65168a9633db8ab4088c8be95d0ce" "reference": "b7d389ebc8fa2b14c652c1f42786bf1461c17799"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/544aec71b8d65168a9633db8ab4088c8be95d0ce", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b7d389ebc8fa2b14c652c1f42786bf1461c17799",
"reference": "544aec71b8d65168a9633db8ab4088c8be95d0ce", "reference": "b7d389ebc8fa2b14c652c1f42786bf1461c17799",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -956,7 +956,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-04-16T05:21:38+00:00", "time": "2020-04-16T05:51:49+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 13:27:36 // This file is automatically generated at:2020-04-16 14:06:32
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

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

@ -43,7 +43,7 @@ class SystemService extends Service
*/ */
public function set($name, $value = '') public function set($name, $value = '')
{ {
list($type, $field) = $this->parse($name); [$type, $field] = $this->parse($name);
if (is_array($value)) { if (is_array($value)) {
foreach ($value as $k => $v) $this->set("{$field}.{$k}", $v); foreach ($value as $k => $v) $this->set("{$field}.{$k}", $v);
} else { } else {
@ -64,7 +64,7 @@ class SystemService extends Service
*/ */
public function get($name) public function get($name)
{ {
list($type, $field, $outer) = $this->parse($name); [$type, $field, $outer] = $this->parse($name);
if (empty($this->data)) foreach ($this->app->db->name('SystemConfig')->select() as $vo) { if (empty($this->data)) foreach ($this->app->db->name('SystemConfig')->select() as $vo) {
$this->data[$vo['type']][$vo['name']] = $vo['value']; $this->data[$vo['type']][$vo['name']] = $vo['value'];
} }
@ -93,7 +93,7 @@ class SystemService extends Service
public function save($dbQuery, $data, $key = 'id', $where = []) public function save($dbQuery, $data, $key = 'id', $where = [])
{ {
$db = is_string($dbQuery) ? $this->app->db->name($dbQuery) : $dbQuery; $db = is_string($dbQuery) ? $this->app->db->name($dbQuery) : $dbQuery;
list($table, $value) = [$db->getTable(), isset($data[$key]) ? $data[$key] : null]; [$table, $value] = [$db->getTable(), isset($data[$key]) ? $data[$key] : null];
$map = isset($where[$key]) ? [] : (is_string($value) ? [[$key, 'in', explode(',', $value)]] : [$key => $value]); $map = isset($where[$key]) ? [] : (is_string($value) ? [[$key, 'in', explode(',', $value)]] : [$key => $value]);
if (is_array($info = $this->app->db->table($table)->master()->where($where)->where($map)->find()) && !empty($info)) { if (is_array($info = $this->app->db->table($table)->master()->where($where)->where($map)->find()) && !empty($info)) {
if ($this->app->db->table($table)->strict(false)->where($where)->where($map)->update($data) !== false) { if ($this->app->db->table($table)->strict(false)->where($where)->where($map)->update($data) !== false) {
@ -115,9 +115,9 @@ class SystemService extends Service
private function parse($rule, $type = 'base') private function parse($rule, $type = 'base')
{ {
if (stripos($rule, '.') !== false) { if (stripos($rule, '.') !== false) {
list($type, $rule) = explode('.', $rule); [$type, $rule] = explode('.', $rule);
} }
list($field, $outer) = explode('|', "{$rule}|"); [$field, $outer] = explode('|', "{$rule}|");
return [$type, $field, strtolower($outer)]; return [$type, $field, strtolower($outer)];
} }
@ -207,7 +207,7 @@ class SystemService extends Service
if (is_null($state)) { if (is_null($state)) {
$this->app->debug($this->getRuntime('app_run') !== 'product'); $this->app->debug($this->getRuntime('app_run') !== 'product');
} else { } else {
$this->setRuntime($state ? 'product' : 'developoer'); $this->setRuntime([], $state ? 'product' : 'developoer');
$this->app->debug(empty($state)); $this->app->debug(empty($state));
} }
return !$this->app->isDebug(); return !$this->app->isDebug();
@ -215,25 +215,33 @@ class SystemService extends Service
/** /**
* 设置实时运行配置 * 设置实时运行配置
* @param string $run 支持模式 * @param array|null $map 应用映射
* @param array $map 应用映射 * @param string|null $run 支持模式
* @return boolean * @return boolean
*/ */
public function setRuntime($run = null, $map = []) public function setRuntime($map = [], $run = null)
{ {
$data = []; $data = $this->__Runtime();
if (file_exists($file = "{$this->app->getRootPath()}runtime/config.json")) { $file = "{$this->app->getRootPath()}runtime/config.json";
$data = json_decode(file_get_contents($file), true); $data['app_run'] = is_null($run) ? $data['app_run'] : $run;
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_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)); return file_put_contents($file, json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
} }
/**
* 读取原数据
* @return array
*/
private function __Runtime()
{
$file = "{$this->app->getRootPath()}runtime/config.json";
$data = file_exists($file) ? json_decode(file_get_contents($file), true) : [];
if (empty($data) || !is_array($data)) $data = [];
if (empty($data['app_map']) || !is_array($data['app_map'])) $data['app_map'] = [];
if (empty($data['app_run']) || !is_string($data['app_run'])) $data['app_run'] = 'developer';
return $data;
}
/** /**
* 获取实时运行配置 * 获取实时运行配置
* @param null|string $key * @param null|string $key
@ -241,13 +249,7 @@ class SystemService extends Service
*/ */
public function getRuntime($key = null) public function getRuntime($key = null)
{ {
$file = "{$this->app->getRootPath()}runtime/config.json"; $data = $this->__Runtime();
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); return is_null($key) ? $data : (isset($data[$key]) ? $data[$key] : null);
} }
@ -277,7 +279,7 @@ class SystemService extends Service
public function sysuri($url = '', array $vars = [], $suffix = false, $domain = false) public function sysuri($url = '', array $vars = [], $suffix = false, $domain = false)
{ {
$location = $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build(); $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'),]; [$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); return preg_replace(["|^/{$d1}/{$d2}/{$d3}(\.html)?$|i", "|/{$d2}/{$d3}(\.html)?$|i", "|/{$d3}(\.html)?$|i"], '', $location);
} }