huoran
/
dqFinancial
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
river 4 years ago
parent 0a7301a88c 4fcd81e15f
commit 96091ac0d9
7 changed files with 130 additions and 291 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      dq-financial-crms/src/main/resources/bootstrap.properties
  2. 39
      dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
  3. 71
      dq-financial-guarantee/src/main/resources/bootstrap.properties
  4. 80
      dq-financial-hrms-auth/src/main/resources/bootstrap.properties
  5. 75
      dq-financial-hrms/src/main/resources/bootstrap.properties
  6. 8
      dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
  7. 51
      dq-govern-gateway/src/main/resources/bootstrap.properties

71
dq-financial-crms/src/main/resources/bootstrap.properties
Unescape View File

@ -1,32 +1,26 @@
# 开发和测试环境（dev）
#服务名称 #服务名称
spring.application.name=dq-financial-crms spring.application.name=dq-financial-crms
#配置中心地址 #配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354 spring.cloud.nacos.config.file-extension=yml
#spring.cloud.nacos.config.group=prod #redis配置
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.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=123456 spring.redis.password=
spring.redis.database=0 spring.redis.database=0
spring.redis.timeout=30000 spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 spring.redis.jedis.pool.max-active=8
spring.redis.jedis.pool.max-wait=-1 spring.redis.jedis.pool.max-wait=-1
spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.max-idle=8
spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0
#本地测试环境
#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
#请求处理的超时时间 #请求处理的超时时间
ribbon.ReadTimeout: 120000 ribbon.ReadTimeout: 120000
@ -52,44 +46,3 @@ ribbon.ConnectTimeout: 120000
#spring.cloud.nacos.config.ext-config[2].data-id=other.yml #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].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true #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

39
dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
Unescape View File

@ -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.DgWorkConferencePO;
import com.daqing.framework.domain.guarantee.po.StatusPO; import com.daqing.framework.domain.guarantee.po.StatusPO;
import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.exception.ExceptionCast;
import com.daqing.framework.model.StatusCode;
import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.model.response.PromptSuccess;
import com.daqing.framework.util.RedisUtil; import com.daqing.framework.util.RedisUtil;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -308,7 +309,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
statusPO.setProcessId(2); statusPO.setProcessId(2);
statusPO.setName(name); statusPO.setName(name);
statusPO.setStatus(status); statusPO.setStatus(status);
//相同业务中，如果已经是待处理则数据不覆盖
StatusPO po = (StatusPO)hashMap.get(businessId);
if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
hashMap.put(businessId, statusPO); hashMap.put(businessId, statusPO);
}
}); });
} }
} }
@ -330,7 +335,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
statusPO.setProcessId(3); statusPO.setProcessId(3);
statusPO.setName(name); statusPO.setName(name);
statusPO.setStatus(status); statusPO.setStatus(status);
//相同业务中，如果已经是待处理则数据不覆盖
StatusPO po = (StatusPO)hashMap.get(businessId);
if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
hashMap.put(businessId, statusPO); hashMap.put(businessId, statusPO);
}
}); });
} }
} }
@ -352,7 +361,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
statusPO.setProcessId(4); statusPO.setProcessId(4);
statusPO.setName(name); statusPO.setName(name);
statusPO.setStatus(status); statusPO.setStatus(status);
//相同业务中，如果已经是待处理则数据不覆盖
StatusPO po = (StatusPO)hashMap.get(businessId);
if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
hashMap.put(businessId, statusPO); hashMap.put(businessId, statusPO);
}
}); });
} }
} }
@ -375,7 +388,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
statusPO.setProcessId(5); statusPO.setProcessId(5);
statusPO.setName(name); statusPO.setName(name);
statusPO.setStatus(status); statusPO.setStatus(status);
//相同业务中，如果已经是待处理则数据不覆盖
StatusPO po = (StatusPO)hashMap.get(businessId);
if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
hashMap.put(businessId, statusPO); hashMap.put(businessId, statusPO);
}
}); });
} }
} }
@ -396,7 +413,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
statusPO.setProcessId(6); statusPO.setProcessId(6);
statusPO.setName(name); statusPO.setName(name);
statusPO.setStatus(status); statusPO.setStatus(status);
//相同业务中，如果已经是待处理则数据不覆盖
StatusPO po = (StatusPO)hashMap.get(businessId);
if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
hashMap.put(businessId, statusPO); hashMap.put(businessId, statusPO);
}
}); });
} }
} }
@ -417,7 +438,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
statusPO.setProcessId(7); statusPO.setProcessId(7);
statusPO.setName(name); statusPO.setName(name);
statusPO.setStatus(status); statusPO.setStatus(status);
//相同业务中，如果已经是待处理则数据不覆盖
StatusPO po = (StatusPO)hashMap.get(businessId);
if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
hashMap.put(businessId, statusPO); hashMap.put(businessId, statusPO);
}
}); });
} }
} }
@ -439,7 +464,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
statusPO.setProcessId(8); statusPO.setProcessId(8);
statusPO.setName(name); statusPO.setName(name);
statusPO.setStatus(status); statusPO.setStatus(status);
//相同业务中，如果已经是待处理则数据不覆盖
StatusPO po = (StatusPO)hashMap.get(businessId);
if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
hashMap.put(businessId, statusPO); hashMap.put(businessId, statusPO);
}
}); });
} }
} }
@ -461,7 +490,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
statusPO.setProcessId(9); statusPO.setProcessId(9);
statusPO.setName(name); statusPO.setName(name);
statusPO.setStatus(status); statusPO.setStatus(status);
//相同业务中，如果已经是待处理则数据不覆盖
StatusPO po = (StatusPO)hashMap.get(businessId);
if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
hashMap.put(businessId, statusPO); hashMap.put(businessId, statusPO);
}
}); });
} }
} }
@ -483,7 +516,11 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
statusPO.setProcessId(10); statusPO.setProcessId(10);
statusPO.setName(name); statusPO.setName(name);
statusPO.setStatus(status); statusPO.setStatus(status);
//相同业务中，如果已经是待处理则数据不覆盖
StatusPO po = (StatusPO)hashMap.get(businessId);
if (!po.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)){
hashMap.put(businessId, statusPO); hashMap.put(businessId, statusPO);
}
}); });
} }
} }
@ -501,8 +538,6 @@ public class DgEfficiencyServiceImpl extends ServiceImpl<DgEfficiencyMapper, DgA
DgApplyAmountInfo dgApplyAmountInfo = applyAmountInfoMapper.selectById(key); DgApplyAmountInfo dgApplyAmountInfo = applyAmountInfoMapper.selectById(key);
//业务申请日期 //业务申请日期
Date createTime = dgApplyAmountInfo.getCreateTime(); Date createTime = dgApplyAmountInfo.getCreateTime();
//客户公司id
Integer companyId = dgApplyAmountInfo.getCompanyId();
//提单人id //提单人id
Integer presenterId = dgApplyAmountInfo.getPresenterId(); Integer presenterId = dgApplyAmountInfo.getPresenterId();
efficiencyListResponse.setOperatingStatus(operatingStatus); efficiencyListResponse.setOperatingStatus(operatingStatus);

71
dq-financial-guarantee/src/main/resources/bootstrap.properties
Unescape View File

@ -1,25 +1,12 @@
#服务名称 #服务名称
spring.application.name=dq-financial-guarantee spring.application.name=dq-financial-guarantee
#配置中心地址 #配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.namespace=58fa89c6-0e23-4530-ac13-95747e873c60 spring.cloud.nacos.config.file-extension=yml
#spring.cloud.nacos.config.group=prod #redis配置
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.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=123456 spring.redis.password=
spring.redis.database=0 spring.redis.database=0
spring.redis.timeout=30000 spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 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.max-idle=8
spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0
#本地测试环境
#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
#请求处理的超时时间 #请求处理的超时时间
ribbon.ReadTimeout: 120000 ribbon.ReadTimeout: 120000
#请求连接的超时时间 #请求连接的超时时间
ribbon.ConnectTimeout: 120000 ribbon.ConnectTimeout: 120000
# 上传文件总的最大值 # 上传文件总的最大值
#spring.servlet.multipart.max-request-size=10MB #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].data-id=mybatis.yml
#spring.cloud.nacos.config.ext-config[2].group=prod #spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true #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

80
dq-financial-hrms-auth/src/main/resources/bootstrap.properties
Unescape View File

@ -1,25 +1,12 @@
# 开发和测试环境（dev） #服务名称
spring.application.name=dq-financial-hrms-auth spring.application.name=dq-financial-hrms-auth
#配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.namespace=7632bdaa-3381-4669-b3f9-2fc73be451e8 spring.cloud.nacos.config.file-extension=yml
#spring.cloud.nacos.config.group=prod #redis配置
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.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=123456 spring.redis.password=
spring.redis.database=0 spring.redis.database=0
spring.redis.timeout=30000 spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 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.max-idle=8
spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0
#本地测试环境
#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
#请求处理的超时时间
ribbon.ReadTimeout: 120000
#请求连接的超时时间
ribbon.ConnectTimeout: 30000
#正式环境（prod） #正式环境（prod）
#spring.application.name=dq-financial-hrms-auth #spring.application.name=dq-financial-hrms-auth
@ -46,44 +47,3 @@ 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].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod #spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true #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

75
dq-financial-hrms/src/main/resources/bootstrap.properties
Unescape View File

@ -1,25 +1,12 @@
##服务名称 ##服务名称
spring.application.name=dq-financial-hrms spring.application.name=dq-financial-hrms
#配置中心地址 #配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.namespace=4c56c2f9-b6a3-4e7b-88b8-b1001e86dfd6 spring.cloud.nacos.config.file-extension=yml
#spring.cloud.nacos.config.group=prod #redis配置
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.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=123456 spring.redis.password=
spring.redis.database=0 spring.redis.database=0
spring.redis.timeout=30000 spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 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.max-idle=8
spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0
#本地测试环境
#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
#请求处理的超时时间 #请求处理的超时时间
ribbon.ReadTimeout: 120000 ribbon.ReadTimeout: 120000
#请求连接的超时时间 #请求连接的超时时间
ribbon.ConnectTimeout: 30000 ribbon.ConnectTimeout: 30000
spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB spring.servlet.multipart.max-request-size=10MB
@ -55,47 +50,3 @@ 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].data-id=other.yml
#spring.cloud.nacos.config.ext-config[2].group=prod #spring.cloud.nacos.config.ext-config[2].group=prod
#spring.cloud.nacos.config.ext-config[2].refresh=true #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

8
dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java
Unescape View File

@ -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 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[] LETTERS = {"A","B","C","D","E"}; // 员工姓名重复时自动加的字母,可再添加
public static final String STATUS_REFUSE = "拒绝"; 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//"; // 附件文件存放路径 public static final String FILE_URL_PATH = "//usr//local//nginx//html//admin//enclosureFile//"; // 附件文件存放路径

51
dq-govern-gateway/src/main/resources/bootstrap.properties
Unescape View File

@ -1,16 +1,12 @@
#服务名称 #服务名称
spring.application.name=dq-govern-gateway spring.application.name=dq-govern-gateway
#配置中心地址 #配置中心地址
spring.cloud.nacos.config.server-addr=192.168.31.140:8848 spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.namespace=772e2607-b929-4246-9671-ee5a36d74d25 spring.cloud.nacos.config.file-extension=yml
#redis配置
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.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379
spring.redis.password=123456 spring.redis.password=
spring.redis.database=0 spring.redis.database=0
spring.redis.timeout=30000 spring.redis.timeout=30000
spring.redis.jedis.pool.max-active=8 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.max-idle=8
spring.redis.jedis.pool.min-idle=0 spring.redis.jedis.pool.min-idle=0
#本地测试环境
#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.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB
# 正式环境（prod） # 正式环境（prod）
#服务名称 #服务名称
#spring.application.name=dq-govern-gateway #spring.application.name=dq-govern-gateway
@ -38,30 +46,3 @@ spring.redis.jedis.pool.min-idle=0
#spring.redis.jedis.pool.max-wait=-1 #spring.redis.jedis.pool.max-wait=-1
#spring.redis.jedis.pool.max-idle=8 #spring.redis.jedis.pool.max-idle=8
#spring.redis.jedis.pool.min-idle=0 #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
Write Preview
Loading…
Cancel
Save