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-11-23 12:58:14 +08:00
parent 1eff51022e
commit 8fd8d119c4
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/wechat/view/news/formstyle.html
View File

@ -25,7 +25,8 @@
} }
.news-left .news-item.active { .news-left .news-item.active {
border: 1px solid #44b549 !important border: 1px solid #44b549 !important;
box-shadow: 0 0 5px 0 #44b549;
} }
.news-left .article-add { .news-left .article-add {

8
vendor/composer/installed.json vendored
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": "528022c763c694f9c2bc3e0d4e6a2aaef5715f07" "reference": "a4bd4d43c1d3c682eaba68cb289d6f6b7109cc65"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/528022c763c694f9c2bc3e0d4e6a2aaef5715f07", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a4bd4d43c1d3c682eaba68cb289d6f6b7109cc65",
"reference": "528022c763c694f9c2bc3e0d4e6a2aaef5715f07", "reference": "a4bd4d43c1d3c682eaba68cb289d6f6b7109cc65",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -959,7 +959,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-11-21T08:43:45+00:00", "time": "2020-11-23T04:50:12+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-11-23 10:26:22 // This file is automatically generated at:2020-11-23 12:57:55
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/QueueService.php vendored
View File

@ -100,15 +100,16 @@ class QueueService extends Service
/** /**
* 添加定时清理任务 * 添加定时清理任务
* @param integer $loops 循环时间
* @return $this * @return $this
* @throws \think\admin\Exception * @throws Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException * @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
*/ */
public function addCleanQueue(): QueueService public function addCleanQueue($loops = 3600): QueueService
{ {
return $this->register('定时清理系统任务数据', "xadmin:queue clean", 0, [], 0, 3600); return $this->register('定时清理系统任务数据', "xadmin:queue clean", 0, [], 0, $loops);
} }
/** /**

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

@ -144,11 +144,10 @@ class SystemService extends Service
*/ */
public function sysuri(string $url = '', array $vars = [], $suffix = true, $domain = false): string public function sysuri(string $url = '', array $vars = [], $suffix = true, $domain = false): string
{ {
$hm = $this->app->config->get('route.url_html_suffix', '.html'); [$hm, $bs] = [$this->app->config->get('route.url_html_suffix', 'html'), $this->app->route->buildUrl('@')->suffix(false)->domain($domain)->build()];
$d2 = Str::snake($this->app->config->get('route.default_controller')); [$d1, $d2, $d3] = [$this->app->config->get('app.default_app'), Str::snake($this->app->config->get('route.default_controller')), $this->app->config->get('route.default_action')];
[$d1, $d3] = [$this->app->config->get('app.default_app'), $this->app->config->get('route.default_action')]; $pattern = ["#^({$bs}){$d1}/{$d2}/{$d3}(\.{$hm}|^\w|\?|$)?#i", "#^({$bs}[\w\.]+)/{$d2}/{$d3}(\.{$hm}|^\w|\?|$)#i", "#^({$bs}[\w\.]+)(/[\w\.]+)/{$d3}(\.{$hm}|^\w|$)#i"];
$pattern = ["#^/{$d1}/{$d2}/{$d3}({$hm})?#i", "#^(/.*?)/{$d2}/{$d3}(^\w|\?|\.|$)#i", "#^(/.*?/.*?)/{$d3}(^\w|\?|\.|$)#i"]; return preg_replace($pattern, ['$1$2', '$1$2', '$1$2$3'], $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build());
return preg_replace($pattern, ['', '$1$2', '$1$2'], $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build());
} }
/** /**