From 107406dce9640e72e412061b54ed453855e3283d Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 6 May 2019 17:13:21 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=20=E7=A6=81=E6=AD=A2=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E9=98=B2=E6=AD=A2=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=94=99=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 183e0fd..e1e35d5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ target *.jar *.class .md -*.log \ No newline at end of file +*.log +*.properties \ No newline at end of file From 53954638fc0d2551bc86d9402bc37facd1717f1b Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 6 May 2019 18:11:10 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=20=E7=A6=81=E6=AD=A2=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E9=98=B2=E6=AD=A2=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=94=99=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +-- .../i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml | 4 ++-- .../i3plus-core-apiservice/src/main/resources/log4j2-spring-test.xml | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e1e35d5..183e0fd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ target *.jar *.class .md -*.log -*.properties \ No newline at end of file +*.log \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml index 4157b0e..c58e8a4 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml +++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-prod.xml @@ -3,8 +3,8 @@ - - + + [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l 信息:%m%n [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n [SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n diff --git a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-test.xml b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-test.xml index 9f0e4a9..8e00937 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-test.xml +++ b/modules/i3plus-core-apiservice/src/main/resources/log4j2-spring-test.xml @@ -3,8 +3,8 @@ - - + + [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %l 信息:%m%n [%p] %d{yyyy-MM-dd HH:mm:ss-SSS} %c(%M:%L) 信息:%m%n [SYS-%p] %d{yyyy-MM-dd HH:mm:ss-SSS} 系统:%m ( %F -> %M:%L)%n From 3ae4cc40b7a67272e23934d39af549c8ef8b0724 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 6 May 2019 18:59:44 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=20=E7=A6=81=E6=AD=A2=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E9=98=B2=E6=AD=A2=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=94=99=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties index d3a73bc..2f67932 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -111,7 +111,7 @@ impp.schedule.thread-priority=5 #redisIP redis.hostName=192.168.1.240 #端口号 -redis.port=16376 +redis.port=6379 #如果有密码 redis.password= ##其他redis配置需要调整的加在此处 From 52729845d8d59680feff035078d44e753dbeb122 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 6 May 2019 19:04:37 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=20=E7=A6=81=E6=AD=A2=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E9=98=B2=E6=AD=A2=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=94=99=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 183e0fd..e1e35d5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ target *.jar *.class .md -*.log \ No newline at end of file +*.log +*.properties \ No newline at end of file From 1ca22ff7b957aec64bcad120d4a6083bdae68dab Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 7 May 2019 14:03:43 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3Bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/busi/PersonnelController.java | 6 +++--- .../java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index d42e992..3c79d9d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -285,7 +285,6 @@ public class PersonnelController extends CoreBaseController { ValidatorBean.checkNotNull(id, "用户id 不能为空"); Map resultMap = new HashMap<>(); - SysUser user = personnelService.getSysUserById(Long.parseLong(id)); List refUserInfoDepartmentList = personnelService.findSysRefUserDepartmentById(user.getId()); @@ -429,12 +428,13 @@ public class PersonnelController extends CoreBaseController { public ResultBean queryRefDepartment(@RequestBody UserDetailModel model) { try { List idList = new ArrayList<>(); - model.setUserDepartmentIdList(new ArrayList(Arrays.asList(new String[]{"1072037153732694016"}))); List refs = personnelService.querySysRefUserDepartmentByUserDetailModel(model); if(refs != null && refs.size() > 0){ for (SysRefUserDepartment ref : refs) { - idList.add(ref.getUserId()); + if(!idList.contains(ref.getUserId())){ + idList.add(ref.getUserId()); + } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java index 5c93ccb..e4ef032 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/HqlModelPack.java @@ -27,7 +27,7 @@ public class HqlModelPack { // And HqlPack.getNumEqualPack(model.getUserStatus(),"userStatus",result); - HqlPack.getNumEqualPack(model.getUserPhone(),"userPhone",result); + HqlPack.getStringEqualPack(model.getUserPhone(),"userPhone",result); if(idList != null && idList.size() > 0){ HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); From 6e7a6120e520ffb6cce63600a8ed03e97a7a3d0c Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Tue, 7 May 2019 14:24:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=20Docker=20?= =?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 --- .../main/resources/application-docker.properties | 268 ++++++++++----------- 1 file changed, 126 insertions(+), 142 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties index b461bfd..044a0e0 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties @@ -1,128 +1,98 @@ -#项目端口 -server.port=8100 #本机ip impp.server.ip=imppcore +#项目端口 +server.port=8100 #链路追踪zipkin控制台ip地址 impp.console.ip=http://console:8010 - -################ 功能配置1 ################ -#若无法连接注册中心，是否需要一直检测加入 -impp.cluster.fetch=true -#服务注册中心 +#服务注册中心(多注册中心逗号分隔) impp.cluster.regist.center=http://register:8000/eureka/ -#多注册中心 -#impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ - -################ 功能配置2 ################ -#是否允许前端跨域提交impp.web.cross.hosts -impp.web.cross = true - -################ 授权过滤配置 ################ -#用户登陆路径 -filter.shiro.user.loginuri = /login -#系统管理员登陆路径 -filter.shiro.admin.loginuri = /salogin -#运维人员登陆路径 -filter.shiro.saadmin.loginuri = /salogin - -#用户授权过滤路径 -filter.shiro.user.filteruri = /impp/operate/** -#用户授权过滤路径 -filter.shiro.admin.filteruri = /impp/adoperate/* -#用户授权过滤路径 -filter.shiro.saadmin.filteruri = /impp/saoperate/* - -################ 云配置 （以projectName作为应用名） ################ +#日志默认使用log4j2 +logging.config=classpath:log4j2-spring-dev.xml + +########平台相关参数########## +#是否开启redis缓存 +impp.config.redis=true +#是否开启rabbitMQ +impp.config.rabbitmq=true +#是否开启swagger +impp.config.swagger=true +#是否开启websocket +impp.config.websocket=true +#是否开启文件服务 +impp.config.fastdfs=true +#是否对发布服务进行详细日志分析 +impp.log.detail.controller=true +#是否对调用服务进行详细日志分析 +impp.log.detail.service=true #是否开启微服 eureka.client.enabled=true -#（参数配置）注册中心地址 -》 i3plus-ics，多个用逗号分隔 -eureka.client.service-url.defaultZone=${impp.cluster.regist.center} -#区域（源码中包含defaultZone，所以默认使用defaultZone） -#eureka.client.region=estsh -#eureka.client.service-url.estsh:http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ - -################ 本机微服配置 ################ -#本服务主机ip（若多个网卡，则需要设置本服务ip） -eureka.instance.ip-address=${impp.server.ip} -#本服务实例ID -eureka.instance.instance-id=${impp.server.ip}:${server.port} -#本服务主机名 -eureka.instance.hostname=${impp.server.ip} -#本服务状态页面 -eureka.instance.status-page-url=http://${impp.server.ip}:${server.port}/swagger-ui.html -#将自己的IP注册到Eureka Server。若不配置或设置为false，表示注册微服务所在操作系统的hostname到Eureka Server -eureka.instance.prefer-ip-address=true -#是否进行健康检查 -eureka.client.healthcheck.enabled=true - -################ 检测机制 ################ -#心跳间隔周期，宕机限制（秒），30秒没反应视为宕机 -eureka.instance.lease-expiration-duration-in-seconds=30 -#心跳周期 -eureka.instance.lease-renewal-interval-in-seconds=20 - #打开feign的熔断 feign.hystrix.enabled=true -#重试 -ribbon.maxAutoRetries=2 -#读取数据时长 -ribbon.ReadTimeout=10000 -#连接时长 -ribbon.ConnectTimeout=10000 -#响应超过时长，进行熔断（熔断超时需要大于读取时长及连接时长） -hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=15000 -#集群名 -eureka.instance.metadata-map.cluster=impp_cluster - -################ 链路追踪 ################ -#使用web方式传输信息 -spring.zipkin.sender.type=web -#链路追踪服务的地址 -spring.zipkin.base-url=${impp.console.ip} -#追踪深度，百分比，1是全部 -spring.sleuth.sampler.probability=1.0 - -################ 日志据源 ################ -spring.data.mongodb.database=mongoDBSource -spring.data.mongodb.uri=mongodb:27017 -spring.data.mongodb.username=sa -spring.data.mongodb.password=i3plus -spring.data.mongodb.port=27017 - -################ 主数据源 ################ +################ 队列处理 ################ +#站内信 +impp.mq.queue.letter=true +#邮件 +impp.mq.queue.mail=true +#定时任务 +impp.mq.queue.schedule=true +#SWEB通知处理队列 +impp.mq.queue.sweb.notice=true + +################################ 数据库相关设置 ################################ # mysql -#spring.datasource.driver-class-name=com.mysql.jdbc.Driver -#spring.datasource.url=jdbc:mysql://localhost:3306/i3wms -##Sql-server## -#spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver -#spring.datasource.url=jdbc:sqlserver://127.0.0.1:1433;databaseName=i3wms -##oracle## -#spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver -#spring.datasource.url=jdbc:oracle:thin:@127.0.0.1:1521:i3wms -#spring.datasource.username=root -#spring.datasource.password=123456 +spring.datasource.validationQuery=SELECT 1 + +################ 数据池设置 ################ +spring.datasource.maximum-pool-size=10 +spring.datasource.max-active=5 +spring.datasource.max-idle=5 +spring.datasource.min-idle=1 +spring.datasource.initial-size=1 +spring.datasource.max-wait=10000 +spring.datasource.validation-query=SELECT 1 +spring.datasource.test-on-borrow=false +spring.datasource.test-while-idle=true +spring.datasource.time-between-eviction-runs-millis=18800 ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver impp.write.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=root -impp.write.datasource.password=estsh123 +impp.write.datasource.username=impp_i3_core_user +impp.write.datasource.password=impp_i3_core_pwd ##辅数据源，只读 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver impp.read.datasource.jdbc-url=jdbc:mysql://dbslave:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=root -impp.read.datasource.password=estsh123 +impp.read.datasource.username=impp_i3_core_user +impp.read.datasource.password=impp_i3_core_pwd + +################ 日志数据源 ################ +spring.data.mongodb.database=mongoDBSource +spring.data.mongodb.uri=mongodb:27017 +spring.data.mongodb.username=sa +spring.data.mongodb.password=i3plus +spring.data.mongodb.port=27017 + +################ JPA设置设置 ################ +# mysql +spring.jpa.database=MYSQL +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect +#是否显示sql +spring.jpa.show-sql=true +#表关系create,create-drop,update,validate +spring.jpa.properties.hibernate.hbm2ddl.auto=update + + ##############定时任务持久化############## impp.schedule.open=true impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver impp.schedule.datasource.jdbc-url=jdbc:mysql://dbmaster:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=root -impp.schedule.datasource.password=estsh123 +impp.schedule.datasource.username=impp_i3_schedule_user +impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.max-connections=20 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 @@ -136,49 +106,63 @@ impp.schedule.thread-count=10 impp.schedule.thread-priority=5 -################ 数据池设置 ################ -spring.datasource.maximum-pool-size=10 -spring.datasource.max-active=3 -spring.datasource.max-idle=3 -spring.datasource.min-idle=1 -spring.datasource.initial-size=1 -spring.datasource.max-wait=10000 -spring.datasource.validation-query=SELECT 1 -spring.datasource.test-on-borrow=false -spring.datasource.test-while-idle=true -spring.datasource.time-between-eviction-runs-millis=18800 - -################ JPA设置设置 ################ -# mysql -spring.jpa.database=MYSQL -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect -##Sql-server## -#spring.jpa.database=sql_server -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServerDialect -##oracle## -#spring.jpa.database=oracle -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +################################ 其他功能设置 ################################ +#redisIP +redis.hostName=redis +#端口号 +redis.port=6379 +#如果有密码 +redis.password= +##其他redis配置需要调整的加在此处 +################## rabbitMQ配置 #################### +spring.rabbitmq.vhost=/ +spring.rabbitmq.host=rabbitmq +spring.rabbitmq.port=5672 +spring.rabbitmq.username=estsh +spring.rabbitmq.password=estsh123 +##其他rabbitMq配置需要调整的加在此处 + + +################ 微服配置 ################ +#是否进行健康检查 +eureka.client.healthcheck.enabled=true +#若无法连接注册中心，是否需要一直检测加入 +impp.cluster.fetch=true +#集群名 +eureka.instance.metadata-map.cluster=impp_cluster +#（参数配置）注册中心地址 -》 i3plus-ics，多个用逗号分隔 +eureka.client.service-url.defaultZone=${impp.cluster.regist.center} +#本服务主机ip（若多个网卡，则需要设置本服务ip） +eureka.instance.ip-address=${impp.server.ip} +#本服务实例ID +eureka.instance.instance-id=${impp.server.ip}:${server.port} +#本服务主机名 +eureka.instance.hostname=${impp.server.ip} +#本服务状态页面 +eureka.instance.status-page-url=http://${impp.server.ip}:${server.port}/swagger-ui.html +#将自己的IP注册到Eureka Server。若不配置或设置为false，表示注册微服务所在操作系统的hostname到Eureka Server +eureka.instance.prefer-ip-address=true -# mysql -spring.datasource.validationQuery=SELECT 1 -##Sql-server## -# spring.datasource.validationQuery=SELECT 1 -##oracle## -# spring.datasource.validationQuery=SELECT 1 FROM DUAL +################ 检测机制 ################ +#心跳间隔周期，宕机限制（秒），30秒没反应视为宕机 +eureka.instance.lease-expiration-duration-in-seconds=30 +#心跳周期 +eureka.instance.lease-renewal-interval-in-seconds=20 -#ImprovedNamingStrategy / physical_naming_strategy java属性映射到数据库字段时命名规则 -# spring.jpa.properties.hibernate.physical_naming_strategy=org.hibernate.cfg.ImprovedNamingStrategy/org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl -#表关系create,create-drop,update,validate -spring.jpa.properties.hibernate.hbm2ddl.auto=update -#是否显示sql -spring.jpa.show-sql=true +################ 熔断配置 ################ +#重试 +ribbon.maxAutoRetries=2 +#读取数据时长 +ribbon.ReadTimeout=30000 +#连接时长 +ribbon.ConnectTimeout=50000 +#响应超过时长，进行熔断（熔断超时需要大于读取时长及连接时长） +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000 -################ MQ队列处理 ################ -# 站内信 -impp.mq.queue.letter = true -# 邮件 -impp.mq.queue.mail = true -# 定时任务 -impp.mq.queue.schedule = true -# SWEB通知处理队列 -impp.mq.queue.sweb.notice = true \ No newline at end of file +################ 链路追踪 ################ +#使用web方式传输信息 +spring.zipkin.sender.type=web +#链路追踪服务的地址 +spring.zipkin.base-url=${impp.console.ip} +#追踪深度，百分比，1是全部 +spring.sleuth.sampler.probability=1.0 From 5681936c740e711879b2d1863d06308d2ee6d25f Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 8 May 2019 15:29:55 +0800 Subject: [PATCH 7/7] =?UTF-8?q?Docker=20=E9=85=8D=E7=BD=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 18 +++++++++++++++ .../main/resources/application-docker.properties | 22 +++++++++++++++--- .../src/main/resources/application-prod.properties | 19 +++++++++++++++ .../src/main/resources/application-test.properties | 19 +++++++++++++++ .../src/main/resources/fdfs_client.properties | 27 ---------------------- 5 files changed, 75 insertions(+), 30 deletions(-) delete mode 100644 modules/i3plus-core-apiservice/src/main/resources/fdfs_client.properties diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index 8d0e0bf..e9668be 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -166,3 +166,21 @@ spring.zipkin.sender.type=web spring.zipkin.base-url=${impp.console.ip} #追踪深度，百分比，1是全部 spring.sleuth.sampler.probability=1.0 + +################ FastDfs 配置 ################ +#tracker服务器ip +fastdfs.tracker_servers=192.168.1.56:7031 +# tracker的http端口 +fastdfs.http_tracker_http_port=7031 +# 使用自定义工具获取文件展示地址 +fastdfs.http.ui.host=http://dfs.estsh.com +#密码 +#fastdfs.http.secret_key= + +#连接超时 +fastdfs.connect_timeout_in_seconds=5 +#传输超时 +fastdfs.network_timeout_in_seconds=60 +fastdfs.charset=UTF-8 +# token 防盗链功能 +fastdfs.http_anti_steal_token=no \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties index 044a0e0..6f0a297 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties @@ -7,7 +7,7 @@ impp.console.ip=http://console:8010 #服务注册中心(多注册中心逗号分隔) impp.cluster.regist.center=http://register:8000/eureka/ #日志默认使用log4j2 -logging.config=classpath:log4j2-spring-dev.xml +logging.config=classpath:log4j2-spring-prod.xml ########平台相关参数########## #是否开启redis缓存 @@ -85,8 +85,6 @@ spring.jpa.show-sql=true #表关系create,create-drop,update,validate spring.jpa.properties.hibernate.hbm2ddl.auto=update - - ##############定时任务持久化############## impp.schedule.open=true impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver @@ -166,3 +164,21 @@ spring.zipkin.sender.type=web spring.zipkin.base-url=${impp.console.ip} #追踪深度，百分比，1是全部 spring.sleuth.sampler.probability=1.0 + +################ FastDfs 配置 ################ +#tracker服务器ip +fastdfs.tracker_servers=tracker:7031 +# tracker的http端口 +fastdfs.http_tracker_http_port=7031 +# 使用自定义工具获取文件展示地址 +fastdfs.http.ui.host=http://tracker:7030 +#密码 +#fastdfs.http.secret_key= + +#连接超时 +fastdfs.connect_timeout_in_seconds=5 +#传输超时 +fastdfs.network_timeout_in_seconds=60 +fastdfs.charset=UTF-8 +# token 防盗链功能 +fastdfs.http_anti_steal_token=no \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties index 2f67932..1655b14 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -167,3 +167,22 @@ spring.zipkin.sender.type=web spring.zipkin.base-url=${impp.console.ip} #追踪深度，百分比，1是全部 spring.sleuth.sampler.probability=1.0 + + +################ FastDfs 配置 ################ +#tracker服务器ip +fastdfs.tracker_servers=192.168.1.56:7031 +# tracker的http端口 +fastdfs.http_tracker_http_port=7031 +# 使用自定义工具获取文件展示地址 +fastdfs.http.ui.host=http://dfs.estsh.com +#密码 +#fastdfs.http.secret_key= + +#连接超时 +fastdfs.connect_timeout_in_seconds=5 +#传输超时 +fastdfs.network_timeout_in_seconds=60 +fastdfs.charset=UTF-8 +# token 防盗链功能 +fastdfs.http_anti_steal_token=no \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties index 4cc14b9..fdd2276 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -167,3 +167,22 @@ spring.zipkin.sender.type=web spring.zipkin.base-url=${impp.console.ip} #追踪深度，百分比，1是全部 spring.sleuth.sampler.probability=1.0 + + +################ FastDfs 配置 ################ +#tracker服务器ip +fastdfs.tracker_servers=192.168.1.56:7031 +# tracker的http端口 +fastdfs.http_tracker_http_port=7031 +# 使用自定义工具获取文件展示地址 +fastdfs.http.ui.host=http://dfs.estsh.com +#密码 +#fastdfs.http.secret_key= + +#连接超时 +fastdfs.connect_timeout_in_seconds=5 +#传输超时 +fastdfs.network_timeout_in_seconds=60 +fastdfs.charset=UTF-8 +# token 防盗链功能 +fastdfs.http_anti_steal_token=no \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/resources/fdfs_client.properties b/modules/i3plus-core-apiservice/src/main/resources/fdfs_client.properties deleted file mode 100644 index 84166b1..0000000 --- a/modules/i3plus-core-apiservice/src/main/resources/fdfs_client.properties +++ /dev/null @@ -1,27 +0,0 @@ -#tracker服务器ip -fastdfs.tracker_servers=192.168.1.56:7031 -# tracker的http端口 -fastdfs.http_tracker_http_port=7031 -# 使用自定义工具获取文件展示地址 -fastdfs.http.ui.host=http://dfs.estsh.com -#密码 -#fastdfs.http.secret_key= - -#连接超时 -fastdfs.connect_timeout_in_seconds=5 -#传输超时 -fastdfs.network_timeout_in_seconds=60 -fastdfs.charset=UTF-8 -# token 防盗链功能 -fastdfs.http_anti_steal_token=no - -# V2.0引入的这个参数，工作线程数，通常设置为CPU数 -#fastdfs.work_threads=4 -#设置为true表示开启token验证 -#http.anti_steal.check_token=true -#设置token失效的时间单位为秒(s) -#http.anti_steal.token_ttl=1800 -#密钥，跟客户端配置文件的fastdfs.http_secret_key保持一致 -#http.anti_steal.secret_key=FASTDFS1234567890 -#如果token检查失败，返回的页面 -#http.anti_steal.token_check_fail=/ljzsg/fastdfs/page/403.html \ No newline at end of file