From 0036fe63364fb92ffc0255e38f38a3af5c6b7f6b Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Tue, 17 Jun 2025 09:51:47 +0800
Subject: [PATCH] fix:办理反馈优化；配置文件优化
---
dyh-gateway/src/main/resources/config/application-prod.yml | 69 +++++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java | 2
dyh-eureka/src/main/resources/config/application-dev.yml | 35 +++++
dyh-eureka/src/main/resources/config/application-prod.yml | 35 +++++
dyh-eureka/src/main/resources/config/application-test.yml | 35 +++++
dyh-eureka/src/main/resources/config/application.yml | 34 ++++
dyh-gateway/src/main/resources/config/application-test.yml | 68 +++++++++
dyh-gateway/src/main/resources/config/application.yml | 58 ++++++++
dyh-gateway/src/main/resources/config/application-dev.yml | 69 +++++++++
9 files changed, 404 insertions(+), 1 deletions(-)
diff --git a/dyh-eureka/src/main/resources/config/application-dev.yml b/dyh-eureka/src/main/resources/config/application-dev.yml
new file mode 100644
index 0000000..8db2398
--- /dev/null
+++ b/dyh-eureka/src/main/resources/config/application-dev.yml
@@ -0,0 +1,35 @@
+#server配置
+server:
+ port: 9001
+
+#spring配置
+spring:
+ application:
+ name: dyh-eureka
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: false
+
+#注册中心配置
+eureka:
+ client:
+ serviceUrl:
+ defaultZone: http://localhost:9001/eureka #集群部署,互相注册
+ register-with-eureka: false #是否注册到注册中心 单点部署设置false 集群部署设置true
+ fetch-registry: false #是否从注册中心拉取注册服务列表 单点部署设置false 集群部署设置true
+ server:
+ enable-self-preservation: false #自我保护模式，打开坑比好处多，所以先关闭它
+ eviction-interval-timer-in-ms: 5000 #主动清理无效节点的时间间隔 默认60000毫秒，即60秒
+ renewal-threshold-update-interval-ms: 120000 #心跳阈值计算周期，单位毫秒，默认为15分钟，如果开启自我保护模式，可以改一下这个配置
+ peer-node-read-timeout-ms: 500 #读取对等节点服务器复制的超时的时间，单位毫秒，默认为200
+ useReadOnlyResponseCache: false #禁用readOnlyCacheMap
+ instance:
+ prefer-ip-address: true
+ instance-id: ${spring.cloud.client.ip-address}:${server.port}
+ #hostname: localhost
+ lease-renewal-interval-in-seconds: 5 # 心跳间隔时间（默认是30秒）
+ lease-expiration-duration-in-seconds: 15 # 没有心跳的淘汰时间间隔（默认是90秒）
+ status-page-url-path: /actuator/info #eureka注册中心的url link
+ health-check-url-path: /actuator/health #健康检查的url
+
diff --git a/dyh-eureka/src/main/resources/config/application-prod.yml b/dyh-eureka/src/main/resources/config/application-prod.yml
new file mode 100644
index 0000000..8db2398
--- /dev/null
+++ b/dyh-eureka/src/main/resources/config/application-prod.yml
@@ -0,0 +1,35 @@
+#server配置
+server:
+ port: 9001
+
+#spring配置
+spring:
+ application:
+ name: dyh-eureka
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: false
+
+#注册中心配置
+eureka:
+ client:
+ serviceUrl:
+ defaultZone: http://localhost:9001/eureka #集群部署,互相注册
+ register-with-eureka: false #是否注册到注册中心 单点部署设置false 集群部署设置true
+ fetch-registry: false #是否从注册中心拉取注册服务列表 单点部署设置false 集群部署设置true
+ server:
+ enable-self-preservation: false #自我保护模式，打开坑比好处多，所以先关闭它
+ eviction-interval-timer-in-ms: 5000 #主动清理无效节点的时间间隔 默认60000毫秒，即60秒
+ renewal-threshold-update-interval-ms: 120000 #心跳阈值计算周期，单位毫秒，默认为15分钟，如果开启自我保护模式，可以改一下这个配置
+ peer-node-read-timeout-ms: 500 #读取对等节点服务器复制的超时的时间，单位毫秒，默认为200
+ useReadOnlyResponseCache: false #禁用readOnlyCacheMap
+ instance:
+ prefer-ip-address: true
+ instance-id: ${spring.cloud.client.ip-address}:${server.port}
+ #hostname: localhost
+ lease-renewal-interval-in-seconds: 5 # 心跳间隔时间（默认是30秒）
+ lease-expiration-duration-in-seconds: 15 # 没有心跳的淘汰时间间隔（默认是90秒）
+ status-page-url-path: /actuator/info #eureka注册中心的url link
+ health-check-url-path: /actuator/health #健康检查的url
+
diff --git a/dyh-eureka/src/main/resources/config/application-test.yml b/dyh-eureka/src/main/resources/config/application-test.yml
new file mode 100644
index 0000000..088c92d
--- /dev/null
+++ b/dyh-eureka/src/main/resources/config/application-test.yml
@@ -0,0 +1,35 @@
+#server配置
+server:
+ port: 9011
+
+#spring配置
+spring:
+ application:
+ name: dyh-eureka
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: false
+
+#注册中心配置
+eureka:
+ client:
+ serviceUrl:
+ defaultZone: http://localhost:9011/eureka #集群部署,互相注册
+ register-with-eureka: false #是否注册到注册中心 单点部署设置false 集群部署设置true
+ fetch-registry: false #是否从注册中心拉取注册服务列表 单点部署设置false 集群部署设置true
+ server:
+ enable-self-preservation: false #自我保护模式，打开坑比好处多，所以先关闭它
+ eviction-interval-timer-in-ms: 5000 #主动清理无效节点的时间间隔 默认60000毫秒，即60秒
+ renewal-threshold-update-interval-ms: 120000 #心跳阈值计算周期，单位毫秒，默认为15分钟，如果开启自我保护模式，可以改一下这个配置
+ peer-node-read-timeout-ms: 500 #读取对等节点服务器复制的超时的时间，单位毫秒，默认为200
+ useReadOnlyResponseCache: false #禁用readOnlyCacheMap
+ instance:
+ prefer-ip-address: true
+ instance-id: ${spring.cloud.client.ip-address}:${server.port}
+ #hostname: localhost
+ lease-renewal-interval-in-seconds: 5 # 心跳间隔时间（默认是30秒）
+ lease-expiration-duration-in-seconds: 15 # 没有心跳的淘汰时间间隔（默认是90秒）
+ status-page-url-path: /actuator/info #eureka注册中心的url link
+ health-check-url-path: /actuator/health #健康检查的url
+
diff --git a/dyh-eureka/src/main/resources/config/application.yml b/dyh-eureka/src/main/resources/config/application.yml
new file mode 100644
index 0000000..cff671e
--- /dev/null
+++ b/dyh-eureka/src/main/resources/config/application.yml
@@ -0,0 +1,34 @@
+#spring配置
+spring:
+ profiles:
+ active:
+# - dev
+# - test
+ - prod
+
+#server配置
+server:
+ tomcat:
+ min-spare-threads: 100
+ max-threads: 256
+ connection-timeout: 8000
+ servlet:
+ context-path: /
+ ssl:
+ enabled: false
+
+#management配置
+management:
+ endpoint:
+ health:
+ show-details: always
+ endpoints:
+ web:
+ exposure:
+ include: "*"
+ exclude: env,health
+ enabled-by-default: false
+
+eureka:
+ dashboard:
+ enabled: false
diff --git a/dyh-gateway/src/main/resources/config/application-dev.yml b/dyh-gateway/src/main/resources/config/application-dev.yml
new file mode 100644
index 0000000..eb36178
--- /dev/null
+++ b/dyh-gateway/src/main/resources/config/application-dev.yml
@@ -0,0 +1,69 @@
+#server配置
+server:
+ port: 9002
+
+#spring配置
+spring:
+ #服务名
+ application:
+ name: dyh-gateway
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: false
+
+#注册中心配置
+eureka:
+ client:
+ service-url:
+ #注册中心单机
+ defaultZone: http://localhost:9001/eureka
+ #注册中心集群
+ #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
+ #是否注册到注册中心
+ register-with-eureka: true
+ #是否从注册中心拉取注册服务列表
+ fetch-registry: true
+ #首次注册时间
+ initial-instance-info-replication-interval-seconds: 2
+ #客户端定时刷新本地缓存时间
+ registry-fetch-interval-seconds: 5
+ instance:
+ prefer-ip-address: true
+ instance-id: ${spring.cloud.client.ip-address}:${server.port}
+ # 心跳时间，即服务续约间隔时间（缺省为30s）
+ lease-renewal-interval-in-seconds: 10
+ # 发呆时间，即服务续约到期时间（缺省为90s）
+ lease-expiration-duration-in-seconds: 30
+
+#ribbon配置
+ribbon:
+ #每台重试次数
+ MaxAutoRetries: 2
+ #最多重试多少台服务器
+ MaxAutoRetriesNextServer: 3
+ #serviceId路由时有效
+ SocketTimeout: 3000
+ #serviceId路由时有效
+ ReadTimeout: 60000
+ #Ribbon缓存时间
+ ServerListRefreshInterval: 2000
+ ConnectTimeout: 60000
+
+#hystrix 熔断机制
+hystrix:
+ command:
+ default:
+ fallback:
+ enabled: true # 是否开启降级服务
+ circuitBreaker:
+ enabled: true # 是否开启熔断
+ requestCache:
+ enabled: false # 设置是否缓存请求，request-scope内缓存
+ requestLog:
+ enabled: false # 设置HystrixCommand执行和事件是否打印到HystrixRequestLog中
+ execution:
+ isolation:
+ thread:
+ timeoutInMilliseconds: 60000 #降级和熔断的超时时间
+
diff --git a/dyh-gateway/src/main/resources/config/application-prod.yml b/dyh-gateway/src/main/resources/config/application-prod.yml
new file mode 100644
index 0000000..58863a7
--- /dev/null
+++ b/dyh-gateway/src/main/resources/config/application-prod.yml
@@ -0,0 +1,69 @@
+#server配置
+server:
+ port: 9002
+
+#spring配置
+spring:
+ #服务名
+ application:
+ name: dyh-gateway
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: false
+
+#注册中心配置
+eureka:
+ client:
+ service-url:
+ #注册中心单机
+ defaultZone: http://10.202.1.73:9001/eureka
+ #注册中心集群
+ #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
+ #是否注册到注册中心
+ register-with-eureka: true
+ #是否从注册中心拉取注册服务列表
+ fetch-registry: true
+ #首次注册时间
+ initial-instance-info-replication-interval-seconds: 2
+ #客户端定时刷新本地缓存时间
+ registry-fetch-interval-seconds: 5
+ instance:
+ prefer-ip-address: true
+ instance-id: ${spring.cloud.client.ip-address}:${server.port}
+ # 心跳时间，即服务续约间隔时间（缺省为30s）
+ lease-renewal-interval-in-seconds: 10
+ # 发呆时间，即服务续约到期时间（缺省为90s）
+ lease-expiration-duration-in-seconds: 30
+
+#ribbon配置
+ribbon:
+ #每台重试次数
+ MaxAutoRetries: 2
+ #最多重试多少台服务器
+ MaxAutoRetriesNextServer: 3
+ #serviceId路由时有效
+ SocketTimeout: 3000
+ #serviceId路由时有效
+ ReadTimeout: 60000
+ #Ribbon缓存时间
+ ServerListRefreshInterval: 2000
+ ConnectTimeout: 60000
+
+#hystrix 熔断机制
+hystrix:
+ command:
+ default:
+ fallback:
+ enabled: true # 是否开启降级服务
+ circuitBreaker:
+ enabled: true # 是否开启熔断
+ requestCache:
+ enabled: false # 设置是否缓存请求，request-scope内缓存
+ requestLog:
+ enabled: false # 设置HystrixCommand执行和事件是否打印到HystrixRequestLog中
+ execution:
+ isolation:
+ thread:
+ timeoutInMilliseconds: 60000 #降级和熔断的超时时间
+
diff --git a/dyh-gateway/src/main/resources/config/application-test.yml b/dyh-gateway/src/main/resources/config/application-test.yml
new file mode 100644
index 0000000..736a11e
--- /dev/null
+++ b/dyh-gateway/src/main/resources/config/application-test.yml
@@ -0,0 +1,68 @@
+#server配置
+server:
+ port: 9002
+
+#spring配置
+spring:
+ #服务名
+ application:
+ name: dyh-gateway
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: false
+#注册中心配置
+eureka:
+ client:
+ service-url:
+ #注册中心单机
+ defaultZone: http://10.202.1.75:9001/eureka
+ #注册中心集群
+ #defaultZone: http://localhost:8761/eureka,http://localhost:8762/eureka
+ #是否注册到注册中心
+ register-with-eureka: true
+ #是否从注册中心拉取注册服务列表
+ fetch-registry: true
+ #首次注册时间
+ initial-instance-info-replication-interval-seconds: 2
+ #客户端定时刷新本地缓存时间
+ registry-fetch-interval-seconds: 5
+ instance:
+ prefer-ip-address: true
+ instance-id: ${spring.cloud.client.ip-address}:${server.port}
+ # 心跳时间，即服务续约间隔时间（缺省为30s）
+ lease-renewal-interval-in-seconds: 10
+ # 发呆时间，即服务续约到期时间（缺省为90s）
+ lease-expiration-duration-in-seconds: 30
+
+#ribbon配置
+ribbon:
+ #每台重试次数
+ MaxAutoRetries: 2
+ #最多重试多少台服务器
+ MaxAutoRetriesNextServer: 3
+ #serviceId路由时有效
+ SocketTimeout: 3000
+ #serviceId路由时有效
+ ReadTimeout: 60000
+ #Ribbon缓存时间
+ ServerListRefreshInterval: 2000
+ ConnectTimeout: 60000
+
+#hystrix 熔断机制
+hystrix:
+ command:
+ default:
+ fallback:
+ enabled: true # 是否开启降级服务
+ circuitBreaker:
+ enabled: true # 是否开启熔断
+ requestCache:
+ enabled: false # 设置是否缓存请求，request-scope内缓存
+ requestLog:
+ enabled: false # 设置HystrixCommand执行和事件是否打印到HystrixRequestLog中
+ execution:
+ isolation:
+ thread:
+ timeoutInMilliseconds: 60000 #降级和熔断的超时时间
+
diff --git a/dyh-gateway/src/main/resources/config/application.yml b/dyh-gateway/src/main/resources/config/application.yml
new file mode 100644
index 0000000..e2981ce
--- /dev/null
+++ b/dyh-gateway/src/main/resources/config/application.yml
@@ -0,0 +1,58 @@
+#spring配置
+spring:
+ profiles:
+ active:
+# - dev
+ - test
+# - prod
+ cloud:
+ gateway:
+ discovery:
+ locator:
+ enabled: true
+ lower-case-service-id: true
+ main:
+ allow-bean-definition-overriding: true
+
+#debug: true
+server:
+ tomcat:
+ min-spare-threads: 100
+ max-threads: 256
+ connection-timeout: 8000
+ servlet:
+ context-path: /
+ ssl:
+ enabled: false
+
+#management配置
+management:
+ endpoint:
+ health:
+ show-details: always
+ endpoints:
+ web:
+ exposure:
+ include: "*"
+
+#JWT配置
+jwt:
+ #jwt生成密钥
+ secret-key: asdfghjkl
+ #用户
+ iss-user: HUGEINFO
+ refresh-token-key:
+ #refreshToken 存储key
+ format: JWT_REFRESH_TOKEN::%s
+ blacklist-key:
+ #token黑名单 存储key
+ format: JWT_BLACKLIST::%s
+ token:
+ #token过期时间：12小时
+ expire-time: 43200000
+ refresh-token:
+ #refreshToken过期时间：13小时，比token时间长一点
+ expire-time: 46800000
+ #不进行token拦截
+ auth-skip-urls: /dyh-cust/api/web/ctAccount/login,/dyh-sys/api/v1/sync/universalSync,/dyh-utils/api/web/caseUtils/getNewTimeId,/dyh-utils/api/web/caseUtils/getNewTimeCaseId,/dyh-sys/api/web/fileInfo/show,/dyh-sys/api/web/fileInfo/down,/dyh-sys/api/wechat/fileInfo/show,/dyh-sys/api/wechat/fileInfo/down,/dyh-cust/api/wechat/paAccount/empower,/dyh-cust/api/web/ctAccount/gridLogin,/dyh-mediate/api/web/caseInfo/exportQueryAll,/gzdyh-test-mediate/api/web/caseInfo/exportQueryAll,/gzdyh-mediate/api/web/caseInfo/exportQueryAll,/dyh-mediate/api/web/caseInfo/exportOverview,/gzdyh-mediate/api/web/caseInfo/exportOverview,/gzdyh-test-mediate/api/web/caseInfo/exportOverview,/dyh-mediate/api/web/caseInfo/exportStatisticsArea,/gzdyh-mediate/api/web/caseInfo/exportStatisticsArea,/gzdyh-test-mediate/api/web/caseInfo/exportStatisticsArea
+
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
index f696ab9..2d32d8e 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseFeedbackService.java
@@ -327,7 +327,7 @@
QueryWrapper<CaseInfoUnfold> caseInfoUnfoldQueryWrapper = new QueryWrapper<>();
caseInfoUnfoldQueryWrapper.eq("id", caseFeedback.getCaseId());
CaseInfoUnfold caseInfoUnfold = unfoldService.getOne(caseInfoUnfoldQueryWrapper);
- if (caseInfoUnfold.getMediateUnitId() == null && caseInfoUnfold.getMediateUnitId().equals(loginUser.getUnitId())) {
+ if (caseInfoUnfold.getMediateUnitId() != null && caseInfoUnfold.getMediateUnitId().equals(loginUser.getUnitId())) {
caseFeedback.setHandleType(CaseTaskConsts.HANDLE_TYPE_1);
} else {
caseFeedback.setHandleType(CaseTaskConsts.HANDLE_TYPE_2);
--
Gitblit v1.8.0