Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2

 Conflicts:
	adc-da-main/src/main/resources/application-dev.properties
This commit is contained in:
root
2021-07-04 16:48:26 +08:00
10 changed files with 246 additions and 12 deletions
@@ -9,7 +9,7 @@ spring.datasource.password = root
#==============================================
# 应用设置
spring.application.name=FotonLAWSSystem
spring.application.name=FotonLAWSSystem-zqazqazqa
application.code=20200101
application.center=1
#==============================================
@@ -35,11 +35,11 @@ spring.mail.port=587
# ==============================================
# rabbitMQ
# ==============================================
#spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc
#spring.rabbitmq.port=5672
#spring.rabbitmq.virtual-host=uat_pcms
#spring.rabbitmq.username=uat_pcms
#spring.rabbitmq.password=VxsBLL5bJruwzXfS
spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc
spring.rabbitmq.port=5672
spring.rabbitmq.virtual-host=uat_pcms
spring.rabbitmq.username=uat_pcms
spring.rabbitmq.password=VxsBLL5bJruwzXfS
# spring.rabbitmq.publisher-confirms=true
# ==============================================