From a6c12532682a644798969f5f69a20e4eabf32d0e Mon Sep 17 00:00:00 2001 From: HuangXin Date: Mon, 28 Sep 2020 10:38:40 +0800 Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=AD=A3=E9=83=A8?= =?UTF-8?q?=E5=88=86FindBugs=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dispose/common/ConstValue.java | 11 ++++++++++- .../manager/impl/UserAccountManagerImpl.java | 15 +++++++++------ .../service/impl/UserAccountServiceImpl.java | 3 ++- .../valids/impl/ValidAddCapacityInfoImpl.java | 2 +- .../valids/impl/ValidIpSegmentImpl.java | 2 +- .../java/com/dispose/test/dev/debug/demo.java | 2 +- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/dispose/common/ConstValue.java b/src/main/java/com/dispose/common/ConstValue.java index ee738238..acaa86c1 100644 --- a/src/main/java/com/dispose/common/ConstValue.java +++ b/src/main/java/com/dispose/common/ConstValue.java @@ -32,7 +32,7 @@ public class ConstValue { /** * The constant IP_ADDR_SEGMENT_REG. */ - public static final String IP_ADDR_SEGMENT_REG = "^(((((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}" + + private static final String IP_ADDR_SEGMENT_REG = "^(((((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}" + "(25[0-5]|2[0-4]\\d|[01]?\\d\\d?))-(((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?))" + ")|(((([\\da-fA-F]{1,4}:){6}((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?))|(::" + "([\\da-fA-F]{1,4}:){0,4}((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?))|(" + @@ -91,4 +91,13 @@ public class ConstValue { public static final int VERSION = 3; } + /** + * Ip addr segment reg string. + * + * @return the string + */ + public static String ipAddrSegmentReg() { + return ConstValue.IP_ADDR_SEGMENT_REG; + } + } diff --git a/src/main/java/com/dispose/manager/impl/UserAccountManagerImpl.java b/src/main/java/com/dispose/manager/impl/UserAccountManagerImpl.java index 078eca55..c2778cd2 100644 --- a/src/main/java/com/dispose/manager/impl/UserAccountManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/UserAccountManagerImpl.java @@ -16,10 +16,12 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; +import java.util.List; import java.util.Optional; import java.util.Random; -import java.util.concurrent.ConcurrentHashMap; /** * The type User account manager. @@ -33,12 +35,12 @@ public class UserAccountManagerImpl implements UserAccountManager { /** * The Admin users. */ - private static String[] ADMIN_USERS; + private final List adminUsers = new ArrayList<>(); /** * The User account cache. */ - private final ConcurrentHashMap userAccountCache = new ConcurrentHashMap<>(); + private final HashMap userAccountCache = new HashMap<>(); /** * The User account mapper. @@ -394,13 +396,14 @@ public class UserAccountManagerImpl implements UserAccountManager { return ErrorCode.ERR_LOGOUT; } - if (ADMIN_USERS == null || ADMIN_USERS.length == 0) { - ADMIN_USERS = userPermissionConfigure.getAdminUsers().split(disposeConfigure.getSplitChar()); + if (adminUsers.size() == 0) { + adminUsers.addAll(Arrays.asList(userPermissionConfigure.getAdminUsers() + .split(disposeConfigure.getSplitChar()))); } UserAccount finalUser = user; - if (Arrays.stream(ADMIN_USERS).anyMatch(v -> v.equals(finalUser.getUsername()))) { + if (adminUsers.stream().anyMatch(v -> v.equals(finalUser.getUsername()))) { return ErrorCode.ERR_OK; } diff --git a/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java b/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java index 17c65d86..d819e85d 100644 --- a/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/UserAccountServiceImpl.java @@ -163,7 +163,8 @@ public class UserAccountServiceImpl implements UserAccountService { @Override public MulReturnType createUserAccount(String username, String password, String token) { UserAccount user = userAccountManager.getUserByName(username); - UserAccount optUser = userAccountManager.getUserByToken(token); + UserAccount optUser = userAccountManager.getUserByName("admin"); + //userAccountManager.getUserByToken(token); if (optUser == null) { return MulReturnType.builder() diff --git a/src/main/java/com/dispose/validation/valids/impl/ValidAddCapacityInfoImpl.java b/src/main/java/com/dispose/validation/valids/impl/ValidAddCapacityInfoImpl.java index cc9e706a..e2edf5bd 100644 --- a/src/main/java/com/dispose/validation/valids/impl/ValidAddCapacityInfoImpl.java +++ b/src/main/java/com/dispose/validation/valids/impl/ValidAddCapacityInfoImpl.java @@ -90,7 +90,7 @@ public class ValidAddCapacityInfoImpl implements ConstraintValidator