记得上下班打卡 | git大法好,push需谨慎

Commit 9c126631 authored by 胡佳晨's avatar 胡佳晨

Merge remote-tracking branch 'origin/dev' into dev

parents fe19c5dc ce31fb39
...@@ -3,13 +3,13 @@ liquidnet: ...@@ -3,13 +3,13 @@ liquidnet:
updating: updating:
switch: false switch: false
info: info:
port: 9999 port: 9007
context: context:
# context: /service-consumer # context: /service-consumer
name: liquidnet-service-consumer name: liquidnet-service-consumer-dragon
logfile: logfile:
path: /data/logs path: /data/logs
name: service-consumer name: service-consumer-dragon
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
file-max-size: 200MB file-max-size: 200MB
pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n' pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
......
...@@ -3,13 +3,13 @@ liquidnet: ...@@ -3,13 +3,13 @@ liquidnet:
updating: updating:
switch: false switch: false
info: info:
port: 9999 port: 9007
context: context:
# context: /service-consumer # context: /service-consumer
name: liquidnet-service-consumer name: liquidnet-service-consumer-dragon
logfile: logfile:
path: /data/logs path: /data/logs
name: service-consumer name: service-consumer-dragon
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
file-max-size: 200MB file-max-size: 200MB
pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n' pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
...@@ -22,6 +22,6 @@ liquidnet: ...@@ -22,6 +22,6 @@ liquidnet:
database-name: test_ln_scene database-name: test_ln_scene
mongodb: mongodb:
sslEnabled: false sslEnabled: false
database: dev_ln_scene database: test_ln_scene
#以下为spring各环境个性配置 #以下为spring各环境个性配置
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<module>liquidnet-service-kylin</module> <module>liquidnet-service-kylin</module>
<module>liquidnet-service-order</module> <module>liquidnet-service-order</module>
<module>liquidnet-service-platform</module> <module>liquidnet-service-platform</module>
<module>liquidnet-service-dragon</module>
<module>liquidnet-service-executor-all</module> <module>liquidnet-service-executor-all</module>
<module>liquidnet-service-consumer-all</module> <module>liquidnet-service-consumer-all</module>
<!-- <module>liquidnet-service-example</module>--> <!-- <module>liquidnet-service-example</module>-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment