summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortanghao <admin@LAPTOP-QCSKVLI9>2021-03-19 14:21:56 +0800
committertanghao <admin@LAPTOP-QCSKVLI9>2021-03-19 14:21:56 +0800
commitb6a868d8285e02d597725bbe4eefbee16a7a8772 (patch)
tree0a8f9c002c014c27513247a2d2422fb2a251b42f
parent269f5ac2b4d17053a19f30a5e4e7c2f763031021 (diff)
fix: 修复eal4检测 correctness nonfinal bug问题
-rw-r--r--nz-admin/src/main/java/com/nis/common/utils/Constant.java2
-rw-r--r--nz-admin/src/main/java/com/nis/common/utils/Tool.java8
-rw-r--r--nz-admin/src/main/java/com/nis/modules/terminal/config/Constants.java2
-rw-r--r--nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalContext.java4
-rw-r--r--nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalSession.java18
5 files changed, 17 insertions, 17 deletions
diff --git a/nz-admin/src/main/java/com/nis/common/utils/Constant.java b/nz-admin/src/main/java/com/nis/common/utils/Constant.java
index 079e6339..2fb003da 100644
--- a/nz-admin/src/main/java/com/nis/common/utils/Constant.java
+++ b/nz-admin/src/main/java/com/nis/common/utils/Constant.java
@@ -332,7 +332,7 @@ public class Constant {
/**
* 支持的语言 [{"name":"简体中文","value":"zh"},...]
*/
- public static List<Map<String, String>> langList = new ArrayList<>();
+ public static final List<Map<String, String>> langList = new ArrayList<>();
/**
* 字典中语言的名称和类型
diff --git a/nz-admin/src/main/java/com/nis/common/utils/Tool.java b/nz-admin/src/main/java/com/nis/common/utils/Tool.java
index 90d32e44..8ff696ff 100644
--- a/nz-admin/src/main/java/com/nis/common/utils/Tool.java
+++ b/nz-admin/src/main/java/com/nis/common/utils/Tool.java
@@ -20,7 +20,7 @@ public class Tool {
/**
* 数据库操作工具类
*/
- public static cn.hutool.db.DbUtil DbUtil = new cn.hutool.db.DbUtil();
+ public final static cn.hutool.db.DbUtil DbUtil = new cn.hutool.db.DbUtil();
/**
* 安全相关工具类<br>
* 加密分为三种:<br>
@@ -28,15 +28,15 @@ public class Tool {
* 2、非对称加密(asymmetric),例如:RSA、DSA等<br>
* 3、摘要加密(digest),例如:MD5、SHA-1、SHA-256、HMAC等<br>
*/
- public static cn.hutool.crypto.SecureUtil SecureUtil = new cn.hutool.crypto.SecureUtil();
+ public final static cn.hutool.crypto.SecureUtil SecureUtil = new cn.hutool.crypto.SecureUtil();
/**
* 代理工具类
*/
- public static cn.hutool.aop.ProxyUtil ProxyUtil = new cn.hutool.aop.ProxyUtil();
+ public final static cn.hutool.aop.ProxyUtil ProxyUtil = new cn.hutool.aop.ProxyUtil();
/**
* 敏感词工具类
*/
- public static cn.hutool.dfa.SensitiveUtil SensitiveUtil = new cn.hutool.dfa.SensitiveUtil();
+ public final static cn.hutool.dfa.SensitiveUtil SensitiveUtil = new cn.hutool.dfa.SensitiveUtil();
/**
* 数据库元数据信息工具类
diff --git a/nz-admin/src/main/java/com/nis/modules/terminal/config/Constants.java b/nz-admin/src/main/java/com/nis/modules/terminal/config/Constants.java
index edc9dfb6..7112eeb9 100644
--- a/nz-admin/src/main/java/com/nis/modules/terminal/config/Constants.java
+++ b/nz-admin/src/main/java/com/nis/modules/terminal/config/Constants.java
@@ -100,5 +100,5 @@ public class Constants {
}
// 单位为 byte , 10485760 byte = 10Mb
- public static Integer RECORD_TEMPFILE_MAX_LENGTH = 10485760;
+ public static final Integer RECORD_TEMPFILE_MAX_LENGTH = 10485760;
} \ No newline at end of file
diff --git a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalContext.java b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalContext.java
index a6dcc41e..d4128d9b 100644
--- a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalContext.java
+++ b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalContext.java
@@ -34,9 +34,9 @@ import java.util.Set;
public class TerminalContext implements Serializable {
//key-->uuid value--->Terminal User
- public static Map<String, Account> terminalContext = new HashMap<String, Account>();
+ public static final Map<String, Account> terminalContext = new HashMap<String, Account>();
- public static Map<String,Set<String>> terminalUuid = new HashMap<String,Set<String>>();
+ public static final Map<String,Set<String>> terminalUuid = new HashMap<String,Set<String>>();
private String uuid;
diff --git a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalSession.java b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalSession.java
index ffb696ff..753e4168 100644
--- a/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalSession.java
+++ b/nz-admin/src/main/java/com/nis/modules/terminal/config/TerminalSession.java
@@ -44,25 +44,25 @@ public class TerminalSession implements Serializable {
/**
* 当前websockt连接信息对应的服务器信息 将来可以实现远程连接列表 用以进行主动断开服务器连接功能
*/
- public static Map<WebSocketSession, TerminalClient> terminalSession = new HashMap<WebSocketSession, TerminalClient>();
+ public static final Map<WebSocketSession, TerminalClient> terminalSession = new HashMap<WebSocketSession, TerminalClient>();
/**
* 保存所有正在连接的服务器列表信息
*/
- public static Map<String, Set<String>> terminalInfo = new HashMap<String, Set<String>>();
+ public static final Map<String, Set<String>> terminalInfo = new HashMap<String, Set<String>>();
/**
* terminal 对应的 monitors
*/
- public static Map<String, List<WebSocketSession>> terminalMonitorsMap = new ConcurrentHashMap<>();
+ public static final Map<String, List<WebSocketSession>> terminalMonitorsMap = new ConcurrentHashMap<>();
/**
* 当前用户操作的服务器指令信息
*/
- public static Map<String,String> terminalMessageInfo = new HashMap<String,String>();
+ public static final Map<String,String> terminalMessageInfo = new HashMap<String,String>();
// terminal cmd 信息
- public static Map<String, List<Character>> terminalCmdInfo = new HashMap();
+ public static final Map<String, List<Character>> terminalCmdInfo = new HashMap();
public static void removeTerminalCmd(String uuid) {
terminalCmdInfo.remove(uuid);
@@ -71,22 +71,22 @@ public class TerminalSession implements Serializable {
/**
* 用以保存用户连接websocket后的指令历史记录信息 包含未登录以及登录服务器后的历史指令
*/
- public static Map<String,List<String>> userInstructions =new HashMap<String,List<String>>();
+ public static final Map<String,List<String>> userInstructions =new HashMap<String,List<String>>();
/**
* 主要用于存放client相关需要属性
*/
- public static Map<String,Object> clientAttributeInfo =new HashMap<String,Object>();
+ public static final Map<String,Object> clientAttributeInfo =new HashMap<String,Object>();
/**
* 保存用户连接当前websocket的一些配置信息 包括光标位置、未登录时的一些状态信息
* 每个连接功能会公用一个terminalHandler类 将各自属性根据uuid以及相应的状态信息进行保存
*/
- public static Map<String,Map> terminalAttributeInfo = new HashMap<String,Map>();
+ public static final Map<String,Map> terminalAttributeInfo = new HashMap<String,Map>();
/**
* 管理前端窗口数量
*/
- public static Map<String,Integer> windowSize =new HashMap<String,Integer>();
+ public static final Map<String,Integer> windowSize =new HashMap<String,Integer>();
public static Integer getWindowSize(String token) {
Integer result = windowSize.get(token);