update log management

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysLogsVo.java

@@ -144,6 +144,7 @@ public class SysLogsVo {
 
     private String endTime;
 
+    //日志类型 1 业务日志 0 系统日志  2异常日志
     private String type;
     /**
      * 越权记录
@@ -165,7 +166,7 @@ public class SysLogsVo {
             //请求方法
             vo.setMethodType(ServletUtils.getRequest().getMethod());
             //void->无参数返回的
-            vo.setResult("0");
+            vo.setResult("成功");
             vo.setFailureReason("操作未授权");
             vo.setGrade("高");
             vo.setErrType("越权访问");

bonus-auth/pom.xml

@@ -57,6 +57,11 @@
             <artifactId>jasypt-spring-boot-starter</artifactId>
             <version>3.0.2</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.bonus</groupId>
+            <artifactId>bonus-common-log</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

bonus-auth/src/main/java/com/bonus/auth/service/SysLoginService.java

@@ -96,8 +96,9 @@ public class SysLoginService
         if(StringUtils.isNotEmpty(nowIp) && !nowIp.equals(hisIp)){
             recordLogService.saveErrorLogs(username, startTime,user.getUserId().toString());
         }
+
         redisService.setCacheObject("IP:"+user.getUserId().toString(),nowIp,times, TimeUnit.MINUTES);
-        recordLogService.saveLogs(username, startTime, "登陆成功","登陆成功",user.getUserId().toString(),"登陆成功");
+        recordLogService.saveLogs(username, startTime, "登陆成功","登陆成功",user.getUserId().toString(),"成功");
         return userInfo;
     }
 

bonus-auth/src/main/java/com/bonus/auth/service/SysRecordLogService.java

@@ -3,6 +3,7 @@ package com.bonus.auth.service;
 import com.alibaba.nacos.common.utils.UuidUtils;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.global.SystemGlobal;
+import com.bonus.common.log.enums.OperaResult;
 import com.bonus.system.api.domain.SysLogsVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,7 +82,7 @@ public class SysRecordLogService
         if (StringUtils.isNotEmpty(result)){
             sysLogsVo.setResult(result);
         }else{
-            sysLogsVo.setResult("失败");
+            sysLogsVo.setResult(OperaResult.FAIL);
         }
         if (StringUtils.isNotEmpty(userId)){
             sysLogsVo.setUserId(userId);
@@ -113,7 +114,7 @@ public class SysRecordLogService
         sysLogsVo.setOperType("登陆");
         sysLogsVo.setOperaUri("/login");
         sysLogsVo.setLogType(2);
-        sysLogsVo.setResult("成功");
+        sysLogsVo.setResult(OperaResult.SUCCESS);
         if (StringUtils.isNotEmpty(userId)){
             sysLogsVo.setUserId(userId);
         }
@@ -166,7 +167,7 @@ public class SysRecordLogService
         if (StringUtils.isNotEmpty(result)){
             sysLogsVo.setResult(result);
         }else{
-            sysLogsVo.setResult("成功");
+            sysLogsVo.setResult(OperaResult.SUCCESS);
         }
         sysLogsVo.setFailureReason(message);
         sysLogsVo.setTitle("退出登录");

bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/global/SystemGlobal.java

@@ -48,14 +48,9 @@ public class SystemGlobal {
      */
     public final static String LOG_ERR="2";
 
-    public  final static  int LOG_DEFEAT=1024;
+    public  final static  int LOG_DEFEAT_SIZE=1024;
 
 
-    /**
-     * 线路工程类型
-     */
-    public final static  String LINE_TYPE="线路";
-
     public final static  String ERR_NUM="NAN";
 
     //

bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/aspect/LogAspect.java

@@ -32,7 +32,7 @@ import com.bonus.common.core.utils.ip.IpUtils;
 import com.bonus.common.log.filter.PropertyPreExcludeFilter;
 import com.bonus.common.log.service.AsyncLogService;
 import com.bonus.common.security.utils.SecurityUtils;
-
+import com.bonus.common.log.enums.OperaResult;
 /**
  * 操作日志记录处理
  *
@@ -97,15 +97,15 @@ public class LogAspect
                 JSONObject jsonObject = JSON.parseObject(result);
                  String code= jsonObject.getString("code");
                  if (SystemGlobal.SUCCESS_CODE_STR.contains(code)){
-                     sysLogsVo.setResult("1");
+                     sysLogsVo.setResult(OperaResult.SUCCESS);
                      sysLogsVo.setFailureReason("操作成功");
                  }else{
                      sysLogsVo.setFailureReason(jsonObject.getString("msg"));
-                     sysLogsVo.setResult("0");
+                     sysLogsVo.setResult(OperaResult.FAIL);
                  }
             }else{
                 //void->无参数返回的
-                sysLogsVo.setResult("1");
+                sysLogsVo.setResult(OperaResult.SUCCESS);
                 sysLogsVo.setFailureReason("操作成功");
             }
             //操作模块及路径

bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/enums/LogType.java

@@ -0,0 +1,28 @@
+package com.bonus.common.log.enums;
+
+/**
+ * 操作人类别
+ * 
+ * @author bonus
+ */
+public enum LogType
+{
+    /**
+     * 日志类型 1 业务日志 0 系统日志  2异常日志
+     */
+
+    /**
+     * 系统日志
+     */
+    SYSTEM_LOG,
+
+    /**
+     * 业务日志
+     */
+    BUSINESS_LOG,
+
+    /**
+     * 2异常日志
+     */
+    EXCEPTION_LOG
+}

bonus-common/bonus-common-log/src/main/java/com/bonus/common/log/enums/OperaResult.java

@@ -0,0 +1,18 @@
+package com.bonus.common.log.enums;
+
+/**
+ * 操作类型
+ * @author bonus
+ */
+public class OperaResult {
+
+
+    /**
+     * 备份
+     */
+    public final static  String SUCCESS="成功";
+    /**
+     * 查询
+     */
+    public final static  String FAIL="失败";
+}

bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/auth/AuthLogic.java

@@ -5,8 +5,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import cn.hutool.core.date.DateTime;
-import com.alibaba.nacos.client.utils.LogUtils;
 import com.bonus.common.core.constant.SecurityConstants;
 import com.bonus.common.core.domain.R;
 import com.bonus.common.core.utils.DateUtils;
@@ -180,7 +178,7 @@ public class AuthLogic
             vo.setTitle(result.get("title"));
             vo.setOperateDetail(result.get("detail"));
             vo.setOperaTime(DateUtils.getTime());
-            vo.setOperaType(result.get("bussType"));
+            vo.setOperType(result.get("bussType"));
             vo.setResultData(result.get("resultData"));
             vo.setTimes("0");
             logService.addLogs(vo,SecurityConstants.INNER);

bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/utils/SecurityUtils.java

@@ -114,4 +114,12 @@ public class SecurityUtils
         BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
         return passwordEncoder.matches(rawPassword, encodedPassword);
     }
+
+
+
+    public static void main(String[] args) {
+
+        String msg= encryptPassword("Admin@1234");
+        System.err.println(msg);
+    }
 }

bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysLogServiceImpl.java

@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-
+import com.bonus.common.log.enums.LogType;
 /**
  * @author：cwchen
  * @date：2024-02-28-14:02
@@ -81,7 +81,7 @@ public class SysLogServiceImpl implements ISysLogService {
                 sysLog.setOperateDetail("查看页面");
                 String module=mapper.getModuleName(sysLog);
                 sysLog.setLogType(2);
-                sysLog.setResult(String.valueOf(2));
+                sysLog.setResult("失败");
                 sysLog.setOperaTime(DateUtils.getTime());
                 sysLog.setModel(module);
                 LoginUser user= SecurityUtils.getLoginUser();
@@ -133,7 +133,7 @@ public class SysLogServiceImpl implements ISysLogService {
         }catch (Exception e){
             log.error(e.toString(),e);
         }
-        return  R.ok(SystemGlobal.LOG_DEFEAT+"");
+        return  R.ok(SystemGlobal.LOG_DEFEAT_SIZE+"");
     }
 
     /**
@@ -149,12 +149,12 @@ public class SysLogServiceImpl implements ISysLogService {
                     return R.fail("请输入数字");
                 }
             }else{
-                return R.fail("日志容量最低是"+SystemGlobal.LOG_DEFEAT+"Mb");
+                return R.fail("日志容量最低是"+SystemGlobal.LOG_DEFEAT_SIZE+"Mb");
             }
 
             Double cap=Double.parseDouble(capacity);
-            if(cap<SystemGlobal.LOG_DEFEAT){
+            if(cap<SystemGlobal.LOG_DEFEAT_SIZE){
-                return R.fail("日志容量最低是"+SystemGlobal.LOG_DEFEAT+"Mb");
+                return R.fail("日志容量最低是"+SystemGlobal.LOG_DEFEAT_SIZE+"Mb");
             }
         }catch (Exception e){
             log.error(e.toString(),e);