diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 8e62e51f2..c8a1271c0 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -38,7 +38,7 @@ class SystemController extends AbstractController
* @apiParam {String} type
* - get: 获取（默认）
* - all: 获取所有（需要管理员权限）
- * - save: 保存设置（参数：['reg', 'reg_identity', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'anon_message', 'auto_archived', 'archived_day', 'task_visible', 'all_group_mute', 'all_group_autoin', 'image_compress', 'image_save_local', 'start_home']）
+ * - save: 保存设置（参数：['reg', 'reg_identity', 'reg_invite', 'login_code', 'password_policy', 'project_invite', 'chat_information', 'anon_message', 'auto_archived', 'archived_day', 'all_group_mute', 'all_group_autoin', 'image_compress', 'image_save_local', 'start_home', 'home_footer']）
* @apiSuccess {Number} ret 返回状态码（1正确、0错误）
* @apiSuccess {String} msg 返回信息（错误描述）
@@ -65,12 +65,12 @@ class SystemController extends AbstractController
'anon_message',
'auto_archived',
'archived_day',
- 'task_visible',
'all_group_mute',
'all_group_autoin',
'image_compress',
'image_save_local',
'start_home',
+ 'home_footer'
])) {
unset($all[$key]);
}
@@ -104,7 +104,6 @@ class SystemController extends AbstractController
$setting['anon_message'] = $setting['anon_message'] ?: 'open';
$setting['auto_archived'] = $setting['auto_archived'] ?: 'close';
$setting['archived_day'] = floatval($setting['archived_day']) ?: 7;
- $setting['task_visible'] = $setting['task_visible'] ?: 'close';
$setting['all_group_mute'] = $setting['all_group_mute'] ?: 'open';
$setting['all_group_autoin'] = $setting['all_group_autoin'] ?: 'yes';
$setting['image_compress'] = $setting['image_compress'] ?: 'open';
@@ -881,6 +880,55 @@ class SystemController extends AbstractController
return $data;
}
+ /**
+ * @api {get} api/system/get/updatelog 19. 获取更新日志
+ *
+ * @apiDescription 获取更新日志
+ * @apiVersion 1.0.0
+ * @apiGroup system
+ * @apiName get__updatelog
+ *
+ * @apiSuccess {Number} ret 返回状态码（1正确、0错误）
+ * @apiSuccess {String} msg 返回信息（错误描述）
+ * @apiSuccess {Object} data 返回数据
+ */
+ public function get__updatelog()
+ {
+ $logPath = base_path('CHANGELOG.md');
+ $logContent = "";
+ $logVersion = "";
+ if (file_exists($logPath)) {
+ $logContent = file_get_contents($logPath);
+ preg_match("/## \[(.*?)\]/", $logContent, $matchs);
+ if ($matchs) {
+ $logVersion = $matchs[1] === "Unreleased" ? $matchs[1] : "v{$matchs[1]}";
+ }
+ }
+ return Base::retSuccess('success', [
+ 'updateLog' => $logContent ?: false,
+ ]);
+ }
+
+ /**
+ * @api {get} api/system/get/starthome 20. 启动首页设置信息
+ *
+ * @apiDescription 用于判断注册是否需要启动首页
+ * @apiVersion 1.0.0
+ * @apiGroup system
+ * @apiName get__starthome
+ *
+ * @apiSuccess {Number} ret 返回状态码（1正确、0错误）
+ * @apiSuccess {String} msg 返回信息（错误描述）
+ * @apiSuccess {Object} data 返回数据
+ */
+ public function get__starthome()
+ {
+ return Base::retSuccess('success', [
+ 'need_start' => Base::settingFind('system', 'start_home') == 'open',
+ 'home_footer' => Base::settingFind('system', 'home_footer')
+ ]);
+ }
+
/**
* @api {get} api/system/email/check 21. 邮件发送测试（限管理员）
*
diff --git a/public/site/css/help.css b/public/site/css/help.css
index c1f6d6b24..fb85f031d 100644
--- a/public/site/css/help.css
+++ b/public/site/css/help.css
@@ -22,7 +22,7 @@
}
.help-l {
- display: none;
+ display: block;
padding: 24px;
background: var(--bg-fa-color);
border-radius: 8px;
@@ -187,3 +187,12 @@
.filings {
border-top: 1px solid var(--border-color);
}
+.help-fiexd{
+ position: sticky;
+ top: 80px;
+}
+.help-a{
+ display: block;
+ width: 100%;
+ height: 100%;
+}
diff --git a/public/site/css/log.css b/public/site/css/log.css
index 893e7b572..9e12fd01a 100644
--- a/public/site/css/log.css
+++ b/public/site/css/log.css
@@ -15,7 +15,7 @@
.logs-layout{
display: flex;
align-items: flex-start;
- height: 929px;
+ /* height: 929px; */
}
.logs-l{
padding: 24px;
@@ -56,8 +56,8 @@
.logs-r{
border-left: 1px solid var(--border-color);
padding-left: 32px;
- height: 929px;
- overflow-y:scroll;
+ /* height: 929px; */
+ /* overflow-y:scroll; */
}
.logs-r::-webkit-scrollbar{
width: 0 !important
@@ -133,7 +133,11 @@
border-top: 1px solid var(--border-color);
}
.log-a{
- display: block;
- width: 100%;
- height: 100%;
+ display: block;
+ width: 100%;
+ height: 100%;
+}
+.logs-sticky{
+ position: sticky;
+ top: 80px;
}
diff --git a/public/site/css/product.css b/public/site/css/product.css
index 544fa9899..0048474bf 100644
--- a/public/site/css/product.css
+++ b/public/site/css/product.css
@@ -39,7 +39,7 @@
.prooduct-list .prooduct-list-item.top{
max-width: 180px;
}
-.prooduct-list .prooduct-list-item:nth-of-type(5),.prooduct-list .prooduct-list-item:nth-of-type(9){
+.prooduct-list .prooduct-list-item:nth-of-type(6),.prooduct-list .prooduct-list-item:nth-of-type(10){
margin-right: 0 !important;
}
.prooduct-list .prooduct-list-item.bot{
diff --git a/public/site/en/about.html b/public/site/en/about.html
index 928907119..8abb70aa7 100644
--- a/public/site/en/about.html
+++ b/public/site/en/about.html
@@ -202,7 +202,7 @@
diff --git a/public/site/en/download.html b/public/site/en/download.html
index 59a882716..565f6376c 100644
--- a/public/site/en/download.html
+++ b/public/site/en/download.html
@@ -75,7 +75,7 @@
-
+
@@ -119,12 +119,12 @@
macOS
@@ -132,7 +132,7 @@
Windows
-
+
Download
@@ -212,7 +212,7 @@
@@ -318,6 +318,9 @@
+