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_new' into develop_master_new

Browse Source
This commit is contained in:
CD
2022-11-25 17:51:07 +08:00
parent 94fef5e08f 50ded28c72
commit e06e37f203
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
+2 -2
View File
@@ -18,8 +18,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
//@FeignClient(value = "bat-wkflow-test") @FeignClient(value = "bat-wkflow-test")
@FeignClient(value = "bat-wkflow") //@FeignClient(value = "bat-wkflow")
//@FeignClient(value = "shan6") //@FeignClient(value = "shan6")
public interface workFlowFeignClient { public interface workFlowFeignClient {
adc-da-main/src/main/resources/application-dev.properties
+7 -7
View File
@@ -3,22 +3,22 @@
# 数据库配置 # 数据库配置
#============================================= #=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://10.100.5.111:3306/foton_slrs?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.url = jdbc:mysql://121.36.69.172:3307/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = tempuser spring.datasource.username = root
spring.datasource.password = Fting&8g35g#geg2 spring.datasource.password = hzwlsoft.com
#============================================== #==============================================
# 应用设置 # 应用设置
spring.application.name=FotonLAWSSystem-REST-SEARCH spring.application.name=FotonLAWSSystem-test
application.code=20200101 application.code=20200101
application.center=1 application.center=1
#============================================== #==============================================
#Eureka #Eureka
eureka.client.allow-redirects=true eureka.client.allow-redirects=true
eureka.client.register-with-eureka=true eureka.client.register-with-eureka=true
eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ eureka.client.service-url.defaultZone=http://127.0.0.1:8123/eureka/
#============================================== #==============================================
# 邮箱配置1 # 邮箱配置1
@@ -37,10 +37,10 @@ spring.mail.port=587
#============================================== #==============================================
# MQ配置 # MQ配置
#============================================== #==============================================
spring.rabbitmq.host=10.100.5.119 spring.rabbitmq.host=121.36.69.172
spring.rabbitmq.port=5672 spring.rabbitmq.port=5672
spring.rabbitmq.username=admin spring.rabbitmq.username=admin
spring.rabbitmq.password=foton@admin spring.rabbitmq.password=hzwlsoft.com
spring.rabbitmq.listener.simple.acknowledge-mode= manual spring.rabbitmq.listener.simple.acknowledge-mode= manual
# 生产者 默认关闭 发版 需改为 true # 生产者 默认关闭 发版 需改为 true
spring.rabbitmq.listener.direct.auto-startup=true spring.rabbitmq.listener.direct.auto-startup=true
adc-da-main/src/main/resources/application.properties
+2 -2
View File
@@ -144,8 +144,8 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip
# elasticsearch 配置 # elasticsearch 配置
# ============================================================================= # =============================================================================
elasticsearch.clustername=elasticsearch elasticsearch.clustername=elasticsearch
elasticsearch.ip=10.100.5.122 elasticsearch.ip=127.0.0.1
elasticsearch.port=9300 elasticsearch.port=9306
elasticsearch.poolSize=5 elasticsearch.poolSize=5
elas.flag=true elas.flag=true