From 98977f7fb7844997937ad4e592e93eab49adc504 Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 20 Aug 2020 17:49:20 +0800 Subject: [PATCH] ComposerUpdate --- app/admin/controller/Module.php | 1 + app/admin/view/module/change.html | 4 ++-- composer.lock | 8 ++++---- vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- .../zoujingli/think-library/src/service/AdminService.php | 1 - 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/admin/controller/Module.php b/app/admin/controller/Module.php index 0ab1f0829..b9db91b28 100644 --- a/app/admin/controller/Module.php +++ b/app/admin/controller/Module.php @@ -61,6 +61,7 @@ class Module extends Controller $this->module = $modules[$data['name']]; $this->current = $locals[$data['name']] ?? []; $pattern = "|^(\d{4})\.(\d{2})\.(\d{2})\.(\d+)$|"; + $this->module['change'] = array_reverse($this->module['change']); foreach ($this->module['change'] as $version => &$change) { $change = ['content' => $change, 'version' => preg_replace($pattern, '$1年$2月$3日 第 $4 次更新', $version)]; } diff --git a/app/admin/view/module/change.html b/app/admin/view/module/change.html index 9476e285e..048c6f3a4 100644 --- a/app/admin/view/module/change.html +++ b/app/admin/view/module/change.html @@ -15,9 +15,9 @@ {foreach $module.change as $version=>$change}
  • {if isset($current.version) and $current.version eq $version} - - {else} + {else} + {/if}

    diff --git a/composer.lock b/composer.lock index 4d33f5511..0b98be022 100644 --- a/composer.lock +++ b/composer.lock @@ -937,12 +937,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "dc2052ced8b4edf72914d4276ee35346f43af582" + "reference": "b236f9f14d4becb0f0dadf479ff2627490909af7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/dc2052ced8b4edf72914d4276ee35346f43af582", - "reference": "dc2052ced8b4edf72914d4276ee35346f43af582", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b236f9f14d4becb0f0dadf479ff2627490909af7", + "reference": "b236f9f14d4becb0f0dadf479ff2627490909af7", "shasum": "", "mirrors": [ { @@ -987,7 +987,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://thinkadmin.top", - "time": "2020-08-20T07:41:23+00:00" + "time": "2020-08-20T09:39:39+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 0ef09a4e5..5416e40c6 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -963,12 +963,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "dc2052ced8b4edf72914d4276ee35346f43af582" + "reference": "b236f9f14d4becb0f0dadf479ff2627490909af7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/dc2052ced8b4edf72914d4276ee35346f43af582", - "reference": "dc2052ced8b4edf72914d4276ee35346f43af582", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b236f9f14d4becb0f0dadf479ff2627490909af7", + "reference": "b236f9f14d4becb0f0dadf479ff2627490909af7", "shasum": "", "mirrors": [ { @@ -985,7 +985,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-08-20T07:41:23+00:00", + "time": "2020-08-20T09:39:39+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index a485eb01d..6c9ab89ec 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/service/AdminService.php b/vendor/zoujingli/think-library/src/service/AdminService.php index e08fed58d..66ec8758d 100644 --- a/vendor/zoujingli/think-library/src/service/AdminService.php +++ b/vendor/zoujingli/think-library/src/service/AdminService.php @@ -17,7 +17,6 @@ namespace think\admin\service; use think\admin\extend\DataExtend; use think\admin\Service; -use think\helper\Str; /** * 系统权限管理服务