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-08-24 13:26:46 +08:00
parent 391f78e1fe
commit c25d007246
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -937,12 +937,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "f0c49e28928af221123c15022dc352423439dbc1" "reference": "5caa2ceb15d1a311ee1cfc7cc7a4ec12a7ee540c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/f0c49e28928af221123c15022dc352423439dbc1", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/5caa2ceb15d1a311ee1cfc7cc7a4ec12a7ee540c",
"reference": "f0c49e28928af221123c15022dc352423439dbc1", "reference": "5caa2ceb15d1a311ee1cfc7cc7a4ec12a7ee540c",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -987,7 +987,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://thinkadmin.top", "homepage": "http://thinkadmin.top",
"time": "2020-08-24T05:13:21+00:00" "time": "2020-08-24T05:23:03+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",

8
vendor/composer/installed.json vendored
View File

@ -963,12 +963,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "f0c49e28928af221123c15022dc352423439dbc1" "reference": "5caa2ceb15d1a311ee1cfc7cc7a4ec12a7ee540c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/f0c49e28928af221123c15022dc352423439dbc1", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/5caa2ceb15d1a311ee1cfc7cc7a4ec12a7ee540c",
"reference": "f0c49e28928af221123c15022dc352423439dbc1", "reference": "5caa2ceb15d1a311ee1cfc7cc7a4ec12a7ee540c",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -985,7 +985,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-08-24T05:13:21+00:00", "time": "2020-08-24T05:23:03+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-08-24 13:16:26 // This file is automatically generated at:2020-08-24 13:26:32
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\admin\\Library', 0 => 'think\\admin\\Library',

7
vendor/zoujingli/think-library/src/service/ModuleService.php vendored
View File

@ -148,9 +148,8 @@ class ModuleService extends Service
foreach ($service->getModules() as $name) { foreach ($service->getModules() as $name) {
$vars = $this->_getModuleVersion($name); $vars = $this->_getModuleVersion($name);
if (is_array($vars) && isset($vars['version']) && preg_match('|^\d{4}\.\d{2}\.\d{2}\.\d{2}$|', $vars['version'])) { if (is_array($vars) && isset($vars['version']) && preg_match('|^\d{4}\.\d{2}\.\d{2}\.\d{2}$|', $vars['version'])) {
$data[$name] = $vars; $data[$name] = array_merge($vars, ['change' => []]);
$data[$name]['change'] = []; foreach ($service->scanDirectory($this->app->getBasePath() . $name . '/module/change/', [], 'md') as $file) {
foreach ($service->scanDirectory($this->app->getBasePath() . $name . '/module/change/', [], '.md') as $file) {
$data[$name]['change'][pathinfo($file, PATHINFO_FILENAME)] = Parsedown::instance()->parse(file_get_contents($file)); $data[$name]['change'][pathinfo($file, PATHINFO_FILENAME)] = Parsedown::instance()->parse(file_get_contents($file));
} }
} }
@ -199,7 +198,7 @@ class ModuleService extends Service
private function _getModuleVersion($name) private function _getModuleVersion($name)
{ {
$appdir = $this->app->getBasePath() . $name; $appdir = $this->app->getBasePath() . $name;
$filename = $appdir . DIRECTORY_SEPARATOR . 'module' . DIRECTORY_SEPARATOR . 'version.json'; $filename = $appdir . DIRECTORY_SEPARATOR . 'module' . DIRECTORY_SEPARATOR . 'module.json';
if (file_exists($filename) && is_file($filename) && is_readable($filename)) { if (file_exists($filename) && is_file($filename) && is_readable($filename)) {
$vars = json_decode(file_get_contents($filename), true); $vars = json_decode(file_get_contents($filename), true);
return isset($vars['name']) && isset($vars['version']) ? $vars : null; return isset($vars['name']) && isset($vars['version']) ? $vars : null;

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

@ -141,13 +141,13 @@ class NodeService extends Service
* @param string $ext 文件后缀 * @param string $ext 文件后缀
* @return array * @return array
*/ */
public function scanDirectory($path, $data = [], $ext = '.php') public function scanDirectory($path, $data = [], $ext = 'php')
{ {
foreach (scandir($path) as $item) if ($item[0] !== '.') { foreach (scandir($path) as $item) if ($item[0] !== '.') {
$realpath = rtrim($path, '\\/') . DIRECTORY_SEPARATOR . $item; $realpath = rtrim($path, '\\/') . DIRECTORY_SEPARATOR . $item;
if (is_readable($realpath)) if (is_dir($realpath)) { if (is_readable($realpath)) if (is_dir($realpath)) {
$data = $this->scanDirectory($realpath, $data, $ext); $data = $this->scanDirectory($realpath, $data, $ext);
} elseif (is_file($realpath) && (is_null($ext) || strstr($realpath, '.') === $ext)) { } elseif (is_file($realpath) && (is_null($ext) || pathinfo($realpath, 4) === $ext)) {
$data[] = $realpath; $data[] = $realpath;
} }
} }