From b73c9e8c65aedda1d75f77a58982002bccbf2a0b Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Fri, 26 Jul 2024 16:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0tlog=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nlsso-server/src/main/java/org/nl/AppRun.java | 3 ++- .../nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java | 9 +++++++++ .../src/main/resources/config/application.yml | 5 ++++- .../nlsso-server/src/main/resources/log/ACSToLMS.xml | 4 ++-- .../nlsso-server/src/main/resources/logback-spring.xml | 6 +++--- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java index 2e0ccd498..12b3b2059 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java @@ -3,6 +3,7 @@ package org.nl; import cn.dev33.satoken.annotation.SaIgnore; import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation; import com.alicp.jetcache.anno.config.EnableMethodCache; +import lombok.extern.slf4j.Slf4j; import org.dromara.dynamictp.core.spring.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; import org.nl.config.SpringContextHolder; @@ -35,7 +36,7 @@ import org.springframework.web.bind.annotation.RestController; @EnableMethodCache(basePackages = "org.nl") @EnableCreateCacheAnnotation @MapperScan("org.nl.**.mapper") - +@Slf4j public class AppRun { public static void main(String[] args) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index ccc9184cb..48bf4dd10 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -3,12 +3,14 @@ package org.nl.acs.ext.wms.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; +import com.yomahub.tlog.hutoolhttp.TLogHutoolhttpInterceptor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; @@ -54,6 +56,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Autowired AddressService addressService; + TLogHutoolhttpInterceptor tLogHutoolhttpInterceptor = new TLogHutoolhttpInterceptor(); + + @Autowired TaskService taskService; @@ -166,6 +171,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { HttpResponse result2 = null; try { result2 = HttpRequest.post(url) + .addInterceptor(tLogHutoolhttpInterceptor) + .header(Header.USER_AGENT, "Hutool http") .header("Authorization", token) .body(String.valueOf(param)) .execute(); @@ -345,6 +352,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String methods_url = addressDto.getMethods_url(); try { result2 = HttpRequest.post(wmsurl + methods_url) + .addInterceptor(tLogHutoolhttpInterceptor) + .header(Header.USER_AGENT, "Hutool http") .header("Authorization", token).body(String.valueOf(data)) .execute(); // //System.out.println(result2); diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 409f69f12..e214136b0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -139,4 +139,7 @@ mybatis-plus: lucene: index: - path: C:\acs\lucene\index + path: C:\acs\lucene\indexl +tlog: + pattern: "[$preApp][$preIp][$spanId][$traceId]" + enable-invoke-time-print: true \ No newline at end of file diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/log/ACSToLMS.xml b/acs2/nladmin-system/nlsso-server/src/main/resources/log/ACSToLMS.xml index f5107763c..50603c4cb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/log/ACSToLMS.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/log/ACSToLMS.xml @@ -14,8 +14,8 @@ 2GB - - + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n ${log.charset} diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index d17f7a81e..89e91ef1f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -47,8 +47,8 @@ https://juejin.cn/post/6844903775631572999 20GB - - + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n @@ -68,7 +68,7 @@ https://juejin.cn/post/6844903775631572999 - +