FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
This commit is contained in:
duanwenbin
2021-07-07 11:23:08 +08:00
parent 9709acf0a9 3c7acb2705
commit c1a0b31372
10 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/resources/application-dev.properties
+14 -11
View File
@@ -3,20 +3,20 @@
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root
spring.datasource.password = root
#==============================================
# 应用设置
spring.application.name=FotonLAWSSystem-zqazqazqa
spring.application.name=FotonLAWSSystem
application.code=20200101
application.center=1
#==============================================
#Eruept
eureka.client.allow-redirects=false
eureka.client.register-with-eureka=false
eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
eureka.client.allow-redirects=true
eureka.client.register-with-eureka=true
eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/
#==============================================
# 邮箱配置1
@@ -35,13 +35,16 @@ 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
spring.rabbitmq.host=192.168.10.248
spring.rabbitmq.port=5672
spring.rabbitmq.username=ca
spring.rabbitmq.password=cs986432
# ==============================================
# 文档存储路径指向
# ==============================================