日志修改

ad-platform-common/ad-platform-common-log/src/main/java/com/baiye/aspect/BadRequestExceptionAspect.java

@@ -1,36 +1,36 @@
-package com.baiye.aspect;
-
-import com.baiye.common.CommonLog;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.*;
-import org.springframework.stereotype.Component;
-
-import java.util.Arrays;
-
-/**
- * @Author YQY
- * @Date 2023/5/24
- */
-@Component
-@Aspect
-@Slf4j
-public class BadRequestExceptionAspect {
-
-    /**
-     * 配置切入点
-     */
-    @Pointcut("execution(* com.baiye.exception.handler.GlobalExceptionHandler.badRequestException(..))")
-    public void badRequestExceptionPointcut() {
-    }
-
-    @Before("badRequestExceptionPointcut()")
-    public void bb(JoinPoint joinPoint) {
-        Object[] args = joinPoint.getArgs();
-        if (args.length > 0) {
-            String str = Arrays.toString(args);
-            int index = str.indexOf(':');
-            if (index != -1) CommonLog.error(str.substring(index + 1, str.length() - 1));
-        }
-    }
-}
+//package com.baiye.aspect;
+//
+//import com.baiye.common.CommonLog;
+//import lombok.extern.slf4j.Slf4j;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.*;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.Arrays;
+//
+///**
+// * @Author YQY
+// * @Date 2023/5/24
+// */
+//@Component
+//@Aspect
+//@Slf4j
+//public class BadRequestExceptionAspect {
+//
+//    /**
+//     * 配置切入点
+//     */
+//    @Pointcut("execution(* com.baiye.exception.handler.GlobalExceptionHandler.badRequestException(..))")
+//    public void badRequestExceptionPointcut() {
+//    }
+//
+//    @Before("badRequestExceptionPointcut()")
+//    public void badRequestExceptionBefore(JoinPoint joinPoint) {
+//        Object[] args = joinPoint.getArgs();
+//        if (args.length > 0) {
+//            String str = Arrays.toString(args);
+//            int index = str.indexOf(':');
+//            if (index != -1) CommonLog.error(str.substring(index + 1, str.length() - 1));
+//        }
+//    }
+//}

ad-platform-common/ad-platform-common-log/src/main/java/com/baiye/aspect/LogAspect.java

@@ -38,6 +38,7 @@ public class LogAspect {
     private final SystemClient systemClient;
 
     ThreadLocal<Long> currentTime = new ThreadLocal<>();
+    private final String SYSTEM_TYPE = "systemType";
 
     public LogAspect(SystemClient systemClient) {
         this.systemClient = systemClient;
@@ -86,8 +87,8 @@ public class LogAspect {
             String ip = RequestUtils.getIp(request);
 
             // 插入数据库的日志
+            LogReqDTO logReqDTO = this.install(joinPoint, controllerLog, ip, e);
             if (controllerLog.isSaveMySQL()) {
-                LogReqDTO logReqDTO = this.install(joinPoint, null, ip, e);
                 logReqDTO.setLogType(LogType.ERROR);
                 logReqDTO.setTime(System.currentTimeMillis() - currentTime.get());
                 logReqDTO.setBrowser(RequestUtils.getBrowser(request));
@@ -107,13 +108,9 @@ public class LogAspect {
         Object[] args = joinPoint.getArgs();
         // 方法路径
         String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
-
         String reqParam = argsArrayToString(args);
         String reqParams = StringUtils.substring(reqParam, 0, 2000);
-
         String reqMethod = ServletUtil.getRequest().getMethod();
-
-        if (e == null) {
         MDC.put("userId", this.getUserId());
         MDC.put("userName", this.getUsername());
         MDC.put("reqIp", ip);
@@ -121,11 +118,12 @@ public class LogAspect {
         MDC.put("params", reqParams);
         MDC.put("reqMethod", reqMethod);
         MDC.put("reqUrl", Objects.requireNonNull(ServletUtil.getRequest()).getRequestURI());
+        MDC.put(SYSTEM_TYPE, String.valueOf(DefaultNumberConstants.ONE_NUMBER));
         if (controllerLog != null) {
             MDC.put("businessPartyType", controllerLog.BusinessPartyType());
             logReqDTO.setDescription(controllerLog.value());
         }
-        }
+
         StringBuilder params = new StringBuilder("{");
         //参数值
         List<Object> argValues = new ArrayList<>(Arrays.asList(args));
@@ -143,10 +141,12 @@ public class LogAspect {
         logReqDTO.setUsername(getUsername());
 
         if (e == null) {
-            MDC.put("systemType", String.valueOf(DefaultNumberConstants.ONE_NUMBER));
-            log.info("{}", controllerLog.value());
-            MDC.remove("systemType");
+            if (controllerLog != null) log.info("{}", controllerLog.value());
+        }else {
+//            if (controllerLog != null) log.error("{}", controllerLog.value() + "失败\n错误信息：" + ThrowableUtil.getStackTrace(e).substring(0, 2000));
+            if (controllerLog != null) log.error("{}", controllerLog.value() + "失败;\n错误信息：" + e.getMessage());
         }
+        MDC.remove(SYSTEM_TYPE);
         return logReqDTO;
     }
 

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/LogServiceImpl.java

@@ -75,7 +75,7 @@ public class LogServiceImpl implements LogService {
         return PageUtil.toPage(page.map(logSmallMapper::toDto));
     }
 
-    //    @Override
+//    @Override
 //    @Transactional(rollbackFor = Exception.class)
 //    public void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, LogEntity logEntity) {
 //
@@ -211,7 +211,7 @@ public class LogServiceImpl implements LogService {
             filter.must(QueryBuilders.termQuery("businessPartyType", query.getBusinessPartyType()));
         }
         if (StringUtils.isNotBlank(query.getUserName())) {
-            filter.must(QueryBuilders.matchQuery("userName", query.getUserName()));
+            filter.must(QueryBuilders.matchPhraseQuery("userName", query.getUserName()));
         }
         if (StringUtils.isNotBlank(query.getSystemType())) {
             filter.must(QueryBuilders.termQuery("systemType", query.getSystemType()));

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/ElasticsearchTask.java

@@ -0,0 +1,35 @@
+package com.baiye.timed;
+
+import cn.hutool.core.date.DateUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @Author YQY
+ * @Date 2023/5/29
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class ElasticsearchTask {
+
+    private final ElasticsearchOperations elasticsearchOperations;
+
+    /**
+     * 删除一个月前es索引,索引规则在logstash应用中的规则创建
+     */
+    @Scheduled(cron = "0 0 2 * * ?")
+    public void removeIndex() {
+        log.info("定时任务删除es索引开始");
+        Date startDate = DateUtils.addDays(new Date(), -30);
+        String format = DateUtil.format(startDate, "yyyy.MM.dd");
+        elasticsearchOperations.deleteIndex("logstash-" + format);
+        log.info("删除es索引结束");
+    }
+}

ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/FileTask.java

@@ -32,7 +32,7 @@ public class FileTask {
     @Scheduled(cron = "0 0 3 * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void compress() throws Exception {
-        CommonLog.info("---开始压缩文件夹---");
+        log.info("---开始压缩文件夹---");
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         DateTime date = DateUtil.yesterday();
         String path = URL + dateFormat.format(date);
@@ -48,7 +48,7 @@ public class FileTask {
     @Scheduled(cron = "0 0 1 * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void emptyLog(){
-        CommonLog.info("---清空日志---");
+        log.info("---清空日志---");
         turnCrmLogRepository.deleteAll();
     }
 }