Bläddra i källkod

调整审计详情

xusl 1 år sedan
förälder
incheckning
b47a7f9c8b

+ 3 - 3
backend/src/main/java/com/jiayue/ssi/aspectj/OperateLogAspect.java

@@ -181,9 +181,9 @@ public class OperateLogAspect {
             setRequestValue(joinPoint, operLog, log.excludeParamNames());
         }
         // 是否需要保存response,参数和值
-        if (log.isSaveResponseData() && RyStringUtils.isNotNull(jsonResult)) {
-            operLog.setJsonResult(RyStringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000));
-        }
+//        if (log.isSaveResponseData() && RyStringUtils.isNotNull(jsonResult)) {
+//            operLog.setJsonResult(RyStringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000));
+//        }
     }
 
     /**

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

@@ -229,7 +229,11 @@ public class SysPolicyController {
 
             // 通知系统管理员
             if ("0".equals(noticeWay)){
-                log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+username+"】越权访问"+openUrl);
+                log.info("发送邮箱越权访问告警\r\n" +
+                        "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                        "\r\n  账号:"+username+"越权访问"+openUrl+" \r\n"     +
+                        "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
+//                log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+username+"】越权访问"+openUrl);
             }
             else if ("1".equals(noticeWay)){
                 // 告警先不用了,系统里只用一种邮箱告警

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

@@ -419,7 +419,11 @@ public class SysUserController {
         SysPolicy sysPolicy = sysPolicyService.getOne(new QueryWrapper<>());
         // 生成8位初始密码
         String randomPwd = RandomRulePwd.createPwd(sysPolicy.getPasswordRule(),8);
-        log.info("发送邮箱重置密码后台输出======> 用户名:"+sysUser.getUsername()+" 初始/重置密码:"+randomPwd);
+        log.info("发送邮箱初始/重置密码\r\n" +
+                "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                "\r\n  账号:"+sysUser.getUsername()+"  初始/重置密码:"+randomPwd+" \r\n"     +
+                "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
+//        log.info("发送邮箱重置密码后台输出======> 用户名:"+sysUser.getUsername()+" 初始/重置密码:"+randomPwd);
         // SM3加密密码
         String sm3password = SmUtil.sm3(randomPwd).toUpperCase();
         // 再对密码sm2

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

@@ -131,7 +131,10 @@ public class UserLoginController {
                 String mailRandom = RandomRulePwd.createPwd(sysPolicy.getPasswordRule(),6);
                 // uuid存入缓存,失效时间4分钟
                 LocalCache.set(mailKey, mailRandom, 60000 * 4);
-                log.info("发送邮箱动态口令后台输出======> 用户名:"+username+"  动态口令:"+mailRandom+"  ");
+                log.info("发送邮箱动态口令\r\n" +
+                  "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                 "\r\n  用户名:"+username+"  动态口令:"+mailRandom+"  \r\n"     +
+                  "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
                 try {
 //                    String[] mailArray = {AesUtils.decryptStr(sysUser.getMailbox())};
 //                    sendMailUtil.executeSendMail(mailArray, "邮箱验证码", "口令:" + mailRandom + ",有效期4分钟。");

+ 10 - 10
backend/src/main/java/com/jiayue/ssi/entity/SysOperLog.java

@@ -71,7 +71,7 @@ public class SysOperLog extends BaseEntity {
     private String operParam;
 
     /** 返回参数 */
-    private String jsonResult;
+//    private String jsonResult;
 
     /** 操作状态(0正常 1异常) */
     private Integer status;
@@ -216,15 +216,15 @@ public class SysOperLog extends BaseEntity {
         this.operParam = operParam;
     }
 
-    public String getJsonResult()
-    {
-        return jsonResult;
-    }
-
-    public void setJsonResult(String jsonResult)
-    {
-        this.jsonResult = jsonResult;
-    }
+//    public String getJsonResult()
+//    {
+//        return jsonResult;
+//    }
+//
+//    public void setJsonResult(String jsonResult)
+//    {
+//        this.jsonResult = jsonResult;
+//    }
 
     public Integer getStatus()
     {

+ 9 - 2
backend/src/main/java/com/jiayue/ssi/filter/InterfaceLimitFilter.java

@@ -64,7 +64,11 @@ public class InterfaceLimitFilter extends OncePerRequestFilter {
                 // 当前时间
                 Date currentDate = new Date();
                 if (currentDate.after(startDate) && currentDate.before(endDate)){
-                    log.info("发送邮箱通知系统管理员后台输出======> "+"IP【"+remoteIp+"】异常访问");
+                    log.info("发送邮箱IP异常访问\r\n" +
+                            "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                            "\r\n  IP:"+remoteIp+"异常访问系统 \r\n"     +
+                            "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
+//                    log.info("发送邮箱通知系统管理员后台输出======> "+"IP【"+remoteIp+"】异常访问");
                     response.setHeader("Access-Control-Allow-Origin", "*");
                     response.setStatus(410);
                     response.setContentType("text/html;charset=utf-8");
@@ -73,7 +77,10 @@ public class InterfaceLimitFilter extends OncePerRequestFilter {
                 }
             }
             else{
-                log.info("发送邮箱通知系统管理员后台输出======> "+"IP【"+remoteIp+"】异常访问");
+                log.info("发送邮箱IP异常访问\r\n" +
+                        "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                        "\r\n  IP:"+remoteIp+"异常访问系统 \r\n"     +
+                        "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
                 response.setHeader("Access-Control-Allow-Origin", "*");
                 response.setStatus(410);
                 response.setContentType("text/html;charset=utf-8");

+ 5 - 1
backend/src/main/java/com/jiayue/ssi/handler/CustomAuthenticationFailureHandler.java

@@ -102,7 +102,11 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
 
                     // 通知系统管理员
                     if ("0".equals(noticeWay)){
-                        log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+user.getUsername()+"】登录失败"+errCount+"次,锁定账号!");
+                        log.info("发送邮箱登录失败\r\n" +
+                                "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                                "\r\n  账号:"+user.getUsername()+"  登录失败:"+errCount+"次,锁定账号! \r\n"     +
+                                "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
+//                        log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+user.getUsername()+"】登录失败"+errCount+"次,锁定账号!");
 //                        List<SysUser> sysUserList = sysUserService.selectUserByRole("1");
 //                        if (sysUserList.size()>0){
 //                            String[] mailArray = new String[sysUserList.size()];

+ 10 - 2
backend/src/main/java/com/jiayue/ssi/handler/CustomAuthenticationSuccessHandler.java

@@ -121,7 +121,11 @@ public class CustomAuthenticationSuccessHandler extends SavedRequestAwareAuthent
 
             // 通知系统管理员
             if ("0".equals(noticeWay)){
-                log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+sysUser.getUsername()+"】多点登录","本次登录时间:"+DateUtils.getTime()+",登录IP:"+IPUtils.getIpAddr(request));
+                log.info("发送邮箱多点登录\r\n" +
+                        "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                        "\r\n  账号:"+sysUser.getUsername()+"多点登录","本次登录时间:"+DateUtils.getTime()+",登录IP:"+IPUtils.getIpAddr(request)+" \r\n"     +
+                        "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
+//                log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+sysUser.getUsername()+"】多点登录","本次登录时间:"+DateUtils.getTime()+",登录IP:"+IPUtils.getIpAddr(request));
 //                List<SysUser> sysUserList = sysUserService.selectUserByRole("1");
 //                if (sysUserList.size()>0){
 ////                    String[] mailArray = new String[sysUserList.size()];
@@ -140,7 +144,11 @@ public class CustomAuthenticationSuccessHandler extends SavedRequestAwareAuthent
 //                }
             }
             else if ("1".equals(noticeWay)){
-                log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+sysUser.getUsername()+"】多点登录","本次登录时间:"+DateUtils.getTime()+",登录IP:"+IPUtils.getIpAddr(request));
+                log.info("发送邮箱多点登录\r\n" +
+                        "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                        "\r\n  账号:"+sysUser.getUsername()+"多点登录","本次登录时间:"+DateUtils.getTime()+",登录IP:"+IPUtils.getIpAddr(request)+" \r\n"     +
+                        "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
+//                log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+sysUser.getUsername()+"】多点登录","本次登录时间:"+DateUtils.getTime()+",登录IP:"+IPUtils.getIpAddr(request));
             }
 
             // 封装被下线的对象退出信息

+ 6 - 1
backend/src/main/java/com/jiayue/ssi/handler/RestAccessDeniedHandler.java

@@ -14,6 +14,7 @@ import com.jiayue.ssi.entity.SysPolicy;
 import com.jiayue.ssi.entity.SysUser;
 import com.jiayue.ssi.factory.OperateLogFactory;
 import com.jiayue.ssi.service.SysPolicyService;
+import com.jiayue.ssi.util.DateUtils;
 import com.jiayue.ssi.util.IPUtils;
 import com.jiayue.ssi.util.JwtTokenUtil;
 import com.jiayue.ssi.util.ServletUtils;
@@ -81,7 +82,11 @@ public class RestAccessDeniedHandler implements AccessDeniedHandler {
 
         // 通知系统管理员
         if ("0".equals(noticeWay)){
-            log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+username+"】越权访问"+org.apache.commons.lang3.StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
+            log.info("发送邮箱越权访问\r\n" +
+                    "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                    "\r\n  账号:"+username+"  越权访问:"+ org.apache.commons.lang3.StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)+" \r\n"     +
+                    "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
+//            log.info("发送邮箱通知系统管理员后台输出======> "+"账号【"+username+"】越权访问"+org.apache.commons.lang3.StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
 //                        List<SysUser> sysUserList = sysUserService.selectUserByRole("1");
 //                        if (sysUserList.size()>0){
 //                            String[] mailArray = new String[sysUserList.size()];

+ 5 - 1
backend/src/main/java/com/jiayue/ssi/job/AuditBakPathCapCheck.java

@@ -42,7 +42,11 @@ public class AuditBakPathCapCheck {
 //        log.debug("审查日志备份路径大小:{} ,转换后大小:{} GB",size,getSizeToGb(size));
 
         if(Convert.toFloat((Convert.toFloat(sysPolicy.getAuditLogBakCapAlarm(),0f) - Convert.toFloat(getSizeToGb(size),0f)))< logSpaceWarnCap){
-            log.info("发送邮箱通知系统管理员后台输出======> 审计日志存储剩余容量低于额定容量"+sysPolicy.getLogSpaceWarn()+"%,邮箱告警!");
+            log.info("发送邮箱日志存储告警\r\n" +
+                    "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                    "\r\n  审计日志存储剩余容量低于额定容量"+sysPolicy.getLogSpaceWarn()+"%,邮箱告警! \r\n"     +
+                    "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
+//            log.info("发送邮箱通知系统管理员后台输出======> 审计日志存储剩余容量低于额定容量"+sysPolicy.getLogSpaceWarn()+"%,邮箱告警!");
         }else{
 //            log.info("检测审计日志备份目录大小正常。");
         }

+ 22 - 22
backend/src/main/java/com/jiayue/ssi/job/AutoAuditBak.java

@@ -205,17 +205,17 @@ public class AutoAuditBak {
             listName[11] = "operIp";
             listName[12] = "operLocation";
             listName[13] = "operParam";
-            listName[14] = "jsonResult";
-            listName[15] = "status";
-            listName[16] = "errorMsg";
-            listName[17] = "operTime";
-            listName[18] = "costTime";
-            listName[19] = "delFlag";
-            listName[20] = "createBy";
-            listName[21] = "createTime";
-            listName[22] = "updateBy";
-            listName[23] = "updateTime";
-            listName[24] = "remark";
+//            listName[14] = "jsonResult";
+            listName[14] = "status";
+            listName[15] = "errorMsg";
+            listName[16] = "operTime";
+            listName[17] = "costTime";
+            listName[18] = "delFlag";
+            listName[19] = "createBy";
+            listName[20] = "createTime";
+            listName[21] = "updateBy";
+            listName[22] = "updateTime";
+            listName[23] = "remark";
             //获取String[]类型的数据至result中
             List<String> result = new ArrayList<>();
             String listNameStr = "";
@@ -247,17 +247,17 @@ public class AutoAuditBak {
                 listValue[11] = String.valueOf(sysOperLog.getOperIp());
                 listValue[12] = String.valueOf(sysOperLog.getOperLocation());
                 listValue[13] = String.valueOf(sysOperLog.getOperParam());
-                listValue[14] = String.valueOf(sysOperLog.getJsonResult());
-                listValue[15] = String.valueOf(sysOperLog.getStatus());
-                listValue[16] = String.valueOf(sysOperLog.getErrorMsg());
-                listValue[17] = String.valueOf(DateUtil.format(sysOperLog.getOperTime(),"yyyy-MM-dd HH:mm:ss"));
-                listValue[18] = String.valueOf(sysOperLog.getCostTime());
-                listValue[19] = String.valueOf(sysOperLog.getDelFlag());
-                listValue[20] = String.valueOf(sysOperLog.getCreateBy());
-                listValue[21] = String.valueOf(DateUtil.format(sysOperLog.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
-                listValue[22] = String.valueOf(sysOperLog.getUpdateBy());
-                listValue[23] = String.valueOf(DateUtil.format(sysOperLog.getUpdateTime(),"yyyy-MM-dd HH:mm:ss"));
-                listValue[24] = String.valueOf(sysOperLog.getRemark());
+//                listValue[14] = String.valueOf(sysOperLog.getJsonResult());
+                listValue[14] = String.valueOf(sysOperLog.getStatus());
+                listValue[15] = String.valueOf(sysOperLog.getErrorMsg());
+                listValue[16] = String.valueOf(DateUtil.format(sysOperLog.getOperTime(),"yyyy-MM-dd HH:mm:ss"));
+                listValue[17] = String.valueOf(sysOperLog.getCostTime());
+                listValue[18] = String.valueOf(sysOperLog.getDelFlag());
+                listValue[19] = String.valueOf(sysOperLog.getCreateBy());
+                listValue[20] = String.valueOf(DateUtil.format(sysOperLog.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
+                listValue[21] = String.valueOf(sysOperLog.getUpdateBy());
+                listValue[22] = String.valueOf(DateUtil.format(sysOperLog.getUpdateTime(),"yyyy-MM-dd HH:mm:ss"));
+                listValue[23] = String.valueOf(sysOperLog.getRemark());
 
                 String listValueStr = "";
                 for (int k=0;k<listValue.length;k++){

+ 5 - 1
backend/src/main/java/com/jiayue/ssi/job/AutoScanMemory.java

@@ -49,7 +49,11 @@ public class AutoScanMemory {
 //                sysAlarm.setReadSign("0");
 //                // 低于策略设定值则告警
 //                sysAlarmService.save(sysAlarm);
-                log.info("发送邮箱通知系统管理员后台输出======> "+"系统剩余内存低于总内存"+memoryWarn + "%,邮箱告警!");
+                log.info("发送邮箱内存过低告警\r\n" +
+                        "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓邮箱内容↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"+
+                        "\r\n  系统剩余内存低于总内存"+memoryWarn+"%,邮箱告警! \r\n"     +
+                        "↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑邮箱内容↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑");
+//                log.info("发送邮箱通知系统管理员后台输出======> "+"系统剩余内存低于总内存"+memoryWarn + "%,邮箱告警!");
             }
         }
         catch (Exception e){

+ 3 - 3
backend/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="operIp"         column="oper_ip"        />
 		<result property="operLocation"   column="oper_location"  />
 		<result property="operParam"      column="oper_param"     />
-		<result property="jsonResult"     column="json_result"    />
+<!--		<result property="jsonResult"     column="json_result"    />-->
 		<result property="status"         column="status"         />
 		<result property="errorMsg"       column="error_msg"      />
 		<result property="operTime"       column="oper_time"      />
@@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
 	<insert id="insertOperlog" parameterType="SysOperLog">
-		insert into sys_oper_log(title, business_type,audit_type ,method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, json_result, status, error_msg, cost_time, oper_time,create_by,create_time,del_flag,operdesc)
-        values (#{title}, #{businessType}, #{auditType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, #{costTime}, sysdate(),#{createBy},sysdate(),0,#{operdesc})
+		insert into sys_oper_log(title, business_type,audit_type ,method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_location, oper_param, status, error_msg, cost_time, oper_time,create_by,create_time,del_flag,operdesc)
+        values (#{title}, #{businessType}, #{auditType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operLocation}, #{operParam}, #{status}, #{errorMsg}, #{costTime}, sysdate(),#{createBy},sysdate(),0,#{operdesc})
 	</insert>
 
 	<select id="selectOperLogList" parameterType="SysOperLog" resultMap="SysOperLogResult">

+ 23 - 23
backend/src/test/java/com/jiayue/ssi/job/AutoAuditBakTest.java

@@ -270,17 +270,17 @@ public class AutoAuditBakTest extends BaseTest {
             listName[11] = "operIp";
             listName[12] = "operLocation";
             listName[13] = "operParam";
-            listName[14] = "jsonResult";
-            listName[15] = "status";
-            listName[16] = "errorMsg";
-            listName[17] = "operTime";
-            listName[18] = "costTime";
-            listName[19] = "delFlag";
-            listName[20] = "createBy";
-            listName[21] = "createTime";
-            listName[22] = "updateBy";
-            listName[23] = "updateTime";
-            listName[24] = "remark";
+//            listName[14] = "jsonResult";
+            listName[14] = "status";
+            listName[15] = "errorMsg";
+            listName[16] = "operTime";
+            listName[17] = "costTime";
+            listName[18] = "delFlag";
+            listName[19] = "createBy";
+            listName[20] = "createTime";
+            listName[21] = "updateBy";
+            listName[22] = "updateTime";
+            listName[23] = "remark";
             //获取String[]类型的数据至result中
             List<String> result = new ArrayList<>();
             String listNameStr = "";
@@ -312,17 +312,17 @@ public class AutoAuditBakTest extends BaseTest {
                 listValue[11] = String.valueOf(sysOperLog.getOperIp());
                 listValue[12] = String.valueOf(sysOperLog.getOperLocation());
                 listValue[13] = String.valueOf(sysOperLog.getOperParam());
-                listValue[14] = String.valueOf(sysOperLog.getJsonResult());
-                listValue[15] = String.valueOf(sysOperLog.getStatus());
-                listValue[16] = String.valueOf(sysOperLog.getErrorMsg());
-                listValue[17] = String.valueOf(DateUtil.format(sysOperLog.getOperTime(),"yyyy-MM-dd HH:mm:ss"));
-                listValue[18] = String.valueOf(sysOperLog.getCostTime());
-                listValue[19] = String.valueOf(sysOperLog.getDelFlag());
-                listValue[20] = String.valueOf(sysOperLog.getCreateBy());
-                listValue[21] = String.valueOf(DateUtil.format(sysOperLog.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
-                listValue[22] = String.valueOf(sysOperLog.getUpdateBy());
-                listValue[23] = String.valueOf(DateUtil.format(sysOperLog.getUpdateTime(),"yyyy-MM-dd HH:mm:ss"));
-                listValue[24] = String.valueOf(sysOperLog.getRemark());
+//                listValue[14] = String.valueOf(sysOperLog.getJsonResult());
+                listValue[14] = String.valueOf(sysOperLog.getStatus());
+                listValue[15] = String.valueOf(sysOperLog.getErrorMsg());
+                listValue[16] = String.valueOf(DateUtil.format(sysOperLog.getOperTime(),"yyyy-MM-dd HH:mm:ss"));
+                listValue[17] = String.valueOf(sysOperLog.getCostTime());
+                listValue[18] = String.valueOf(sysOperLog.getDelFlag());
+                listValue[19] = String.valueOf(sysOperLog.getCreateBy());
+                listValue[20] = String.valueOf(DateUtil.format(sysOperLog.getCreateTime(),"yyyy-MM-dd HH:mm:ss"));
+                listValue[21] = String.valueOf(sysOperLog.getUpdateBy());
+                listValue[22] = String.valueOf(DateUtil.format(sysOperLog.getUpdateTime(),"yyyy-MM-dd HH:mm:ss"));
+                listValue[23] = String.valueOf(sysOperLog.getRemark());
 
                 String listValueStr = "";
                 for (int k=0;k<listValue.length;k++){
@@ -352,4 +352,4 @@ public class AutoAuditBakTest extends BaseTest {
         }
         log.info("结束操作日志备份");
     }
-}
+}

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

@@ -79,12 +79,12 @@ public class BcSm2Util {
 //        String signold = SM2CryptUtils.sign(pv,text);
 //        System.out.println(signold);
 
-//        // SM3加密密码
-//        String sm3password = SmUtil.sm3("Xsl1234567890abcdefg").toUpperCase();
-        // 再对密码sm2
+        // SM3加密密码
+        String sm3password = SmUtil.sm3("Jy147258").toUpperCase();
+         //再对密码sm2
 
-//        String keystore = SM2CryptUtils.encrypt("s37d1gxm",SecretKeyConstants.SERVER_PUBLIC_KEY);
-//        System.out.println("keystore:"+keystore);
+        String keystore = SM2CryptUtils.encrypt(sm3password,SecretKeyConstants.SERVER_PUBLIC_KEY);
+        System.out.println("keystore:"+keystore);
 //
 //        System.out.println("==========mysql配置==========");
 //        String sm2dbusername = SM2CryptUtils.encrypt("root",SecretKeyConstants.SERVER_PUBLIC_KEY);

+ 3 - 3
ui/src/views/auditManager/operlog/index.vue

@@ -182,9 +182,9 @@
           <el-col :span="24">
             <el-form-item label="请求参数:">{{ form.operParam }}</el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="返回参数:">{{ form.jsonResult }}</el-form-item>
-          </el-col>
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="返回参数:">{{ form.jsonResult }}</el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="6">
             <el-form-item label="操作状态:">
               <div v-if="form.status === 0">正常</div>