diff --git a/app/wechat/view/news/formstyle.html b/app/wechat/view/news/formstyle.html index 5df426b3d..97d12eb33 100644 --- a/app/wechat/view/news/formstyle.html +++ b/app/wechat/view/news/formstyle.html @@ -25,7 +25,8 @@ } .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 { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index d7982cdcb..4476b1539 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -937,12 +937,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "528022c763c694f9c2bc3e0d4e6a2aaef5715f07" + "reference": "a4bd4d43c1d3c682eaba68cb289d6f6b7109cc65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/528022c763c694f9c2bc3e0d4e6a2aaef5715f07", - "reference": "528022c763c694f9c2bc3e0d4e6a2aaef5715f07", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a4bd4d43c1d3c682eaba68cb289d6f6b7109cc65", + "reference": "a4bd4d43c1d3c682eaba68cb289d6f6b7109cc65", "shasum": "", "mirrors": [ { @@ -959,7 +959,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-11-21T08:43:45+00:00", + "time": "2020-11-23T04:50:12+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index bb1f0d613..0d47b457e 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/QueueService.php b/vendor/zoujingli/think-library/src/service/QueueService.php index 4d9baf0b5..7ba86d872 100644 --- a/vendor/zoujingli/think-library/src/service/QueueService.php +++ b/vendor/zoujingli/think-library/src/service/QueueService.php @@ -100,15 +100,16 @@ class QueueService extends Service /** * 添加定时清理任务 + * @param integer $loops 循环时间 * @return $this - * @throws \think\admin\Exception + * @throws Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException * @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); } /** diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php index 7c151db7d..6c5a29e27 100644 --- a/vendor/zoujingli/think-library/src/service/SystemService.php +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -144,11 +144,10 @@ class SystemService extends Service */ public function sysuri(string $url = '', array $vars = [], $suffix = true, $domain = false): string { - $hm = $this->app->config->get('route.url_html_suffix', '.html'); - $d2 = Str::snake($this->app->config->get('route.default_controller')); - [$d1, $d3] = [$this->app->config->get('app.default_app'), $this->app->config->get('route.default_action')]; - $pattern = ["#^/{$d1}/{$d2}/{$d3}({$hm})?#i", "#^(/.*?)/{$d2}/{$d3}(^\w|\?|\.|$)#i", "#^(/.*?/.*?)/{$d3}(^\w|\?|\.|$)#i"]; - return preg_replace($pattern, ['', '$1$2', '$1$2'], $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build()); + [$hm, $bs] = [$this->app->config->get('route.url_html_suffix', 'html'), $this->app->route->buildUrl('@')->suffix(false)->domain($domain)->build()]; + [$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')]; + $pattern = ["#^({$bs}){$d1}/{$d2}/{$d3}(\.{$hm}|^\w|\?|$)?#i", "#^({$bs}[\w\.]+)/{$d2}/{$d3}(\.{$hm}|^\w|\?|$)#i", "#^({$bs}[\w\.]+)(/[\w\.]+)/{$d3}(\.{$hm}|^\w|$)#i"]; + return preg_replace($pattern, ['$1$2', '$1$2', '$1$2$3'], $this->app->route->buildUrl($url, $vars)->suffix($suffix)->domain($domain)->build()); } /**