From e1542733b722c76b3544c53b394e96a3df9e9a6a Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Mon, 11 Jan 2021 10:44:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=88=E7=8E=87?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DgEfficiencyServiceImpl.java | 57 +++++++++++++++---- 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java index ac094246..badbf56a 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java @@ -25,6 +25,7 @@ import com.daqing.framework.domain.guarantee.GuaranteeCode; import com.daqing.framework.domain.guarantee.po.DgWorkConferencePO; import com.daqing.framework.domain.guarantee.po.StatusPO; import com.daqing.framework.exception.ExceptionCast; +import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.util.RedisUtil; import com.google.common.collect.Maps; @@ -308,7 +309,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl Date: Mon, 11 Jan 2021 16:20:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.properties | 73 +++-------------- .../src/main/resources/bootstrap.properties | 71 +++------------- .../src/main/resources/bootstrap.properties | 82 +++++-------------- .../src/main/resources/bootstrap.properties | 77 ++++------------- .../src/main/resources/bootstrap.properties | 53 ++++-------- 5 files changed, 78 insertions(+), 278 deletions(-) diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index fe1ce1cd..0f2fe159 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -1,32 +1,26 @@ -# 开发和测试环境（dev） #服务名称 spring.application.name=dq-financial-crms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 -spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354 -#spring.cloud.nacos.config.group=prod - -spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -spring.cloud.nacos.config.ext-config[0].group=dev -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -spring.cloud.nacos.config.ext-config[1].group=dev -spring.cloud.nacos.config.ext-config[1].refresh=true - -spring.cloud.nacos.config.ext-config[2].data-id=other.yml -spring.cloud.nacos.config.ext-config[2].group=dev -spring.cloud.nacos.config.ext-config[2].refresh=true - +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password=123456 +spring.redis.password= spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 +#本地测试环境 +#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce + +#线上测试环境 +#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 + +#线上生产环境 +spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 #请求处理的超时时间 ribbon.ReadTimeout: 120000 @@ -51,45 +45,4 @@ ribbon.ConnectTimeout: 120000 # #spring.cloud.nacos.config.ext-config[2].data-id=other.yml #spring.cloud.nacos.config.ext-config[2].group=prod -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password=dq123456 -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 - - -# 测试环境（prod） -#服务名称 -#spring.application.name=dq-financial-crms -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.namespace=1912aa66-6e18-4680-8943-5b8fae71414c -##spring.cloud.nacos.config.group=prod -# -#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -#spring.cloud.nacos.config.ext-config[0].group=prod -#spring.cloud.nacos.config.ext-config[0].refresh=true -# -#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -#spring.cloud.nacos.config.ext-config[1].group=prod -#spring.cloud.nacos.config.ext-config[1].refresh=true -# -#spring.cloud.nacos.config.ext-config[2].data-id=other.yml -#spring.cloud.nacos.config.ext-config[2].group=prod -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +#spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index e7f3f91c..68366ab4 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -1,25 +1,12 @@ #服务名称 spring.application.name=dq-financial-guarantee #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 -spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60 -#spring.cloud.nacos.config.group=prod - -spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml -spring.cloud.nacos.config.ext-config[0].group=dev -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml -spring.cloud.nacos.config.ext-config[1].group=dev -spring.cloud.nacos.config.ext-config[1].refresh=true - -spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml -spring.cloud.nacos.config.ext-config[2].group=dev -spring.cloud.nacos.config.ext-config[2].refresh=true - +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password=123456 +spring.redis.password= spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 @@ -27,13 +14,21 @@ spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 +#本地测试环境 +#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce + +#线上测试环境 +#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 + +#线上生产环境 +spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 + #请求处理的超时时间 ribbon.ReadTimeout: 120000 #请求连接的超时时间 ribbon.ConnectTimeout: 120000 - # 上传文件总的最大值 #spring.servlet.multipart.max-request-size=10MB ## 单个文件的最大值 @@ -57,43 +52,3 @@ ribbon.ConnectTimeout: 120000 #spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml #spring.cloud.nacos.config.ext-config[2].group=prod #spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password=dq123456 -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 - - -#测试服务器环境（prod） -#服务名称 -#spring.application.name=dq-financial-guarantee -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.namespace=66fce8ff-5ca8-412d-bc06-b8730fa65869 -# -#spring.cloud.nacos.config.ext-config[0].data-id=dq-financial-guarantee.yml -#spring.cloud.nacos.config.ext-config[0].group=prod -#spring.cloud.nacos.config.ext-config[0].refresh=true -# -#spring.cloud.nacos.config.ext-config[1].data-id=datasource.yml -#spring.cloud.nacos.config.ext-config[1].group=prod -#spring.cloud.nacos.config.ext-config[1].refresh=true -# -#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml -#spring.cloud.nacos.config.ext-config[2].group=prod -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index 91ca0930..15024919 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -1,25 +1,12 @@ -# 开发和测试环境（dev） +#服务名称 spring.application.name=dq-financial-hrms-auth - -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 -spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8 -#spring.cloud.nacos.config.group=prod - -spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -spring.cloud.nacos.config.ext-config[0].group=dev -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -spring.cloud.nacos.config.ext-config[1].group=dev -spring.cloud.nacos.config.ext-config[1].refresh=true - -spring.cloud.nacos.config.ext-config[2].data-id=other.yml -spring.cloud.nacos.config.ext-config[2].group=dev -spring.cloud.nacos.config.ext-config[2].refresh=true - +#配置中心地址 +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password=123456 +spring.redis.password= spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 @@ -27,6 +14,20 @@ spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 +#本地测试环境 +#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce + +#线上测试环境 +#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 + +#线上生产环境 +spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 + +#请求处理的超时时间 +ribbon.ReadTimeout: 120000 +#请求连接的超时时间 +ribbon.ConnectTimeout: 30000 + #正式环境（prod） #spring.application.name=dq-financial-hrms-auth @@ -45,45 +46,4 @@ spring.redis.jedis.pool.min-idle=0 # #spring.cloud.nacos.config.ext-config[2].data-id=other.yml #spring.cloud.nacos.config.ext-config[2].group=prod -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password=dq123456 -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 - -#feign.okhttp.enabled=true - -#测试环境（prod） -#spring.application.name=dq-financial-hrms-auth -# -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.namespace=d4e087eb-2a9b-4ef1-9f22-76269a30d081 -##spring.cloud.nacos.config.group=prod -# -#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -#spring.cloud.nacos.config.ext-config[0].group=prod -#spring.cloud.nacos.config.ext-config[0].refresh=true -# -#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -#spring.cloud.nacos.config.ext-config[1].group=prod -#spring.cloud.nacos.config.ext-config[1].refresh=true -# -#spring.cloud.nacos.config.ext-config[2].data-id=other.yml -#spring.cloud.nacos.config.ext-config[2].group=prod -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +#spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties index f933c6cf..08cd2024 100644 --- a/dq-financial-hrms/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms/src/main/resources/bootstrap.properties @@ -1,25 +1,12 @@ #服务名称 spring.application.name=dq-financial-hrms #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 -spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6 -#spring.cloud.nacos.config.group=prod - -spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -spring.cloud.nacos.config.ext-config[0].group=dev -spring.cloud.nacos.config.ext-config[0].refresh=true - -spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -spring.cloud.nacos.config.ext-config[1].group=dev -spring.cloud.nacos.config.ext-config[1].refresh=true - -spring.cloud.nacos.config.ext-config[2].data-id=other.yml -spring.cloud.nacos.config.ext-config[2].group=dev -spring.cloud.nacos.config.ext-config[2].refresh=true - +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password=123456 +spring.redis.password= spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 @@ -27,12 +14,20 @@ spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 +#本地测试环境 +#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce + +#线上测试环境 +#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 + +#线上生产环境 +spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 + #请求处理的超时时间 ribbon.ReadTimeout: 120000 #请求连接的超时时间 ribbon.ConnectTimeout: 30000 - spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-request-size=10MB @@ -54,48 +49,4 @@ spring.servlet.multipart.max-request-size=10MB # #spring.cloud.nacos.config.ext-config[2].data-id=other.yml #spring.cloud.nacos.config.ext-config[2].group=prod -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password=dq123456 -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 - -# -#spring.servlet.multipart.max-file-size=10MB -#spring.servlet.multipart.max-request-size=10MB - -# 测试环境（prod） -#服务名称 -#spring.application.name=dq-financial-hrms -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.namespace=ed20f51f-6038-44e6-8e28-7ac72625e7b0 -##spring.cloud.nacos.config.group=prod -# -#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -#spring.cloud.nacos.config.ext-config[0].group=prod -#spring.cloud.nacos.config.ext-config[0].refresh=true -# -#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -#spring.cloud.nacos.config.ext-config[1].group=prod -#spring.cloud.nacos.config.ext-config[1].refresh=true -# -#spring.cloud.nacos.config.ext-config[2].data-id=other.yml -#spring.cloud.nacos.config.ext-config[2].group=prod -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +#spring.cloud.nacos.config.ext-config[2].refresh=true \ No newline at end of file diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index e97cb33e..f0e25c0e 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -1,16 +1,12 @@ #服务名称 spring.application.name=dq-govern-gateway #配置中心地址 -spring.cloud.nacos.config.server-addr=192.168.31.140:8848 -spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25 - -spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml -spring.cloud.nacos.config.ext-config[0].group=dev -spring.cloud.nacos.config.ext-config[0].refresh=true - +spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.file-extension=yml +#redis配置 spring.redis.host=127.0.0.1 spring.redis.port=6379 -spring.redis.password=123456 +spring.redis.password= spring.redis.database=0 spring.redis.timeout=30000 spring.redis.jedis.pool.max-active=8 @@ -18,6 +14,18 @@ spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 +#本地测试环境 +#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce + +#线上测试环境 +#spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 + +#线上生产环境 +spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 + +spring.servlet.multipart.max-file-size=10MB +spring.servlet.multipart.max-request-size=10MB + # 正式环境（prod） #服务名称 #spring.application.name=dq-govern-gateway @@ -37,31 +45,4 @@ spring.redis.jedis.pool.min-idle=0 #spring.redis.jedis.pool.max-active=8 #spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 -# -#spring.servlet.multipart.max-file-size=10MB -#spring.servlet.multipart.max-request-size=10MB - -# 测试环境（prod） -#服务名称 -#spring.application.name=dq-govern-gateway -##配置中心地址 -#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -#spring.cloud.nacos.config.namespace=8a913b60-2335-4657-9048-7392c8d0899f -# -#spring.cloud.nacos.config.ext-config[0].data-id=dq-govern-gateway.yml -#spring.cloud.nacos.config.ext-config[0].group=prod -#spring.cloud.nacos.config.ext-config[0].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password= -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 -# -#spring.servlet.multipart.max-file-size=10MB -#spring.servlet.multipart.max-request-size=10MB \ No newline at end of file +#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file From a5f997cb2cfc5510564fe9bc819113aaee17640a Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Mon, 11 Jan 2021 16:32:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dq-financial-crms/src/main/resources/bootstrap.properties | 2 +- .../src/main/resources/bootstrap.properties | 2 +- .../src/main/resources/bootstrap.properties | 2 +- dq-financial-hrms/src/main/resources/bootstrap.properties | 2 +- .../daqing/framework/model/response/PromptSuccess.java | 8 ++++++-- dq-govern-gateway/src/main/resources/bootstrap.properties | 4 ++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties index 0f2fe159..ac484fb6 100644 --- a/dq-financial-crms/src/main/resources/bootstrap.properties +++ b/dq-financial-crms/src/main/resources/bootstrap.properties @@ -14,7 +14,7 @@ spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce +#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 diff --git a/dq-financial-guarantee/src/main/resources/bootstrap.properties b/dq-financial-guarantee/src/main/resources/bootstrap.properties index 68366ab4..9a445e56 100644 --- a/dq-financial-guarantee/src/main/resources/bootstrap.properties +++ b/dq-financial-guarantee/src/main/resources/bootstrap.properties @@ -15,7 +15,7 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce +#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index 15024919..838e5c90 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -15,7 +15,7 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce +#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 diff --git a/dq-financial-hrms/src/main/resources/bootstrap.properties b/dq-financial-hrms/src/main/resources/bootstrap.properties index 08cd2024..d6a5c682 100644 --- a/dq-financial-hrms/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms/src/main/resources/bootstrap.properties @@ -15,7 +15,7 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce +#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 diff --git a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java index 824725c6..e532e026 100644 --- a/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java +++ b/dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java @@ -32,13 +32,17 @@ public class PromptSuccess { public static final String UPLOAD_FILE_PATH = "//usr//local//nginx//html//admin//headImg//"; // linux图片存放路径 - public static final String IMAGE_URL_PATH = "http://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径 + //public static final String IMAGE_URL_PATH = "http://www.huorantech.cn/headImg/"; // 数据库/预加载图片路径 + //public static final String IMAGE_URL_PATH = "http://8.129.127.185:8080/headImg/"; // 数据库/预加载图片路径 + public static final String IMAGE_URL_PATH = "http://47.107.237.129:8080/headImg/"; // 数据库/预加载图片路径 public static final String[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加 public static final String STATUS_REFUSE = "拒绝"; - public static final String ENCLOSUREFILE_URL_PATH = "http://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径 + //public static final String ENCLOSUREFILE_URL_PATH = "http://www.huorantech.cn/enclosureFile/"; // 附件文件存放路径 + //public static final String ENCLOSUREFILE_URL_PATH = "http://8.129.127.185:8080/enclosureFile/"; // 附件文件存放路径 + public static final String ENCLOSUREFILE_URL_PATH = "http://47.107.237.129:8080/enclosureFile/"; // 附件文件存放路径 public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径 diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index f0e25c0e..6dea21cb 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -15,13 +15,13 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -#spring.cloud.nacos.config.namespace=5921ca23-3700-48ba-95fd-e078b53dfdce +spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #线上生产环境 -spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 +#spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-request-size=10MB From 4fcd81e15fe0fdd69f8b8bc0b88be64254d7d40c Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Mon, 11 Jan 2021 17:03:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dq-govern-gateway/src/main/resources/bootstrap.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dq-govern-gateway/src/main/resources/bootstrap.properties b/dq-govern-gateway/src/main/resources/bootstrap.properties index 6dea21cb..ee5f1b55 100644 --- a/dq-govern-gateway/src/main/resources/bootstrap.properties +++ b/dq-govern-gateway/src/main/resources/bootstrap.properties @@ -15,13 +15,13 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 #本地测试环境 -spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 #线上生产环境 -#spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 +spring.cloud.nacos.config.namespace=6054a175-069a-492d-8679-820758416406 spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-request-size=10MB