Browse Source

动态邮箱口令改成6位复杂密码,根据配置设定

xusl 1 year ago
parent
commit
0a30dca3ad

+ 1 - 1
backend/src/main/java/com/jiayue/ssi/controller/SysUserController.java

@@ -387,7 +387,7 @@ public class SysUserController {
 
         SysPolicy sysPolicy = sysPolicyService.getOne(new QueryWrapper<>());
         // 生成8位初始密码
-        String randomPwd = RandomRulePwd.createPwd(sysPolicy.getPasswordRule());
+        String randomPwd = RandomRulePwd.createPwd(sysPolicy.getPasswordRule(),8);
         log.info("用户名:"+sysUser.getUsername()+" 初始/重置密码:"+randomPwd);
         // 加密密码
         String sm3password = SmUtil.sm3(randomPwd).toUpperCase();

+ 7 - 1
backend/src/main/java/com/jiayue/ssi/controller/UserLoginController.java

@@ -1,11 +1,14 @@
 package com.jiayue.ssi.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jiayue.ssi.config.SendMailUtil;
 import com.jiayue.ssi.constant.CacheConstants;
 import com.jiayue.ssi.constant.CustomException;
 import com.jiayue.ssi.entity.SysMenu;
+import com.jiayue.ssi.entity.SysPolicy;
 import com.jiayue.ssi.entity.SysUser;
 import com.jiayue.ssi.service.SysMenuService;
+import com.jiayue.ssi.service.SysPolicyService;
 import com.jiayue.ssi.service.SysUserService;
 import com.jiayue.ssi.util.*;
 import com.wf.captcha.SpecCaptcha;
@@ -39,6 +42,8 @@ public class UserLoginController {
     SendMailUtil sendMailUtil;
     @Autowired
     SysMenuService sysMenuService;
+    @Autowired
+    SysPolicyService sysPolicyService;
 
     /**
      * 生成验证码
@@ -119,7 +124,8 @@ public class UserLoginController {
             SysUser sysUser = sysUserService.queryUserName(username);
             if (sysUser != null) {
                 // 生成6位邮箱口令
-                String mailRandom = RandomUtil.mailRandom();
+                SysPolicy sysPolicy = sysPolicyService.getOne(new QueryWrapper<>());
+                String mailRandom = RandomRulePwd.createPwd(sysPolicy.getPasswordRule(),6);
                 // uuid存入缓存,失效时间4分钟
                 LocalCache.set(mailKey, mailRandom, 60000 * 4);
                 log.info("动态口令后台输出======> 用户名:"+username+"  动态口令:"+mailRandom+"  ");

+ 2 - 3
backend/src/main/java/com/jiayue/ssi/util/RandomRulePwd.java

@@ -14,10 +14,9 @@ public class RandomRulePwd {
     private static final String lowerStr="abcdefghijklmnopqrstuvwxyz";
     private static final String numStr="1234567890";
     private static final String specialStr="!@#$%^&*()_-+=<>?/";
-    // 生成密码长度
-    private static int strLength=8;
 
-    public static String createPwd(String rule){
+
+    public static String createPwd(String rule,int strLength){
         String randomString="";
         if ("A,B,C".equals(rule)){
             while (!(StrUtil.containsAny(randomString,upperStr.split("")) && StrUtil.containsAny(randomString,lowerStr.split("")) && StrUtil.containsAny(randomString,numStr.split("")))){

+ 2 - 11
backend/src/main/resources/application.yml

@@ -6,14 +6,10 @@ server:
     key-store-password: ENC(6daOBtvpihAkIU2Kh8iRK3KqYgI4E0/s)
     enabled-protocols: "TLSv1.2"
     ciphers: "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
-    #ciphers: "ECDHE-ECDSA-AES128-GCM-SHA256,ECDHE-RSA-AES128-GCM-SHA256,ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-GCM-SHA384,ECDHE-ECDSA-CHACHA20-POLY1305,ECDHE-RSA-CHACHA20-POLY1305,DHE-RSA-AES128-GCM-SHA256,DHE-RSA-AES256-GCM-SHA384"
-
 
 logging:
   config: classpath:logback-ssi.xml
 
-bfhhs: 7
-
 #设置提供的服务名
 spring:
   application:
@@ -59,16 +55,11 @@ spring:
 mybatis-plus:
   typeAliasesPackage: com.jiayue.ssi.entity
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   mapper-locations: classpath:mapper/system/*.xml
   global-config:
     db-column-underline: true
     logic-delete-field: del_flag
     logic-delete-value: 1
     logic-not-delete-value: 0
-# 服务端密钥
-# 客户端公钥:MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEz9IxRa8TDtsQABm/zl1VCFGVjyklybVfoVKupC759hevR7R9R8sS4flOFJbk8z++Pp/YSb9aHNDMR+S6SpuAXg==
-# 自己私钥:MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgm/zcWRJO89xIxOT1PtowqYZHQFBhik3pccpEY1y1+UmgCgYIKoEcz1UBgi2hRANCAAQdHjJPTUumQK2kkouvR7m9J61iACpPA5c7eLqFB1g85j12X90YAcF6ma30bXXarlULzEPhLTWBbEDIk8wgWy6T
-# 客户端密钥
-# 服务端公钥:MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAEHR4yT01LpkCtpJKLr0e5vSetYgAqTwOXO3i6hQdYPOY9dl/dGAHBepmt9G112q5VC8xD4S01gWxAyJPMIFsukw==
-# 自己私钥:MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgHFgMNlizvBSLrq0DBio/cGEy1WwKj5Y8CmZUnTSdr8OgCgYIKoEcz1UBgi2hRANCAATP0jFFrxMO2xAAGb/OXVUIUZWPKSXJtV+hUq6kLvn2F69HtH1HyxLh+U4UluTzP74+n9hJv1oc0MxH5LpKm4Be

+ 9 - 1
ui/src/views/sysManager/sysPolicy/index.vue

@@ -18,6 +18,9 @@
           <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>
@@ -100,6 +103,7 @@ export default {
         inactiveLogout: '',
         auditLog: '',
         memoryWarn: '',
+        bfhhs: '',
         logSpaceWarn:'',
         excNoticeWayA: '0',
         excNoticeWayB: '0',
@@ -136,7 +140,11 @@ export default {
         logSpaceWarn: [
           { required: true, message: "日志存储低于阈值告警不能为空", trigger: "blur" },
           { pattern: /^(?:[2-8]\d|90)$/, message: "请输入20-90整数", trigger: "blur"}
-        ]
+        ],
+        bfhhs: [
+          { required: true, message: "并发会话数不能为空", trigger: "blur" },
+          { pattern: /^([1-9]|10)$/, message: "请输入1-10整数", trigger: "blur"}
+        ],
       },
     }
   },