From 5f5ab3fbcae50fb265c626d99dcaee9c6f18a085 Mon Sep 17 00:00:00 2001
From: lanrenwo <lanrenwo@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:26:06 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8B=E7=BA=BF?=
 =?UTF-8?q?=E5=90=8E,=20=E9=87=8A=E6=94=BEIpAuditPool?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/sessdata/session.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/sessdata/session.go b/server/sessdata/session.go
index 90af092..a2d80a0 100644
--- a/server/sessdata/session.go
+++ b/server/sessdata/session.go
@@ -240,6 +240,7 @@ func (cs *ConnSession) Close() {
 		defer cs.Sess.mux.Unlock()
 
 		close(cs.CloseChan)
+		cs.IpAuditPool.Release()
 		cs.Sess.IsActive = false
 		cs.Sess.LastLogin = time.Now()
 		cs.Sess.CSess = nil

From 86ee88a20c266c080f736ba23647853c4d7e4dfb Mon Sep 17 00:00:00 2001
From: lanrenwo <lanrenwo@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:33:40 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E6=98=BE=E7=A4=BA=E5=AE=A1=E8=AE=A1?=
 =?UTF-8?q?=E5=8E=BB=E9=87=8D=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/admin/api_other.go   | 2 ++
 server/dbdata/setting.go    | 5 +++--
 web/src/pages/set/Other.vue | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/server/admin/api_other.go b/server/admin/api_other.go
index 557b27a..d9d24d8 100644
--- a/server/admin/api_other.go
+++ b/server/admin/api_other.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"regexp"
 
+	"github.com/bjdgyc/anylink/base"
 	"github.com/bjdgyc/anylink/dbdata"
 )
 
@@ -82,6 +83,7 @@ func SetOtherAuditLog(w http.ResponseWriter, r *http.Request) {
 		RespError(w, RespInternalErr, err)
 		return
 	}
+	data.AuditInterval = base.Cfg.AuditInterval
 	RespSucess(w, data)
 }
 
diff --git a/server/dbdata/setting.go b/server/dbdata/setting.go
index 964cb72..970822a 100644
--- a/server/dbdata/setting.go
+++ b/server/dbdata/setting.go
@@ -21,8 +21,9 @@ type SettingSmtp struct {
 }
 
 type SettingAuditLog struct {
-	LifeDay   int    `json:"life_day"`
-	ClearTime string `json:"clear_time"`
+	AuditInterval int    `json:"audit_interval"`
+	LifeDay       int    `json:"life_day"`
+	ClearTime     string `json:"clear_time"`
 }
 
 type SettingOther struct {
diff --git a/web/src/pages/set/Other.vue b/web/src/pages/set/Other.vue
index 43f96fa..98fd074 100644
--- a/web/src/pages/set/Other.vue
+++ b/web/src/pages/set/Other.vue
@@ -34,6 +34,10 @@
 
       <el-tab-pane label="审计日志" name="dataAuditLog">
         <el-form :model="dataAuditLog" ref="dataAuditLog" :rules="rules" label-width="100px" class="tab-one">
+          <el-form-item label="审计去重间隔" prop="audit_interval">
+                <el-input-number v-model="dataAuditLog.audit_interval" :min="-1" size="small" label="秒" :disabled="true"></el-input-number>  秒
+                <p class="input_tip">如需开启审计日志功能，请修改配置文件中的 audit_interval 参数并重启服务, <strong style="color:#EA3323;">-1 代表关闭</strong></p>
+          </el-form-item>            
           <el-form-item label="存储时长" prop="life_day">
                 <el-input-number v-model="dataAuditLog.life_day" :min="0" :max="365" size="small" label="天数"></el-input-number>  天
                 <p class="input_tip">范围: 0 ~ 365天 , <strong style="color:#EA3323;">0 代表永久保存</strong></p>
@@ -253,7 +257,7 @@ export default {
 
 <style scoped>
 .tab-one {
-  width: 600px;
+  width: 700px;
 }
 
 .input_tip {

From 7de9d9f16dc4e1a8b98d1c5d420c2a86ba6076c3 Mon Sep 17 00:00:00 2001
From: lanrenwo <lanrenwo@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:46:11 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8B=E7=BA=BF?=
 =?UTF-8?q?=E5=90=8E,=20=E9=87=8A=E6=94=BEIpAuditPool?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/sessdata/session.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/sessdata/session.go b/server/sessdata/session.go
index a2d80a0..176f155 100644
--- a/server/sessdata/session.go
+++ b/server/sessdata/session.go
@@ -240,11 +240,14 @@ func (cs *ConnSession) Close() {
 		defer cs.Sess.mux.Unlock()
 
 		close(cs.CloseChan)
-		cs.IpAuditPool.Release()
 		cs.Sess.IsActive = false
 		cs.Sess.LastLogin = time.Now()
 		cs.Sess.CSess = nil
 
+		if base.Cfg.AuditInterval >= 0 {
+			cs.IpAuditPool.Release()
+		}
+
 		dSess := cs.GetDtlsSession()
 		if dSess != nil {
 			dSess.Close()

From 9f40bb40ef18d72684b1cc97dab31a03106a342f Mon Sep 17 00:00:00 2001
From: lanrenwo <lanrenwo@users.noreply.github.com>
Date: Wed, 26 Oct 2022 09:54:40 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E8=AE=A1?=
 =?UTF-8?q?=E5=8E=BB=E9=87=8D=E9=97=B4=E9=9A=94=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/pages/set/Other.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/pages/set/Other.vue b/web/src/pages/set/Other.vue
index 98fd074..e1f9cb7 100644
--- a/web/src/pages/set/Other.vue
+++ b/web/src/pages/set/Other.vue
@@ -36,7 +36,7 @@
         <el-form :model="dataAuditLog" ref="dataAuditLog" :rules="rules" label-width="100px" class="tab-one">
           <el-form-item label="审计去重间隔" prop="audit_interval">
                 <el-input-number v-model="dataAuditLog.audit_interval" :min="-1" size="small" label="秒" :disabled="true"></el-input-number>  秒
-                <p class="input_tip">如需开启审计日志功能，请修改配置文件中的 audit_interval 参数并重启服务, <strong style="color:#EA3323;">-1 代表关闭</strong></p>
+                <p class="input_tip">请手动修改配置文件中的 audit_interval 参数后，再重启服务, <strong style="color:#EA3323;">-1 代表关闭审计日志</strong></p>
           </el-form-item>            
           <el-form-item label="存储时长" prop="life_day">
                 <el-input-number v-model="dataAuditLog.life_day" :min="0" :max="365" size="small" label="天数"></el-input-number>  天

From 6fdc0e54d54adb709e197f343e3b7d4b5c2ee7e6 Mon Sep 17 00:00:00 2001
From: lanrenwo <lanrenwo@users.noreply.github.com>
Date: Wed, 26 Oct 2022 14:29:46 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=8A=E6=94=BEIpAudit?=
 =?UTF-8?q?Pool=E7=9A=84=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/sessdata/session.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/sessdata/session.go b/server/sessdata/session.go
index 176f155..56d3ffc 100644
--- a/server/sessdata/session.go
+++ b/server/sessdata/session.go
@@ -244,7 +244,7 @@ func (cs *ConnSession) Close() {
 		cs.Sess.LastLogin = time.Now()
 		cs.Sess.CSess = nil
 
-		if base.Cfg.AuditInterval >= 0 {
+		if cs.IpAuditPool != nil {
 			cs.IpAuditPool.Release()
 		}