Merge remote-tracking branch 'origin/master'

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) {

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);

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

acs2/nladmin-system/nlsso-server/src/main/resources/log/ACSToLMS.xml

@@ -14,8 +14,8 @@
             <!--所有日志最多占多大容量-->
             <totalSizeCap>2GB</totalSizeCap>
         </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>${log.charset}</charset>
         </encoder>

acs2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -47,8 +47,8 @@ https://juejin.cn/post/6844903775631572999
             <!--所有日志最多占多大容量-->
             <totalSizeCap>20GB</totalSizeCap>
         </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+        <encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
+        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
     </appender>
@@ -68,7 +68,7 @@ https://juejin.cn/post/6844903775631572999
 
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <root level="debug">
+        <root level="info">
 <!--            <appender-ref ref="asyncLuceneAppender"/>-->
 <!--            <appender-ref ref="asyncFileAppender"/>-->
             <appender-ref ref="CONSOLE"/>