接口日志参数

acs/nladmin-system/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java

@@ -213,6 +213,7 @@ public class AutoRunServiceImpl implements AutoRunService, ApplicationAutoInitia
                 thread.start();
             } else if (SystemConfig.thread_auto_run.booleanValue() && (!DevelopConfig.develop.booleanValue()
                     || !DevelopConfig.thread_auto_run_force_stop.contains(this.thread_code_index.get(i)))) {
+                thread.setName("test_"+thread.getName());
                 thread.start();
             }
         }

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -135,6 +135,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         result.put("message", "任务状态反馈成功!");
         result.put("data", new JSONObject());
         result.put("errArr", errArr);
+        log.info("receiveTaskStatusAcs返回参数：--------------------------------------" + result.toString());
         return result;
     }
 
@@ -493,6 +494,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 }
                 result.put("status", HttpStatus.OK.value());
                 result.put("message", "下发成功!");
+                log.info("apply返回参数：---------------------------------------------" + result.toString());
                 return result;
             }
         } finally {
@@ -502,6 +504,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         }
         result.put("status", HttpStatus.BAD_REQUEST.value());
         result.put("message", "申请任务超时！" + type);
+        log.info("apply返回参数：---------------------------------------------" + result.toString());
+
         return result;
     }
 
@@ -602,7 +606,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 lock.unlock();
             }
         }
-
+        log.info("deviceApply返回参数：---------------------------------------------" + result.toString());
         return result;
     }
 

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/OutController.java

@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.modules.logging.annotation.Log;
-import org.nl.wms.pda.mps.service.CasingService;
 import org.nl.wms.pda.mps.service.OutService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

lms/nladmin-system/src/main/resources/log/AcsToLms.xml

@@ -6,7 +6,7 @@
     <appender name="FILE5" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ACSToMes/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/AcsToLms/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->

lms/nladmin-system/src/main/resources/log/LmsToAcs.xml

@@ -6,7 +6,7 @@
     <appender name="FILE6" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/MesToACS/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/LmsToAcs/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>15</maxHistory>
             <!--单个日志最大容量 至少10MB才能看得出来-->

lms/nladmin-system/src/main/resources/logback-spring.xml

@@ -14,19 +14,15 @@ https://juejin.cn/post/6844903775631572999
     <property name="log.pattern"
               value="%black(%contextName-) %X{traceId} %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
     <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <springProperty scope="context" name="lokiUrl" source="loki.url"/>
     <springProperty scope="context" name="esIndex" source="es.index"/>
-    <springProperty scope="context" name="systemName" source="loki.systemName"/>
-    <property name="LOKI_URL" value="${lokiUrl}"/>
-    <property name="SYSTEM_NAME" value="${systemName}"/>
     <property name="LOG_HOME" value="${logPath}"/>
     <!--引入默认的一些设置-->
     <include resource="log/LmsToMes.xml"/>
     <include resource="log/LmsToSap.xml"/>
     <include resource="log/MesToLms.xml"/>
     <include resource="log/SapToLms.xml"/>
-    <include resource="log/ACSToMes.xml"/>
+    <include resource="log/AcsToLMS.xml"/>
-    <include resource="log/MesToACS.xml"/>
+    <include resource="log/LmsToAcs.xml"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <!--        控制台高亮-->