From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java
index 8a705f2..1c85166 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/CaffeineCacheConfiguration.java
@@ -12,6 +12,9 @@
@Configuration
public class CaffeineCacheConfiguration {
+ private static final int cacheInitialCapacityDefault = 10 ;
+ private static final int cacheMaximumSizeDefault = 10000 ;
+ private static final int cacheDurationDefault = 720 ;
@Value("${pipIrr.sso.cacheMaximumSize}")
private String cacheMaximumSize ;
@@ -36,17 +39,21 @@
*/
@Bean
public CacheManager cacheManager() {
- int cacheMaximumSizeInt = 10000 ;
- int cacheDurationInt = 720 ;
+ int cacheMaximumSizeInt;
+ int cacheDurationInt;
if(NumUtil.isPlusIntNumber(cacheMaximumSize)){
- cacheMaximumSizeInt = Integer.parseInt(cacheMaximumSize) ;//
+ cacheMaximumSizeInt = Integer.parseInt(cacheMaximumSize) ;
+ }else{
+ cacheMaximumSizeInt = cacheMaximumSizeDefault ;
}
if(NumUtil.isPlusIntNumber(cacheDuration)){
- cacheDurationInt = Integer.parseInt(cacheDuration) ;//
+ cacheDurationInt = Integer.parseInt(cacheDuration) ;
+ }else{
+ cacheDurationInt = cacheDurationDefault ;
}
CaffeineCacheManager cacheManager = new CaffeineCacheManager();
cacheManager.setCaffeine(Caffeine.newBuilder()
- .initialCapacity(10)
+ .initialCapacity(cacheInitialCapacityDefault)
.maximumSize(cacheMaximumSizeInt)
.expireAfterAccess(cacheDurationInt, TimeUnit.MINUTES));
--
Gitblit v1.8.0