Browse Source

审计日志保留月数 由最少三个月改为最少6个月

王鸿臣 1 year ago
parent
commit
63270ccdc8

+ 8 - 6
backend/src/main/java/com/jiayue/ssi/controller/SysPolicyController.java

@@ -9,7 +9,9 @@ import com.jiayue.ssi.backenum.BusinessType;
 import com.jiayue.ssi.constant.CustomException;
 import com.jiayue.ssi.constant.CustomException;
 import com.jiayue.ssi.entity.SysPolicy;
 import com.jiayue.ssi.entity.SysPolicy;
 import com.jiayue.ssi.service.SysPolicyService;
 import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.ssi.util.IdUtils;
+import com.jiayue.ssi.util.LocalCache;
+import com.jiayue.ssi.util.ResponseVO;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,9 +72,9 @@ public class SysPolicyController {
                 return ResponseVO.fail("并发会话数请输入1-10整数");
                 return ResponseVO.fail("并发会话数请输入1-10整数");
             }
             }
 
 
-            if (StringUtils.isEmpty(sysPolicy.getPasswordRule())){
+            if (StringUtils.isEmpty(sysPolicy.getPasswordRule())) {
                 return ResponseVO.fail("密码规则不能为空!");
                 return ResponseVO.fail("密码规则不能为空!");
-            } else if (sysPolicy.getPasswordRule().split(",").length<3) {
+            } else if (sysPolicy.getPasswordRule().split(",").length < 3) {
                 return ResponseVO.fail("密码规则至少需要3种以上的组合!");
                 return ResponseVO.fail("密码规则至少需要3种以上的组合!");
             }
             }
 
 
@@ -102,8 +104,8 @@ public class SysPolicyController {
 
 
             if (sysPolicy.getAuditLog() == null) {
             if (sysPolicy.getAuditLog() == null) {
                 return ResponseVO.fail("审计日志保留月数不能为空!");
                 return ResponseVO.fail("审计日志保留月数不能为空!");
-            } else if (!String.valueOf(sysPolicy.getAuditLog()).matches("^([3-9]|(1[0-2]))$")) {
-                return ResponseVO.fail("审计日志保留月数请输入3-12整数");
+            } else if (!String.valueOf(sysPolicy.getAuditLog()).matches("^([6-9]|(1[0-2]))$")) {
+                return ResponseVO.fail("审计日志保留月数请输入6-12整数");
             }
             }
 
 
             if (sysPolicy.getScanAccount() == null) {
             if (sysPolicy.getScanAccount() == null) {
@@ -151,7 +153,7 @@ public class SysPolicyController {
     public ResponseVO getLicenseKey() throws CustomException {
     public ResponseVO getLicenseKey() throws CustomException {
         try {
         try {
             Map<String, String> map = new HashMap<>();
             Map<String, String> map = new HashMap<>();
-            map.put("sysTime", System.currentTimeMillis()+"");
+            map.put("sysTime", System.currentTimeMillis() + "");
             // 生成随机授权码
             // 生成随机授权码
             String lk = IdUtils.fastSimpleUUID();
             String lk = IdUtils.fastSimpleUUID();
             map.put("lk", lk);
             map.put("lk", lk);

+ 98 - 98
ui/src/views/sysManager/sysPolicy/index.vue

@@ -1,79 +1,80 @@
 <template>
 <template>
   <div class="app-container">
   <div class="app-container">
-        <el-form :model="form" ref="form" :rules="rules" size="small"  label-width="250px">
-          <el-form-item label="登录失败次数限制" prop="loginFails">
-            <el-input v-model="form.loginFails" style="width: 240px"></el-input>
-          </el-form-item>
-          <el-form-item label="登录失败锁定时长(至少20分钟)" prop="loginLock">
-            <el-input v-model="form.loginLock" style="width: 240px"></el-input>
-          </el-form-item>
-          <el-form-item label="密码规则设置">
-            <el-checkbox-group v-model="form.passwordRule">
-              <el-checkbox v-for="(item,index) in passwordRuleList" :key="index" :label="item.value" >{{item.label}}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-form-item label="账号未使用的月数设置" prop="scanAccount">
-            <el-input v-model="form.scanAccount" style="width: 240px"></el-input>
-          </el-form-item>
-          <el-form-item label="非活动状态登出系统(设定分钟数)" prop="inactiveLogout">
-            <el-input v-model="form.inactiveLogout" style="width: 240px"></el-input>
-          </el-form-item>
-          <el-form-item label="并发会话数(1-10个)" prop="bfhhs">
-            <el-input v-model="form.bfhhs" style="width: 240px"></el-input>
-          </el-form-item>
-          <el-form-item label="审计日志保留月数" prop="auditLog">
-            <el-input v-model="form.auditLog" style="width: 240px"></el-input>
-          </el-form-item>
-          <el-form-item label="内存低于阈值告警(%)" prop="memoryWarn">
-            <el-input v-model="form.memoryWarn" style="width: 240px"></el-input>
-          </el-form-item>
-          <el-form-item label="日志存储低于阈值告警(%)" prop="logSpaceWarn">
-            <el-input v-model="form.logSpaceWarn" style="width: 240px"></el-input>
-          </el-form-item>
-          <el-form-item label="A级别异常通知方式" prop="excNoticeWayA">
-            <el-select style="width: 240px" v-model="form.excNoticeWayA" placeholder="请选择通知方式">
-              <el-option
-                v-for="item in excNoticeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="B级别异常通知方式" prop="excNoticeWayB">
-            <el-select style="width: 240px" v-model="form.excNoticeWayB" placeholder="请选择通知方式">
-              <el-option
-                v-for="item in excNoticeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="连续登录失败异常级别" prop="excLevelLogin">
-            <el-select style="width: 240px" v-model="form.excLevelLogin" placeholder="请选择异常级别">
-              <el-option
-                v-for="item in excLevelOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="同一用户多点登录异常级别" prop="excLevelSameUser">
-            <el-select style="width: 240px" v-model="form.excLevelSameUser" placeholder="请选择异常级别">
-              <el-option
-                v-for="item in excLevelOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="onSubmit">保存</el-button>
-          </el-form-item>
-        </el-form>
+    <el-form ref="form" :model="form" :rules="rules" label-width="250px" size="small">
+      <el-form-item label="登录失败次数限制" prop="loginFails">
+        <el-input v-model="form.loginFails" style="width: 240px"></el-input>
+      </el-form-item>
+      <el-form-item label="登录失败锁定时长(至少20分钟)" prop="loginLock">
+        <el-input v-model="form.loginLock" style="width: 240px"></el-input>
+      </el-form-item>
+      <el-form-item label="密码规则设置">
+        <el-checkbox-group v-model="form.passwordRule">
+          <el-checkbox v-for="(item,index) in passwordRuleList" :key="index" :label="item.value">{{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="账号未使用的月数设置" prop="scanAccount">
+        <el-input v-model="form.scanAccount" style="width: 240px"></el-input>
+      </el-form-item>
+      <el-form-item label="非活动状态登出系统(设定分钟数)" prop="inactiveLogout">
+        <el-input v-model="form.inactiveLogout" style="width: 240px"></el-input>
+      </el-form-item>
+      <el-form-item label="并发会话数(1-10个)" prop="bfhhs">
+        <el-input v-model="form.bfhhs" style="width: 240px"></el-input>
+      </el-form-item>
+      <el-form-item label="审计日志保留月数" prop="auditLog">
+        <el-input v-model="form.auditLog" style="width: 240px"></el-input>
+      </el-form-item>
+      <el-form-item label="内存低于阈值告警(%)" prop="memoryWarn">
+        <el-input v-model="form.memoryWarn" style="width: 240px"></el-input>
+      </el-form-item>
+      <el-form-item label="日志存储低于阈值告警(%)" prop="logSpaceWarn">
+        <el-input v-model="form.logSpaceWarn" style="width: 240px"></el-input>
+      </el-form-item>
+      <el-form-item label="A级别异常通知方式" prop="excNoticeWayA">
+        <el-select v-model="form.excNoticeWayA" placeholder="请选择通知方式" style="width: 240px">
+          <el-option
+            v-for="item in excNoticeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="B级别异常通知方式" prop="excNoticeWayB">
+        <el-select v-model="form.excNoticeWayB" placeholder="请选择通知方式" style="width: 240px">
+          <el-option
+            v-for="item in excNoticeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="连续登录失败异常级别" prop="excLevelLogin">
+        <el-select v-model="form.excLevelLogin" placeholder="请选择异常级别" style="width: 240px">
+          <el-option
+            v-for="item in excLevelOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="同一用户多点登录异常级别" prop="excLevelSameUser">
+        <el-select v-model="form.excLevelSameUser" placeholder="请选择异常级别" style="width: 240px">
+          <el-option
+            v-for="item in excLevelOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">保存</el-button>
+      </el-form-item>
+    </el-form>
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
@@ -104,7 +105,7 @@ export default {
         auditLog: '',
         auditLog: '',
         memoryWarn: '',
         memoryWarn: '',
         bfhhs: '',
         bfhhs: '',
-        logSpaceWarn:'',
+        logSpaceWarn: '',
         excNoticeWayA: '0',
         excNoticeWayA: '0',
         excNoticeWayB: '0',
         excNoticeWayB: '0',
         excLevelLogin: "0",
         excLevelLogin: "0",
@@ -114,36 +115,36 @@ export default {
       // 表单校验
       // 表单校验
       rules: {
       rules: {
         loginFails: [
         loginFails: [
-          { required: true, message: "登录失败次数限制不能为空", trigger: "blur" },
-          { pattern: /^([1-9]|10)$/, message: "请输入1-10整数", trigger: "blur"}
+          {required: true, message: "登录失败次数限制不能为空", trigger: "blur"},
+          {pattern: /^([1-9]|10)$/, message: "请输入1-10整数", trigger: "blur"}
         ],
         ],
         scanAccount: [
         scanAccount: [
-          { required: true, message: "扫描未使用的账号不能为空", trigger: "blur" },
-          { pattern: /^([1-3])$/, message: "请输入1-3整数", trigger: "blur"}
+          {required: true, message: "扫描未使用的账号不能为空", trigger: "blur"},
+          {pattern: /^([1-3])$/, message: "请输入1-3整数", trigger: "blur"}
         ],
         ],
         loginLock: [
         loginLock: [
-          { required: true, message: "登录失败锁定时长不能为空", trigger: "blur" },
-          { pattern: /^(?:[2-9]\d|100)$/, message: "请输入20-100整数", trigger: "blur"}
+          {required: true, message: "登录失败锁定时长不能为空", trigger: "blur"},
+          {pattern: /^(?:[2-9]\d|100)$/, message: "请输入20-100整数", trigger: "blur"}
         ],
         ],
         inactiveLogout: [
         inactiveLogout: [
-          { required: true, message: "非活动状态登出系统不能为空", trigger: "blur" },
-          { pattern: /^([1-9]|[1-2]\d|30)$/, message: "请输入1-30整数", trigger: "blur"}
+          {required: true, message: "非活动状态登出系统不能为空", trigger: "blur"},
+          {pattern: /^([1-9]|[1-2]\d|30)$/, message: "请输入1-30整数", trigger: "blur"}
         ],
         ],
         auditLog: [
         auditLog: [
-          { required: true, message: "审计日志保留月数不能为空", trigger: "blur" },
-          { pattern: /^([3-9]|(1[0-2]))$/, message: "请输入3-12整数", trigger: "blur"}
+          {required: true, message: "审计日志保留月数不能为空", trigger: "blur"},
+          {pattern: /^([6-9]|(1[0-2]))$/, message: "请输入6-12整数", trigger: "blur"}
         ],
         ],
         memoryWarn: [
         memoryWarn: [
-          { required: true, message: "内存低于阈值告警不能为空", trigger: "blur" },
-          { pattern: /^(?:[2-8]\d|90)$/, message: "请输入20-90整数", trigger: "blur"}
+          {required: true, message: "内存低于阈值告警不能为空", trigger: "blur"},
+          {pattern: /^(?:[2-8]\d|90)$/, message: "请输入20-90整数", trigger: "blur"}
         ],
         ],
         logSpaceWarn: [
         logSpaceWarn: [
-          { required: true, message: "日志存储低于阈值告警不能为空", trigger: "blur" },
-          { pattern: /^(?:[2-8]\d|90)$/, message: "请输入20-90整数", trigger: "blur"}
+          {required: true, message: "日志存储低于阈值告警不能为空", trigger: "blur"},
+          {pattern: /^(?:[2-8]\d|90)$/, message: "请输入20-90整数", trigger: "blur"}
         ],
         ],
         bfhhs: [
         bfhhs: [
-          { required: true, message: "并发会话数不能为空", trigger: "blur" },
-          { pattern: /^([1-9]|10)$/, message: "请输入1-10整数", trigger: "blur"}
+          {required: true, message: "并发会话数不能为空", trigger: "blur"},
+          {pattern: /^([1-9]|10)$/, message: "请输入1-10整数", trigger: "blur"}
         ],
         ],
       },
       },
     }
     }
@@ -153,7 +154,7 @@ export default {
   },
   },
   methods: {
   methods: {
     /** 查询用户列表 */
     /** 查询用户列表 */
-    async getList(){
+    async getList() {
       let sysTime
       let sysTime
       let lk
       let lk
       await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
       await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
@@ -165,21 +166,20 @@ export default {
         sysTime: sysTime,
         sysTime: sysTime,
         lk: lk
         lk: lk
       }
       }
-      await this.$axios.get('/sysPolicyController/getAll',{params: searchParams}).then((res) => {
+      await this.$axios.get('/sysPolicyController/getAll', {params: searchParams}).then((res) => {
         this.form = res.data
         this.form = res.data
         this.form.passwordRule = res.data.passwordRule.split(',')
         this.form.passwordRule = res.data.passwordRule.split(',')
       }).catch((error) => {
       }).catch((error) => {
         // this.$message.error(error)
         // this.$message.error(error)
       })
       })
     },
     },
-    onSubmit:debounce(async function(){
+    onSubmit: debounce(async function () {
       this.$refs["form"].validate(async valid => {
       this.$refs["form"].validate(async valid => {
         if (valid) {
         if (valid) {
-          if (this.form.passwordRule.length<3){
+          if (this.form.passwordRule.length < 3) {
             this.$message.warning('密码规则至少需要3种以上的组合!')
             this.$message.warning('密码规则至少需要3种以上的组合!')
             return
             return
-          }
-          else{
+          } else {
             this.form.passwordRule = this.form.passwordRule.join(",")
             this.form.passwordRule = this.form.passwordRule.join(",")
           }
           }
 
 
@@ -209,7 +209,7 @@ export default {
           })
           })
         }
         }
       });
       });
-    },1000)
+    }, 1000)
   }
   }
 }
 }
 </script>
 </script>