Pārlūkot izejas kodu

用户列表新增是否审核字段显示

xusl 1 gadu atpakaļ
vecāks
revīzija
ea00149061

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

@@ -173,7 +173,7 @@ public class SysLogininforController {
      */
     @GetMapping(value = "/logininforTotal")
     @PreAuthorize("@ss.hasPermi('auditManager:logininforTotal:list')")
-    @OperateLog(title = "登录日志", businessType = BusinessType.QUERY, auditType = AuditType.SYS,operdesc = "查询统计登录日志")
+    @OperateLog(title = "登录日志统计", businessType = BusinessType.QUERY, auditType = AuditType.SYS,operdesc = "查询统计登录日志")
     @PreventReplay
     public ResponseVO logininforTotal(String startLoginTime, String endLoginTime) throws CustomException {
         try {

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

@@ -221,7 +221,7 @@ public class SysOperlogController {
      */
     @GetMapping(value = "/sysOperlogTotal")
     @PreAuthorize("@ss.hasPermi('auditManager:sysOperlogTotal:list')")
-    @OperateLog(title = "操作日志", businessType = BusinessType.QUERY, auditType = AuditType.SYS,operdesc = "查询统计操作日志")
+    @OperateLog(title = "操作日志统计", businessType = BusinessType.QUERY, auditType = AuditType.SYS,operdesc = "查询统计操作日志")
     @PreventReplay
     public ResponseVO sysOperlogTotal(String startLoginTime, String endLoginTime) throws CustomException {
         try {

+ 10 - 10
backend/src/main/java/com/jiayue/ssi/job/FileAnalysisJob.java

@@ -14,17 +14,17 @@ import org.springframework.stereotype.Service;
  * @version 3.0
  */
 @Slf4j
-@Service
-@EnableScheduling
+//@Service
+//@EnableScheduling
 public class FileAnalysisJob {
 
-    @Autowired
-    private FileAnalysisService fileAnalysisService;
+//    @Autowired
+//    private FileAnalysisService fileAnalysisService;
 
-    @Scheduled(cron = "0 0/1 * * * *")
-    public void fxglFileAnalysis() {
-        log.debug("文件解析定时任务执行开始");
-        fileAnalysisService.analysisJob();
-        log.debug("文件解析定时任务执行完成");
-    }
+//    @Scheduled(cron = "0 0/1 * * * *")
+//    public void fxglFileAnalysis() {
+//        log.debug("文件解析定时任务执行开始");
+//        fileAnalysisService.analysisJob();
+//        log.debug("文件解析定时任务执行完成");
+//    }
 }

+ 28 - 15
backend/src/test/java/com/jiayue/ssi/service/BcSm2Util.java

@@ -83,21 +83,34 @@ public class BcSm2Util {
 //        String sm3password = SmUtil.sm3("Xsl1234567890abcdefg").toUpperCase();
         // 再对密码sm2
 
-        String keystore = SM2CryptUtils.encrypt("s37d1gxm",SecretKeyConstants.SERVER_PUBLIC_KEY);
-        System.out.println("keystore:"+keystore);
-
-        System.out.println("==========mysql配置==========");
-        String sm2dbusername = SM2CryptUtils.encrypt("root",SecretKeyConstants.SERVER_PUBLIC_KEY);
-        System.out.println("数据库用户名:"+sm2dbusername);
-        String sm2dbpwd = SM2CryptUtils.encrypt("!QAZ2root",SecretKeyConstants.SERVER_PUBLIC_KEY);
-        System.out.println("数据库密码:"+sm2dbpwd);
-
-        System.out.println("==========mail配置==========");
-        String mailUserName = SM2CryptUtils.encrypt("xushilong@jiayuepowertech.com",SecretKeyConstants.SERVER_PUBLIC_KEY);
-        System.out.println("mailUserName:"+mailUserName);
-        String mailPassWord = SM2CryptUtils.encrypt("jiayue123456",SecretKeyConstants.SERVER_PUBLIC_KEY);
-        System.out.println("mailPassWord:"+mailPassWord);
-
+//        String keystore = SM2CryptUtils.encrypt("s37d1gxm",SecretKeyConstants.SERVER_PUBLIC_KEY);
+//        System.out.println("keystore:"+keystore);
+//
+//        System.out.println("==========mysql配置==========");
+//        String sm2dbusername = SM2CryptUtils.encrypt("root",SecretKeyConstants.SERVER_PUBLIC_KEY);
+//        System.out.println("数据库用户名:"+sm2dbusername);
+//        String sm2dbpwd = SM2CryptUtils.encrypt("!QAZ2root",SecretKeyConstants.SERVER_PUBLIC_KEY);
+//        System.out.println("数据库密码:"+sm2dbpwd);
+//
+//        System.out.println("==========mail配置==========");
+//        String mailUserName = SM2CryptUtils.encrypt("xushilong@jiayuepowertech.com",SecretKeyConstants.SERVER_PUBLIC_KEY);
+//        System.out.println("mailUserName:"+mailUserName);
+//        String mailPassWord = SM2CryptUtils.encrypt("jiayue123456",SecretKeyConstants.SERVER_PUBLIC_KEY);
+//        System.out.println("mailPassWord:"+mailPassWord);
 
+        String mailPassWord1 = SM2CryptUtils.encrypt("系统管理员(内置)",SecretKeyConstants.SERVER_PUBLIC_KEY);
+        System.out.println("mailPassWord1:"+mailPassWord1);
+        String mailPassWord2 = SM2CryptUtils.encrypt("审计管理员(内置)",SecretKeyConstants.SERVER_PUBLIC_KEY);
+        System.out.println("mailPassWord2:"+mailPassWord2);
+        String mailPassWord3 = SM2CryptUtils.encrypt("审核管理员(内置)",SecretKeyConstants.SERVER_PUBLIC_KEY);
+        System.out.println("mailPassWord3:"+mailPassWord3);
+        String mailPassWord4 = SM2CryptUtils.encrypt("业务审计员",SecretKeyConstants.SERVER_PUBLIC_KEY);
+        System.out.println("mailPassWord4:"+mailPassWord4);
+        String mailPassWord5 = SM2CryptUtils.encrypt("业务管理员",SecretKeyConstants.SERVER_PUBLIC_KEY);
+        System.out.println("mailPassWord5:"+mailPassWord5);
+        String mailPassWord6 = SM2CryptUtils.encrypt("业务操作员",SecretKeyConstants.SERVER_PUBLIC_KEY);
+        System.out.println("mailPassWord6:"+mailPassWord6);
+        String mailPassWord7 = SM2CryptUtils.encrypt("业务配置员",SecretKeyConstants.SERVER_PUBLIC_KEY);
+        System.out.println("mailPassWord7:"+mailPassWord7);
     }
 }

+ 9 - 0
ui/src/views/sysManager/userManager/index.vue

@@ -123,6 +123,7 @@
             <vxe-table-column field="phonenumber" title="手机号码"/>
             <vxe-table-column field="status" title="用户状态" :formatter="statusFormat"/>
             <vxe-table-column field="usertype" title="用户类型" :formatter="typeFormat"/>
+            <vxe-table-column field="signstr" title="是否审核" :formatter="sfsh"/>
             <vxe-table-column field="expDate" title="账号截止日期"/>
             <vxe-table-column title="操作" width="320">
               <template slot-scope="scope">
@@ -538,6 +539,14 @@ export default {
       return belongTo
     },
     // 列表状态格式化
+    sfsh({cellValue}) {
+      let belongTo = '否'
+      if (cellValue == "1") {
+        belongTo = "是"
+      }
+      return belongTo
+    },
+    // 列表状态格式化
     typeFormat({cellValue}) {
       let belongTo = '未知的类型'
       for (let i = 0; i < this.typeOptions.length; i++) {