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

配置文件更新

Browse Source
This commit is contained in:
ludj
2023-03-17 09:05:42 +08:00
parent f1cc1c832d
commit 48e080d2cb
9 changed files with 43 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -1,21 +1,8 @@
server:
port: 8011
#海亮sqlserver
erp:
sqlserver:
enabled: false
jdbcurl: jdbc:sqlserver://192.168.81.156;DatabaseName=hllg
username: sa
password: root
#配置数据源
spring:
data:
mongodb:
host: 127.0.0.1
port: 27017
database: nlwms
elasticsearch:
repositories:
enabled: true
@@ -79,7 +66,6 @@ spring:
redis:
#数据库索引
database: ${REDIS_DB:1}
#host: ${REDIS_HOST:127.0.0.1}
host: ${REDIS_HOST:localhost}

7
mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -2,8 +2,6 @@ server:
port: 8011
#配置数据源
spring:
profiles:
prod
datasource:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
@@ -55,11 +53,6 @@ spring:
wall:
config:
multi-statement-alagvslow: true
data:
mongodb:
host: 127.0.0.1
port: 27017
database: nlacs
redis:
#数据库索引

5
mes/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: 127.0.0.1
port: 27017
database: logdb
redis:
#数据库索引
database: ${REDIS_DB:8}

42
mes/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -12,29 +12,29 @@ https://juejin.cn/post/6844903775631572999
<contextName>nlAdmin</contextName>
<property name="log.charset" value="utf-8"/>
<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)"/>
value="%black(%contextName-) %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"/>
<property name="LOG_HOME" value="${logPath}"/>
<!--引入默认的一些设置-->
<!-- <include resource="log/AutoCreateInst.xml"/>-->
<appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
<!-- <appender name="esLogAppender" class="com.internetitem.logback.elasticsearch.ElasticsearchAppender">
<url>http://47.96.133.178:8200/_bulk</url>
<index>${esIndex}</index>
<type>mes_log</type>
<loggerName>es-logger</loggerName> <!-- optional -->
<errorLoggerName>es-error-logger</errorLoggerName> <!-- optional -->
<connectTimeout>30000</connectTimeout> <!-- optional (in ms, default 30000) -->
<errorsToStderr>false</errorsToStderr> <!-- optional (default false) -->
<includeCallerData>false</includeCallerData> <!-- optional (default false) -->
<logsToStderr>false</logsToStderr> <!-- optional (default false) -->
<maxQueueSize>104857600</maxQueueSize> <!-- optional (default 104857600) -->
<maxRetries>3</maxRetries> <!-- optional (default 3) -->
<readTimeout>30000</readTimeout> <!-- optional (in ms, default 30000) -->
<sleepTime>250</sleepTime> <!-- optional (in ms, default 250) -->
<rawJsonMessage>false</rawJsonMessage> <!-- optional (default false) -->
<includeMdc>false</includeMdc> <!-- optional (default false) -->
<maxMessageSize>20000</maxMessageSize> <!-- optional (default -1 -->
<!-- <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;-->
<loggerName>es-logger</loggerName> &lt;!&ndash; optional &ndash;&gt;
<errorLoggerName>es-error-logger</errorLoggerName> &lt;!&ndash; optional &ndash;&gt;
<connectTimeout>30000</connectTimeout> &lt;!&ndash; optional (in ms, default 30000) &ndash;&gt;
<errorsToStderr>false</errorsToStderr> &lt;!&ndash; optional (default false) &ndash;&gt;
<includeCallerData>false</includeCallerData> &lt;!&ndash; optional (default false) &ndash;&gt;
<logsToStderr>false</logsToStderr> &lt;!&ndash; optional (default false) &ndash;&gt;
<maxQueueSize>104857600</maxQueueSize> &lt;!&ndash; optional (default 104857600) &ndash;&gt;
<maxRetries>3</maxRetries> &lt;!&ndash; optional (default 3) &ndash;&gt;
<readTimeout>30000</readTimeout> &lt;!&ndash; optional (in ms, default 30000) &ndash;&gt;
<sleepTime>250</sleepTime> &lt;!&ndash; optional (in ms, default 250) &ndash;&gt;
<rawJsonMessage>false</rawJsonMessage> &lt;!&ndash; optional (default false) &ndash;&gt;
<includeMdc>false</includeMdc> &lt;!&ndash; optional (default false) &ndash;&gt;
<maxMessageSize>20000</maxMessageSize> &lt;!&ndash; optional (default -1 &ndash;&gt;
&lt;!&ndash; <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;&ndash;&gt;
<properties>
<property>
<name>system</name>
@@ -75,10 +75,11 @@ https://juejin.cn/post/6844903775631572999
<value>application/json</value>
</header>
</headers>
</appender>
</appender>-->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<withJansi>true</withJansi>
<encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
<pattern>${log.pattern}</pattern>
<!-- <charset>${log.charset}</charset>-->
</encoder>
@@ -98,14 +99,15 @@ https://juejin.cn/post/6844903775631572999
<!--所有日志最多占多大容量-->
<totalSizeCap>20GB</totalSizeCap>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<!-- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">-->
<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>
<!--异步到文件-->
<appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
<appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
<discardingThreshold>0</discardingThreshold>
<queueSize>500</queueSize>
<appender-ref ref="FILE"/>