Skip to content

Commit e1450bb

Browse files
committed
feat: release 5.6.0
1 parent e699cf8 commit e1450bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+294
-1341
lines changed

app/Constant/AppConstant.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ class AppConstant
66
{
77
const APP = 'blog';
88
const APP_NAME = 'ModStartBlog';
9-
const VERSION = '5.5.0';
9+
const VERSION = '5.6.0';
1010
}

config/queue.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
'driver' => 'database',
4040
'table' => 'jobs',
4141
'queue' => 'default',
42-
'expire' => 60,
42+
'expire' => 3600,
4343
],
4444

4545
'beanstalkd' => [
@@ -70,7 +70,7 @@
7070
'driver' => 'redis',
7171
'connection' => 'default',
7272
'queue' => 'default',
73-
'expire' => 60,
73+
'expire' => 3600,
7474
],
7575

7676
],

module/Site/Admin/Controller/ConfigController.php

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,33 @@
44

55
use Illuminate\Routing\Controller;
66
use ModStart\Admin\Layout\AdminConfigBuilder;
7+
use ModStart\Form\Form;
78
use Module\Vendor\Provider\SiteTemplate\SiteTemplateProvider;
89

910
class ConfigController extends Controller
1011
{
1112
public function setting(AdminConfigBuilder $builder)
1213
{
13-
$builder->pageTitle('网站基础配置');
14-
$builder->image('siteLogo', '网站Logo');
15-
$builder->text('siteName', '网站名称');
16-
$builder->text('siteSlogan', '网站副标题');
17-
$builder->text('siteDomain', '网站域名');
18-
$builder->text('siteKeywords', '网站关键词');
19-
$builder->textarea('siteDescription', '网站描述');
20-
$builder->text('siteBeian', '备案编号');
21-
$builder->image('siteFavIco', '网站ICO');
22-
$builder->color('sitePrimaryColor', '网站主色调');
23-
$builder->select('siteTemplate', '网站模板')->options(SiteTemplateProvider::map());
14+
$builder->pageTitle('基础配置');
15+
$builder->layoutPanel('网站信息', function (Form $form) {
16+
$form->image('siteLogo', '网站Logo');
17+
$form->text('siteName', '网站名称');
18+
$form->text('siteSlogan', '网站副标题');
19+
$form->text('siteDomain', '网站域名');
20+
$form->text('siteKeywords', '网站关键词');
21+
$form->textarea('siteDescription', '网站描述');
22+
$form->image('siteFavIco', '网站ICO');
23+
});
24+
$builder->layoutPanel('模板主题', function (Form $form) {
25+
$form->color('sitePrimaryColor', '网站主色调');
26+
$form->select('siteTemplate', '网站模板')->options(SiteTemplateProvider::map());
27+
});
28+
$builder->layoutPanel('备案信息', function (Form $form) {
29+
$form->text('siteBeian', 'ICP备案编号');
30+
$form->text('siteBeianGonganText', '公安备案文字');
31+
$form->text('siteBeianGonganLink', '公安备案链接');
32+
});
33+
$builder->formClass('wide');
2434
return $builder->perform();
2535
}
2636

module/Site/Asset/image/gongan.png

18.8 KB
Loading

module/Site/Core/ModuleServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function boot(Dispatcher $events)
1818
'sort' => 400,
1919
'children' => [
2020
[
21-
'title' => '网站基础配置',
21+
'title' => '基础配置',
2222
'url' => '\Module\Site\Admin\Controller\ConfigController@setting',
2323
],
2424
]

module/Site/Docs/release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## 1.3.0
22

3+
- 新增:公安备案信息后台可配置
34
- 优化:调整后台菜单结构
45

56
---

module/Site/Docs/release/1.0.0.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

module/Site/Docs/release/1.1.0.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

module/Site/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"require": [
1212
"Vendor:>=1.5.0"
1313
],
14-
"version": "1.2.0",
14+
"version": "1.3.0",
1515
"modstartVersion": ">=2.6.0",
1616
"author": "ModStart",
1717
"description": "配置网站名称、关键词、描述、备案信息、主色调等配置",

module/Vendor/Docs/release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- 新增:内容审核提供者新增内容链接
66
- 新增:安装向导新增安全使用提醒
77
- 优化:内容自动审核链接逻辑处理
8+
- 优化:升级Laravel版本造成的安装路径检测异常
89

910
---
1011

0 commit comments

Comments
 (0)