From 9f1713acdc3365c53a189cee803bd38d79676118 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Wed, 11 Aug 2021 09:36:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=AE=BE=E7=BD=AE=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=81=E8=AE=B8=E8=AE=B0=E4=BD=8F=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/index/index.go   | 19 +++++++++++++------
 .../default/settings/security/index.go        | 14 +++++++++-----
 web/views/@default/index/index.html           |  4 ++--
 .../@default/settings/security/index.html     |  7 +++++++
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/internal/web/actions/default/index/index.go b/internal/web/actions/default/index/index.go
index 909e22ba..e36ca17d 100644
--- a/internal/web/actions/default/index/index.go
+++ b/internal/web/actions/default/index/index.go
@@ -56,19 +56,26 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["token"] = stringutil.Md5(TokenSalt+timestamp) + timestamp
 	this.Data["from"] = params.From
 
-	config, err := configloaders.LoadAdminUIConfig()
+	uiConfig, err := configloaders.LoadAdminUIConfig()
 	if err != nil {
 		this.ErrorPage(err)
 		return
 	}
-	this.Data["systemName"] = config.AdminSystemName
-	this.Data["showVersion"] = config.ShowVersion
-	if len(config.Version) > 0 {
-		this.Data["version"] = config.Version
+	this.Data["systemName"] = uiConfig.AdminSystemName
+	this.Data["showVersion"] = uiConfig.ShowVersion
+	if len(uiConfig.Version) > 0 {
+		this.Data["version"] = uiConfig.Version
 	} else {
 		this.Data["version"] = teaconst.Version
 	}
-	this.Data["faviconFileId"] = config.FaviconFileId
+	this.Data["faviconFileId"] = uiConfig.FaviconFileId
+
+	securityConfig, err := configloaders.LoadSecurityConfig()
+	if err != nil {
+		this.Data["rememberLogin"] = false
+	} else {
+		this.Data["rememberLogin"] = securityConfig.AllowRememberLogin
+	}
 
 	this.Show()
 }
diff --git a/internal/web/actions/default/settings/security/index.go b/internal/web/actions/default/settings/security/index.go
index 20cec226..d972d7ac 100644
--- a/internal/web/actions/default/settings/security/index.go
+++ b/internal/web/actions/default/settings/security/index.go
@@ -69,11 +69,12 @@ func (this *IndexAction) RunGet(params struct{}) {
 }
 
 func (this *IndexAction) RunPost(params struct {
-	Frame           string
-	CountryIdsJSON  []byte
-	ProvinceIdsJSON []byte
-	AllowLocal      bool
-	AllowIPs        []string
+	Frame              string
+	CountryIdsJSON     []byte
+	ProvinceIdsJSON    []byte
+	AllowLocal         bool
+	AllowIPs           []string
+	AllowRememberLogin bool
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -127,6 +128,9 @@ func (this *IndexAction) RunPost(params struct {
 	// 允许本地
 	config.AllowLocal = params.AllowLocal
 
+	// 允许记住登录
+	config.AllowRememberLogin = params.AllowRememberLogin
+
 	err = configloaders.UpdateSecurityConfig(config)
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/web/views/@default/index/index.html b/web/views/@default/index/index.html
index 77dc5885..e73d8f66 100644
--- a/web/views/@default/index/index.html
+++ b/web/views/@default/index/index.html
@@ -47,10 +47,10 @@
                         <input type="text" name="otpCode" placeholder="请输入OTP动态密码" maxlength="6"/>
                     </div>
                 </div>
-				<div class="ui field">
+				<div class="ui field" v-if="rememberLogin">
 					<a href="" @click.prevent="showMoreOptions()">更多选项 <i class="icon angle" :class="{down:!moreOptionsVisible, up:moreOptionsVisible}"></i> </a>
 				</div>
-				<div class="ui field" v-show="moreOptionsVisible">
+				<div class="ui field" v-if="rememberLogin" v-show="moreOptionsVisible">
 					<div class="ui checkbox">
 						<input type="checkbox" name="remember" value="1" checked="checked"/>
 						<label>在这个电脑上记住登录（14天）</label>
diff --git a/web/views/@default/settings/security/index.html b/web/views/@default/settings/security/index.html
index ed9459c9..ecf4f597 100644
--- a/web/views/@default/settings/security/index.html
+++ b/web/views/@default/settings/security/index.html
@@ -43,6 +43,13 @@
 				<p class="comment">选中表示允许在本机和局域网访问。</p>
 			</td>
 		</tr>
+        <tr>
+            <td>允许记住登录</td>
+            <td>
+                <checkbox name="allowRememberLogin" v-model="config.allowRememberLogin"></checkbox>
+                <p class="comment">选中表示允许在登录界面可以选择记住登录。</p>
+            </td>
+        </tr>
 	</table>
 	<submit-btn></submit-btn>
 </form>
\ No newline at end of file