diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index c9b1fd24..ca2d6fdd 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@FeignClient(value = "bat-wkflow-wh") +@FeignClient(value = "bat-wkflow") //@FeignClient(value = "shan") public interface workFlowFeignClient { diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 930a5c60..e3445661 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,22 +3,21 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://10.96.10.171 :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.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root - - #============================================== # 应用设置 -spring.application.name=BAT-WKFLOW-WH +spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #============================================== # 邮箱配置1 @@ -43,7 +42,7 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=192.168.1.109 +spring.rabbitmq.host=192.168.10.248 spring.rabbitmq.port=5672 spring.rabbitmq.username=ca spring.rabbitmq.password=cs986432 @@ -65,4 +64,4 @@ OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ # OCR文件请求下载或在线预览时URL OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ OCR.times=20 -OCR.convertType=BOTH +OCR.convertType=BOTH \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application-prod.properties b/adc-da-main/src/main/resources/application-prod.properties index dd9b39be..203e71c7 100644 --- a/adc-da-main/src/main/resources/application-prod.properties +++ b/adc-da-main/src/main/resources/application-prod.properties @@ -25,14 +25,14 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -# -spring.rabbitmq.host=192.168.1.109 +spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc spring.rabbitmq.port=5672 -spring.rabbitmq.username=ca -spring.rabbitmq.password=cs986432 +spring.rabbitmq.virtual-host=uat_pcms +spring.rabbitmq.username=uat_pcms +spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ +file.path=/usr/laws/file/ \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application-test.properties b/adc-da-main/src/main/resources/application-test.properties index bf84333a..55f14c4b 100644 --- a/adc-da-main/src/main/resources/application-test.properties +++ b/adc-da-main/src/main/resources/application-test.properties @@ -25,18 +25,14 @@ spring.mail.port=587 # ============================================== # rabbitMQ # ============================================== -spring.rabbitmq.host=192.168.1.109 +spring.rabbitmq.host=rabbitmq-cluster-01.vs.test.geely.svc spring.rabbitmq.port=5672 -spring.rabbitmq.username=ca -spring.rabbitmq.password=cs986432 -#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.virtual-host=uat_pcms +spring.rabbitmq.username=uat_pcms +spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true # ============================================== # 文档存储路径指向 # ============================================== -file.path=/usr/laws/file/ +file.path=/usr/laws/file/ \ No newline at end of file diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index f1e79d41..fb339ca5 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -39,7 +39,7 @@ eureka.client.fetch-registry=true #eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ #eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000