root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码修改

Browse Source
This commit is contained in:
lyd
2022-08-15 18:24:59 +08:00
parent 0c64a1d994
commit 0dece0a99e
15 changed files with 61 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -57,11 +57,7 @@ spring:
wall:
config:
multi-statement-alagvslow: true
data:
mongodb:
host: 192.168.81.251
port: 27017
database: acs_log
redis:
#数据库索引
database: ${REDIS_DB:2}

5
acs/hd/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -53,11 +53,6 @@ spring:
wall:
config:
multi-statement-allow: true
data:
mongodb:
host: 127.0.0.1
port: 27017
database: logdb
redis:
#数据库索引
database: ${REDIS_DB:0}

5
acs/hd/nladmin-system/src/main/resources/config/application-test.yml
View File

@@ -55,11 +55,6 @@ spring:
wall:
config:
multi-statement-alagvslow: true
data:
mongodb:
host: 47.97.157.227
port: 27017
database: nlacs
redis:
#数据库索引
database: ${REDIS_DB:0}

28
acs/hd/nladmin-system/src/main/resources/log/AcsToErp.xml
View File

@@ -1,17 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<included>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<appender name="acs_to_erp" class="org.nl.modules.log.MongoDBAppender">
<dbName>acs_log</dbName>
<collectionName>acs_to_erp</collectionName>
<source>${CONTEXT_NAME}</source>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<property name="log.pattern"
value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
<springProperty scope="context" name="lokiUrl" source="loki.url"/>
<property name="LOKI_URL" value="${lokiUrl}"/>
<!--添加loki-->
<appender name="lokiAppender" class="com.github.loki4j.logback.Loki4jAppender">
<batchTimeoutMs>1000</batchTimeoutMs>
<http class="com.github.loki4j.logback.ApacheHttpSender">
<url>${LOKI_URL}</url>
</http>
<format>
<label>
<pattern>logType=acs_to_erp</pattern>
</label>
<message>
<pattern>${log.pattern}</pattern>
</message>
<sortByTime>true</sortByTime>
</format>
</appender>
<!-- 打印sql -->
<logger name="org.nl.acs.ext.erp.service.impl.AcsToErpServiceImpl" level="info" additivity="false">
<appender-ref ref="acs_to_erp"/>
<appender-ref ref="lokiAppender" />
</logger>
</included>

28
acs/hd/nladmin-system/src/main/resources/log/AcsToWms.xml
View File

@@ -1,17 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<included>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<appender name="acs_to_wms" class="org.nl.modules.log.MongoDBAppender">
<dbName>acs_log</dbName>
<collectionName>acs_to_wms</collectionName>
<source>${CONTEXT_NAME}</source>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<property name="log.pattern"
value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
<springProperty scope="context" name="lokiUrl" source="loki.url"/>
<property name="LOKI_URL" value="${lokiUrl}"/>
<!--添加loki-->
<appender name="lokiAppender" class="com.github.loki4j.logback.Loki4jAppender">
<batchTimeoutMs>1000</batchTimeoutMs>
<http class="com.github.loki4j.logback.ApacheHttpSender">
<url>${LOKI_URL}</url>
</http>
<format>
<label>
<pattern>logType=acs_to_wms</pattern>
</label>
<message>
<pattern>${log.pattern}</pattern>
</message>
<sortByTime>true</sortByTime>
</format>
</appender>
<!-- 打印sql -->
<logger name="org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl" level="info" additivity="false">
<appender-ref ref="acs_to_wms"/>
<appender-ref ref="lokiAppender" />
</logger>
</included>

28
acs/hd/nladmin-system/src/main/resources/log/AgvFeedbackServiceImpl.xml
View File

@@ -1,16 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<included>
<springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
<appender name="agv_feedback_servlet" class="org.nl.modules.log.MongoDBAppender">
<dbName>acs_log</dbName>
<collectionName>agv_feedback_servlet</collectionName>
<source>${CONTEXT_NAME}</source>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>info</level>
</filter>
<property name="log.pattern"
value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %gray(%msg%n)"/>
<springProperty scope="context" name="lokiUrl" source="loki.url"/>
<property name="LOKI_URL" value="${lokiUrl}"/>
<!--添加loki-->
<appender name="lokiAppender" class="com.github.loki4j.logback.Loki4jAppender">
<batchTimeoutMs>1000</batchTimeoutMs>
<http class="com.github.loki4j.logback.ApacheHttpSender">
<url>${LOKI_URL}</url>
</http>
<format>
<label>
<pattern>logType=agv_feedback_servlet</pattern>
</label>
<message>
<pattern>${log.pattern}</pattern>
</message>
<sortByTime>true</sortByTime>
</format>
</appender>
<!-- 打印sql -->
<logger name="org.nl.acs.agv.server.impl.AgvServiceImpl" level="info" additivity="false">
<appender-ref ref="agv_feedback_servlet"/>
<appender-ref ref="lokiAppender" />
</logger>
</included>