代码优化

maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/LightNoise.java

@@ -48,6 +48,7 @@ public class LightNoise extends Configurable implements NoiseProducer
 	 * @param factorThree
 	 * @param factorFour
 	 */
+	@Override
 	public void makeNoise(BufferedImage image, float factorOne,
 			float factorTwo, float factorThree, float factorFour)
 	{
@@ -100,8 +101,9 @@ public class LightNoise extends Configurable implements NoiseProducer
 		// for the maximum 3 point change the stroke and direction
 		for (i = 0; i < pts.length - 1; i++)
 		{
-			if (i < 3)
+			if (i < 3) {
 				graph.setStroke(new BasicStroke(0.7f * (2 - i)));
+			}
 			graph.drawLine((int) pts[i].getX(), (int) pts[i].getY(),
 					(int) pts[i + 1].getX(), (int) pts[i + 1].getY());
 		}

maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/impl/Ripple.java

@@ -37,6 +37,7 @@ public class Ripple extends Configurable implements GimpyEngine
 	 * @param baseImage the base image
 	 * @return the distorted image
 	 */
+	@Override
 	public BufferedImage getDistortedImage(BufferedImage baseImage)
 	{
 		NoiseProducer noiseProducer = getConfig().getNoiseImpl();

maxkey-authentications/maxkey-authentication-captcha/src/main/java/com/google/code/kaptcha/text/impl/RandomColorWordRenderer.java

@@ -49,6 +49,7 @@ public class RandomColorWordRenderer extends Configurable implements WordRendere
 	 *            The height of the image to be created.
 	 * @return The BufferedImage created from the word.
 	 */
+	@Override
 	public BufferedImage renderWord(String word, int width, int height)
 	{
 		int fontSize = getConfig().getTextProducerFontSize();

maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/InMemorySessionManager.java

@@ -97,6 +97,7 @@ public class InMemorySessionManager implements SessionManager{
         return session;
     }
 
+    @Override
 	public int getValiditySeconds() {
 		return validitySeconds;
 	}

maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/RedisSessionManager.java

@@ -92,7 +92,7 @@ public class RedisSessionManager implements SessionManager {
         return session;
     }
 
-   
+    @Override
     public int getValiditySeconds() {
 		return validitySeconds;
 	}

maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/session/SessionManagerFactory.java

@@ -85,6 +85,7 @@ public class SessionManagerFactory implements SessionManager{
 		 }
 	}
 
+	@Override
 	public void create(String sessionId, Session session) {
 		inMemorySessionManager.create(sessionId, session);
 		if(isRedis) {
@@ -92,6 +93,7 @@ public class SessionManagerFactory implements SessionManager{
 		}
 	}
 
+	@Override
 	public Session remove(String sessionId) {
 		Session session = inMemorySessionManager.remove(sessionId);
 		if(isRedis) {
@@ -100,6 +102,7 @@ public class SessionManagerFactory implements SessionManager{
 		return session;
 	}
 
+	@Override
 	public Session get(String sessionId) {
 		Session session = inMemorySessionManager.get(sessionId);
 		if(session == null && isRedis) {
@@ -108,6 +111,7 @@ public class SessionManagerFactory implements SessionManager{
 		return session;
 	}
 
+	@Override
 	public Session refresh(String sessionId, LocalDateTime refreshTime) {
 		Session session = null;
 		if(isRedis) {
@@ -120,6 +124,7 @@ public class SessionManagerFactory implements SessionManager{
 		return session;
 	}
 
+	@Override
 	public Session refresh(String sessionId) {
 		Session session = null;
 		if(isRedis) {
@@ -134,6 +139,7 @@ public class SessionManagerFactory implements SessionManager{
 		return session;
 	}
 
+	@Override
 	public List<HistoryLogin> querySessions() {
 		//clear session id is null
 		jdbcTemplate.execute(NO_SESSION_UPDATE_STATEMENT);
@@ -158,6 +164,7 @@ public class SessionManagerFactory implements SessionManager{
                 new int[] { Types.VARCHAR, Types.VARCHAR });
     }
     
+    @Override
 	public void terminate(String sessionId, String userId, String username) {
 		String lastLogoffTime = DateUtils.formatDateTime(new Date());
 	   	 _logger.trace("{} user {} terminate session {} ." ,lastLogoffTime,username, sessionId);
@@ -166,6 +173,7 @@ public class SessionManagerFactory implements SessionManager{
 	   	this.remove(sessionId);
 	}
 	
+    @Override
 	public int getValiditySeconds() {
 		return validitySeconds;
 	}

maxkey-authentications/maxkey-authentication-ip2location/src/main/java/org/dromara/maxkey/ip2location/AbstractIpLocation.java

@@ -27,15 +27,17 @@ public abstract class AbstractIpLocation implements IpLocation{
 
 	int failCount = 0;
 	
+	@Override
 	public int getFailCount() {
 		return failCount;
 	};
 	
+	@Override
 	public int plusFailCount() {
 		return failCount++;
 	};
 	
-	
+	@Override
 	public String getLocation(String region) {
 		if(region.endsWith("电信") || region.endsWith("移动") || region.endsWith("联通")) {
 			region.substring(0, region.length() - 2).trim();

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/AuthenticationProviderFactory.java

@@ -22,8 +22,7 @@ import org.springframework.security.core.Authentication;
 
 public class AuthenticationProviderFactory extends AbstractAuthenticationProvider {
 
-    private  static ConcurrentHashMap<String,AbstractAuthenticationProvider> providers = 
+    private  static ConcurrentHashMap<String,AbstractAuthenticationProvider> providers = new ConcurrentHashMap<>();
-    									new ConcurrentHashMap<String,AbstractAuthenticationProvider>();
     
     @Override
     public Authentication authenticate(LoginCredential authentication){

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MfaAuthenticationProvider.java

@@ -42,9 +42,9 @@ import org.springframework.security.core.AuthenticationException;
  *
  */
 public class MfaAuthenticationProvider extends AbstractAuthenticationProvider {
-    private static final Logger _logger =
+    private static final Logger _logger = LoggerFactory.getLogger(MfaAuthenticationProvider.class);
-            LoggerFactory.getLogger(MfaAuthenticationProvider.class);
+   
-
+    @Override
     public String getProviderName() {
         return "mfa" + PROVIDER_SUFFIX;
     }

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/MobileAuthenticationProvider.java

@@ -48,6 +48,7 @@ public class MobileAuthenticationProvider extends AbstractAuthenticationProvider
 
     SmsOtpAuthnService smsOtpAuthnService;
     
+    @Override
     public String getProviderName() {
         return "mobile" + PROVIDER_SUFFIX;
     }

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/NormalAuthenticationProvider.java

@@ -43,9 +43,9 @@ import org.springframework.security.core.AuthenticationException;
  *
  */
 public class NormalAuthenticationProvider extends AbstractAuthenticationProvider {
-    private static final Logger _logger =
+    private static final Logger _logger = LoggerFactory.getLogger(NormalAuthenticationProvider.class);
-            LoggerFactory.getLogger(NormalAuthenticationProvider.class);
 
+    @Override
     public String getProviderName() {
         return "normal" + PROVIDER_SUFFIX;
     }

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/provider/impl/TrustedAuthenticationProvider.java

@@ -35,9 +35,9 @@ import org.springframework.security.core.Authentication;
  *
  */
 public class TrustedAuthenticationProvider extends AbstractAuthenticationProvider {
-    private static final Logger _logger =
+    private static final Logger _logger = LoggerFactory.getLogger(TrustedAuthenticationProvider.class);
-            LoggerFactory.getLogger(TrustedAuthenticationProvider.class);
 
+    @Override
     public String getProviderName() {
         return "trusted" + PROVIDER_SUFFIX;
     }

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/jdbc/JdbcAuthenticationRealm.java

@@ -96,6 +96,7 @@ public class JdbcAuthenticationRealm extends AbstractAuthenticationRealm {
     /**
      * passwordMatches.
      */
+    @Override
     public boolean passwordMatches(UserInfo userInfo, String password) {
         boolean passwordMatches = false;
         //jdbc password check

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/ActiveDirectoryServer.java

@@ -77,6 +77,7 @@ public final class ActiveDirectoryServer implements IAuthenticationServer {
 		this.filter = filter;
 	}
 
+	@Override
 	public boolean isMapping() {
 		return mapping;
 	}

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/StandardLdapServer.java

@@ -97,6 +97,7 @@ public final class StandardLdapServer implements IAuthenticationServer {
 		this.filterAttribute = filterAttribute;
 	}
 
+	@Override
 	public boolean isMapping() {
 		return mapping;
 	}

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/certs/HttpCertsEntryPoint.java

@@ -66,23 +66,23 @@ public class HttpCertsEntryPoint  implements AsyncHandlerInterceptor {
 		for (X509Certificate cert : certificates) {
 			cert.checkValidity();
 			_logger.debug("cert validated");
-			_logger.debug("cert infos " + cert.toString());
+			_logger.debug("cert infos {}" , cert.toString());
-			_logger.debug("Version " + cert.getVersion());
+			_logger.debug("Version {}" , cert.getVersion());
-			_logger.debug("SerialNumber " + cert.getSerialNumber().toString(16));
+			_logger.debug("SerialNumber {}" , cert.getSerialNumber().toString(16));
-			_logger.debug("SubjectDN " + cert.getSubjectDN());
+			_logger.debug("SubjectDN {}" , cert.getSubjectDN());
-			_logger.debug("IssuerDN " + cert.getIssuerDN());
+			_logger.debug("IssuerDN {}" , cert.getIssuerDN());
-			_logger.debug("NotBefore " + cert.getNotBefore());
+			_logger.debug("NotBefore {}" , cert.getNotBefore());
-			_logger.debug("SigAlgName " + cert.getSigAlgName());
+			_logger.debug("SigAlgName {}" , cert.getSigAlgName());
 		    byte[] sign = cert.getSignature();
 		    _logger.debug("Signature ");
 		    for (int j = 0; j < sign.length; j++){
-		    	_logger.debug(sign[j] + ",");
+		    	_logger.debug("{} , ",sign[j] );
 		    }
 		    java.security.PublicKey pk = cert.getPublicKey();
 		    byte[] pkenc = pk.getEncoded();
 		    _logger.debug("PublicKey ");
 		    for (int j = 0; j < pkenc.length; j++){
-		    	_logger.debug(pkenc[j] + ",");
+		    	_logger.debug("{} ,",pkenc[j]);
 		    }
 		}
 		 return true;

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/RemoteKerberosService.java

@@ -30,6 +30,7 @@ public class RemoteKerberosService  implements KerberosService{
 	private static Logger _logger = LoggerFactory.getLogger(RemoteKerberosService.class);
 	List<KerberosProxy> kerberosProxys;
 
+	@Override
 	public List<KerberosProxy> getKerberosProxys() {
 		return kerberosProxys;
 	}
@@ -38,6 +39,7 @@ public class RemoteKerberosService  implements KerberosService{
 		this.kerberosProxys = kerberosProxys;
 	}
 	
+	@Override
 	public  String buildKerberosProxys(){
 		List<Map<String,String>>userDomainUrlList=new ArrayList<Map<String,String>>();
 		for (KerberosProxy kerberosProxy :kerberosProxys){

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/JdbcRemeberMeManager.java

@@ -92,6 +92,7 @@ public class JdbcRemeberMeManager extends AbstractRemeberMeManager {
     public RemeberMe read(RemeberMe remeberMe) {
         List<RemeberMe> listRemeberMe = jdbcTemplate.query(DEFAULT_DEFAULT_SELECT_STATEMENT,
                 new RowMapper<RemeberMe>() {
+        			@Override
                     public RemeberMe mapRow(ResultSet rs, int rowNum) throws SQLException {
                         RemeberMe remeberMe = new RemeberMe();
                         remeberMe.setId(rs.getString(1));

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationServiceImpl.java

@@ -31,6 +31,7 @@ public class WsFederationServiceImpl implements   WsFederationService{
 		this.wsFederationConfiguration = wsFederationConfiguration;
 	}
 
+	@Override
 	public WsFederationConfiguration getWsFederationConfiguration() {
 		return wsFederationConfiguration;
 	}

maxkey-common/src/main/java/org/dromara/maxkey/crypto/HexUtils.java

@@ -67,8 +67,9 @@ public final class HexUtils {
 		      int high = Character.digit(hex[i * 2], 16);
 		      int low = Character.digit(hex[i * 2 + 1], 16);
 		      int value = (high << 4) | low;
-		      if (value > 127)
+		      if (value > 127) {
 		        value -= 256;
+		      }
 		      raw[i] = (byte) value;
 		    }
 		    return raw;

maxkey-common/src/main/java/org/dromara/maxkey/crypto/ReciprocalUtils.java

@@ -170,14 +170,12 @@ public final class ReciprocalUtils {
     }
 
     public static String decoderHex(String ciphers, String secretKey, String algorithm) {
-        if(StringUtils.isBlank(ciphers))return "";
+        if(StringUtils.isNotBlank(ciphers) && keyLengthCheck(secretKey, algorithm)) {
-        
-        if (keyLengthCheck(secretKey, algorithm)) {
             byte[] byteSimple = HexUtils.hex2Bytes(ciphers);
 
             return decoder(byteSimple, secretKey, algorithm);
         }
-        return null;
+        return "";
     }
     
     public static String encode2Hex(String simple, String secretKey) {

maxkey-common/src/main/java/org/dromara/maxkey/crypto/cert/X509V3CertGen.java

@@ -69,7 +69,9 @@ public final class X509V3CertGen {
 		} catch (IOException e1) {  
 			e1.printStackTrace();  
 		} finally {
-		    if(publicKeyInputStream !=null)publicKeyInputStream.close();
+		    if(publicKeyInputStream !=null) {
+		    	publicKeyInputStream.close();
+		    }
 		}
 	        
 	        

maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/DesedeEncoder.java

@@ -53,7 +53,9 @@ public class DesedeEncoder implements PasswordEncoder {
     }
 
     public String decoder(CharSequence encodedPassword) {
-    	if(encodedPassword == null) return null;
+    	if(encodedPassword == null) {
+    		return null;
+    	}
     	String encodedPasswordString  = encodedPassword.toString();
     	if(encodedPasswordString.startsWith(CRYPT)) {
     		return ReciprocalUtils.decoderHex(encodedPasswordString.substring(PREFFIX_LENGTH), DEFAULT_SALT);
@@ -64,6 +66,7 @@ public class DesedeEncoder implements PasswordEncoder {
     	}
     }
 
+    @Override
     public boolean matches(CharSequence rawPassword, String encodedPassword) {
     	if(encodedPassword.startsWith(PLAIN)) {
     		encodedPassword = encode(encodedPassword.substring(PREFFIX_LENGTH));
@@ -78,7 +81,9 @@ public class DesedeEncoder implements PasswordEncoder {
 	}
 
 	public String encode(CharSequence plain,boolean isEncode) {
-		if(plain == null) return null;
+		if(plain == null) {
+			return null;
+		}
 		if(isEncode) {
 			return CRYPT + ReciprocalUtils.encode2Hex(plain + "", DEFAULT_SALT);
 		}else {

maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/LdapShaPasswordEncoder.java

@@ -117,6 +117,7 @@ public class LdapShaPasswordEncoder implements PasswordEncoder {
      * @return the encoded password in the specified format
      *
      */
+    @Override
     public String encode(CharSequence rawPass) {
         byte[] salt = this.saltGenerator.generateKey();
         return encode(rawPass, salt);
@@ -172,6 +173,7 @@ public class LdapShaPasswordEncoder implements PasswordEncoder {
      *
      * @return true if they match (independent of the case of the prefix).
      */
+    @Override
     public boolean matches(CharSequence rawPassword, String encodedPassword) {
         return matches(rawPassword == null ? null : rawPassword.toString(), encodedPassword);
     }

maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/Md4PasswordEncoder.java

@@ -114,6 +114,7 @@ public class Md4PasswordEncoder implements PasswordEncoder {
      * @return Hex string of password digest (or base64 encoded string if
      * encodeHashAsBase64 is enabled.
      */
+    @Override
     public String encode(CharSequence rawPassword) {
         String salt = PREFIX + this.saltGenerator.generateKey() + SUFFIX;
         return digest(salt, rawPassword);
@@ -151,6 +152,7 @@ public class Md4PasswordEncoder implements PasswordEncoder {
      * @param encodedPassword previously encoded password
      * @return true or false
      */
+    @Override
     public boolean matches(CharSequence rawPassword, String encodedPassword) {
         String salt = extractSalt(encodedPassword);
         String rawPasswordEncoded = digest(salt, rawPassword);

maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/MessageDigestPasswordEncoder.java

@@ -130,6 +130,7 @@ public class MessageDigestPasswordEncoder implements PasswordEncoder {
      * @return Hex string of password digest (or base64 encoded string if
      * encodeHashAsBase64 is enabled.
      */
+    @Override
     public String encode(CharSequence rawPassword) {
         String salt = PREFIX + this.saltGenerator.generateKey() + SUFFIX;
         return digest(salt, rawPassword);
@@ -160,6 +161,7 @@ public class MessageDigestPasswordEncoder implements PasswordEncoder {
      * @param encodedPassword previously encoded password
      * @return true or false
      */
+    @Override
     public boolean matches(CharSequence rawPassword, String encodedPassword) {
         String salt = extractSalt(encodedPassword);
         String rawPasswordEncoded = digest(salt, rawPassword);

maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/NoOpPasswordEncoder.java

@@ -52,10 +52,12 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 
 public final class NoOpPasswordEncoder implements PasswordEncoder {
 
+	@Override
     public String encode(CharSequence rawPassword) {
         return rawPassword.toString();
     }
 
+	@Override
     public boolean matches(CharSequence rawPassword, String encodedPassword) {
         return rawPassword.toString().equals(encodedPassword);
     }

maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/PasswordReciprocal.java

@@ -56,6 +56,7 @@ public class PasswordReciprocal implements PasswordEncoder {
         return plain.substring(salt.substring(PREFFIX_LENGTH).length());
     }
 
+    @Override
     public boolean matches(CharSequence rawPassword, String encodedPassword) {
     	String salt = encodedPassword.subSequence(0, 29).toString();
     	String finalPassword = encode(rawPassword,salt);

maxkey-common/src/main/java/org/dromara/maxkey/crypto/password/StandardPasswordEncoder.java

@@ -53,10 +53,12 @@ public final class StandardPasswordEncoder implements PasswordEncoder {
         this("SHA-256", secret);
     }
 
+    @Override
     public String encode(CharSequence rawPassword) {
         return encode(rawPassword, saltGenerator.generateKey());
     }
 
+    @Override
     public boolean matches(CharSequence rawPassword, String encodedPassword) {
         byte[] digested = decode(encodedPassword);
         byte[] salt = subArray(digested, 0, saltGenerator.getKeyLength());

maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/DsaSigner.java

@@ -47,6 +47,7 @@ public final class DsaSigner implements ISigner {
 	 * */
 	public static final String SIGNATURE_ALGORITHM = "SHA1withDSA";
 
+	@Override
 	public  byte[] sign(byte[] dataBytes, byte[] privateKeyByte) throws Exception {
 		// ȡ<EFBFBD><EFBFBD>˽Կ
 		PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(privateKeyByte);
@@ -63,7 +64,7 @@ public final class DsaSigner implements ISigner {
 		return signature.sign();
 	}
 	
-	
+	@Override
 	public  String signB64(String data, String privateKey) throws Exception {
 		
 		byte[] privateKeyByte = Base64Utils.decoder(privateKey);
@@ -74,6 +75,7 @@ public final class DsaSigner implements ISigner {
 		return Base64Utils.encoder(signatureBytes);
 	}
 
+	@Override
 	public boolean verify(byte[] dataBytes, byte[] publicKeyBytes, byte[] signBytes)throws Exception {
 
 		KeyFactory keyFactory = KeyFactory.getInstance(KEY_ALGORITHM.name());
@@ -92,6 +94,7 @@ public final class DsaSigner implements ISigner {
 		return signature.verify(signBytes);
 	}
 	
+	@Override
 	public boolean verifyB64(String data, String publicKey, String sign)throws Exception {
 
 		byte[] privateKeyByte = Base64Utils.decoder(publicKey);

maxkey-common/src/main/java/org/dromara/maxkey/crypto/signature/RsaSigner.java

@@ -65,6 +65,7 @@ public final class RsaSigner implements ISigner {
 		return signature.sign();
 	}
 	
+	@Override
 	public byte[] sign(byte[] dataBytes, byte[] privateKeyBytes) throws Exception {
 		return sign(dataBytes,privateKeyBytes,SIGNATURE_ALGORITHM);
 	}
@@ -72,6 +73,7 @@ public final class RsaSigner implements ISigner {
 	/**
 	 * sign with BASE64 privateKey use SHA1withRSA Algorithm
 	 */
+	@Override
 	public String signB64(String data, String privateKey) throws Exception {
 		byte[] keyBytes = Base64Utils.decoder(privateKey);
 		byte[] dataBytes = data.getBytes();
@@ -104,6 +106,7 @@ public final class RsaSigner implements ISigner {
 	 * @see com.connsec.crypto.signature.Signer#verify(java.lang.String,
 	 * java.lang.String, java.lang.String)
 	 */
+	@Override
 	public boolean verify(byte[] dataBytes, byte[] publicKeyBytes , byte[] signBytes)throws Exception {
 		// verify
 		return verify(dataBytes,publicKeyBytes,signBytes,SIGNATURE_ALGORITHM);
@@ -115,6 +118,7 @@ public final class RsaSigner implements ISigner {
 	 * @see com.connsec.crypto.signature.Signer#verify(java.lang.String,
 	 * java.lang.String, java.lang.String)
 	 */
+	@Override
 	public boolean verifyB64(String data, String publicKey, String sign)throws Exception {
 		// <EFBFBD><EFBFBD><EFBFBD>ܹ<EFBFBD>Կ
 		byte[] keyBytes = Base64Utils.decoder(publicKey);

maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/JsonPretty.java

@@ -113,6 +113,7 @@ public class JsonPretty  implements Pretty{
 	 * @param JSON String
 	 * @return String
 	 */
+	@Override
 	public  String format(String  jsonString){
 		return format(JsonParser.parseString(jsonString));
 	}

maxkey-common/src/main/java/org/dromara/maxkey/pretty/impl/XMLHelper.java

@@ -193,10 +193,12 @@ public class XMLHelper {
         
         serializer.setFilter(new LSSerializerFilter() {
 
+        	@Override
             public short acceptNode(Node arg0) {
                 return FILTER_ACCEPT;
             }
 
+        	@Override
             public int getWhatToShow() {
                 return SHOW_ALL;
             }

maxkey-common/src/main/java/org/dromara/maxkey/util/BeanConvert.java

@@ -67,7 +67,9 @@ public class BeanConvert {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		if(beanFiledMap==null)return bean;
+		if(beanFiledMap==null) {
+			return bean;
+		}
 		Iterator<?> fieldit = beanFiledMap.entrySet().iterator(); 
 		LogFactory.getLog(BeanConvert.class).debug("map2Bean() *******************************************");
 		LogFactory.getLog(BeanConvert.class).debug("map2Bean() "+bean.getClass().getName());
@@ -78,7 +80,9 @@ public class BeanConvert {
             String fieldName = entry.getKey().toString();
             Object value = null;
             String fieldType=(String)beanFiledMap.get(fieldName);
-            if(valueMap.get(fieldName)==null)continue;
+            if(valueMap.get(fieldName)==null) {
+            	continue;
+            }
             String fillValue=valueMap.get(fieldName).toString();
             LogFactory.getLog(BeanConvert.class).debug("map2Bean() field "+(i++)+" : "+fieldName+" = "+fillValue+" type : "+fieldType);  
             if(fieldType.equals("java.lang.String")){

maxkey-common/src/main/java/org/dromara/maxkey/util/BeanUtil.java

@@ -30,7 +30,9 @@ import org.apache.commons.logging.LogFactory;
 public class BeanUtil {
 	
 	public static void copyBean(Object  origin,Object target) {
-		if( origin == null || target == null) return;
+		if( origin == null || target == null) {
+			return;
+		}
 		try {				
 			BeanUtils.copyProperties( origin, target);
 		} catch (Exception e) {
@@ -40,7 +42,9 @@ public class BeanUtil {
 		
 	public static Object cloneSupper(Object origin) {			
 		Object target = null;
-		if(origin == null) return target;
+		if(origin == null) {
+			return target;
+		}
 		try {				
 			target = origin.getClass().getSuperclass().newInstance();
 			BeanUtils.copyProperties(target,origin);
@@ -51,7 +55,9 @@ public class BeanUtil {
 	}
 		
 	public static String getValue(Object bean,String  field ) {
-		if(bean == null) return null;
+		if(bean == null) {
+			return null;
+		}
 		String retVal = "";
 		try {
 			retVal = BeanUtils.getProperty(bean, field);
@@ -216,8 +222,9 @@ public class BeanUtil {
 		Map<String, String> map = new HashMap<String, String>();
 		for (int i = 0; i < flds.length; i++) {
 			String fieldName = flds[i].getName();
-			if (isPublicProperty(cls, fieldName))
+			if (isPublicProperty(cls, fieldName)) {
 				map.put(flds[i].getName(), flds[i].getType().getName());
+			}
 		}
 		return map;
 	}
@@ -245,39 +252,61 @@ public class BeanUtil {
 			e1.printStackTrace();
 		} 
 		if(fieldType.equals("java.lang.String")){
-			if(String.valueOf(fillValue)==null)isFieldNotEmpty= false;
+			if(String.valueOf(fillValue)==null) {
+				isFieldNotEmpty= false;
+			}
         }else if(fieldType.equals("int")){
-        	if(Integer.parseInt(fillValue)==0)isFieldNotEmpty= false;
+        	if(Integer.parseInt(fillValue)==0) {
+        		isFieldNotEmpty= false;
+        	}
         }else if(fieldType.equals("long")){
-        	if(Long.parseLong(fillValue)==0)isFieldNotEmpty= false;
+        	if(Long.parseLong(fillValue)==0) {
+        		isFieldNotEmpty= false;
+        	}
         }else if(fieldType.equals("java.lang.Long")){
-        	if(Long.parseLong(fillValue)==0)isFieldNotEmpty= false;
+        	if(Long.parseLong(fillValue)==0) {
+        		isFieldNotEmpty= false;
+        	}
         }else if(fieldType.equals("double")){
-        	if(Double.valueOf(fillValue)==0.0d)isFieldNotEmpty= false;
+        	if(Double.valueOf(fillValue)==0.0d) {
+        		isFieldNotEmpty= false;
+        	}
         }else if(fieldType.equals("float")){
-        	if(Float.parseFloat(fillValue)==0.0f)isFieldNotEmpty= false;
+        	if(Float.parseFloat(fillValue)==0.0f) {
+        		isFieldNotEmpty= false;
+        	}
         }else if(fieldType.equals("java.util.Date")){ 
         	try {
         		value=BeanUtil.get(entity, field.getName());
 			} catch (IllegalArgumentException e) {
 				e.printStackTrace();
 			} 
-			if(value==null)isFieldNotEmpty= false;
+			if(value==null) {
+				isFieldNotEmpty= false;
+			}
         }else if(fieldType.equals("java.lang.Object")){
         	try {
 				value=BeanUtil.get(entity, field.getName());
 			} catch (IllegalArgumentException e) {
 				e.printStackTrace();
 			} 
-			if(value==null)isFieldNotEmpty= false;
+			if(value==null) {
+				isFieldNotEmpty= false;
+			}
         }else if(fieldType.equals("char")){
-        	if(Character.valueOf(fillValue.charAt(0))=='\u0000')isFieldNotEmpty= false;
+        	if(Character.valueOf(fillValue.charAt(0))=='\u0000') {
+        		isFieldNotEmpty= false;
+        	}
         }else if(fieldType.equals("boolean")){
         	value=Boolean.parseBoolean(fillValue);
         }else if(fieldType.equals("short")){
-        	if(Short.parseShort(fillValue)==0)isFieldNotEmpty= false;
+        	if(Short.parseShort(fillValue)==0) {
+        		isFieldNotEmpty= false;
+        	}
         }else if(fieldType.equals("byte")){
-        	if(Byte.parseByte(fillValue)==0)isFieldNotEmpty= false;
+        	if(Byte.parseByte(fillValue)==0) {
+        		isFieldNotEmpty= false;
+        	}
         }
 		
 		LogFactory.getLog(BeanUtil.class).debug("isFieldNotEmpty() fieldName : "+field.getName()+", fieldType : "+fieldType+", Value : "+fillValue+", isFieldNotEmpty : "+isFieldNotEmpty);

maxkey-common/src/main/java/org/dromara/maxkey/util/DateUtils.java

@@ -77,13 +77,13 @@ public class DateUtils {
 	public final static int compareDate(String stringValue1, String stringValue2)
 			throws ParseException {
 		Date date1 = tryParse(stringValue1);
-		if (date1 == null)
+		if (date1 == null) {
-			throw new ParseException("Can not parse " + stringValue1
+			throw new ParseException("Can not parse " + stringValue1+ " to Date.", 0);
-					+ " to Date.", 0);
+		}
 		Date date2 = tryParse(stringValue2);
-		if (date2 == null)
+		if (date2 == null) {
-			throw new ParseException("Can not parse " + stringValue1
+			throw new ParseException("Can not parse " + stringValue1+ " to Date.", 0);
-					+ " to Date.", 0);
+		}
 		return date1.compareTo(date2);
 	}
 
@@ -343,10 +343,12 @@ public class DateUtils {
 	 * @return
 	 */
 	public static int getDayOfWeek(int SUN_FST_DAY_OF_WEEK) {
-		if (SUN_FST_DAY_OF_WEEK > 7 || SUN_FST_DAY_OF_WEEK < 1)
+		if (SUN_FST_DAY_OF_WEEK > 7 || SUN_FST_DAY_OF_WEEK < 1) {
 			return 0;
-		if (SUN_FST_DAY_OF_WEEK == 1)
+		}
+		if (SUN_FST_DAY_OF_WEEK == 1) {
 			return 7;
+		}
 		return SUN_FST_DAY_OF_WEEK - 1;
 	}
 

maxkey-common/src/main/java/org/dromara/maxkey/util/EthernetAddress.java

@@ -177,6 +177,7 @@ public class EthernetAddress
     /**
      * Default cloning behaviour (bitwise copy) is just fine...
      */
+    @Override
     public Object clone()
     {
         return new EthernetAddress(_address);
@@ -418,9 +419,15 @@ public class EthernetAddress
     @Override
     public boolean equals(Object o)
     {
-        if (o == this) return true;
+        if (o == this) {
-        if (o == null) return false;
+        	return true;
-        if (o.getClass() != getClass()) return false;
+        }
+        if (o == null) {
+        	return false;
+        }
+        if (o.getClass() != getClass()) {
+        	return false;
+        }
         return ((EthernetAddress) o)._address == _address;
     }
 
@@ -433,10 +440,13 @@ public class EthernetAddress
      *   parameter address if they are equal, os positive non-zero number if this address
      *  should be sorted after parameter
      */
+    @Override
     public int compareTo(EthernetAddress other)
     {
         long l = _address - other._address;
-        if (l < 0L) return -1;
+        if (l < 0L) {
+        	return -1;
+        }
         return (l == 0L) ? 0 : 1;
     }
     

maxkey-common/src/main/java/org/dromara/maxkey/util/HttpsTrusts.java

@@ -39,6 +39,7 @@ public class HttpsTrusts {
 		try {
 			trustAllHttpsCertificates();
 			HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() {
+				@Override
 				public boolean verify(String urlHostName, SSLSession session) {
 					System.out.println("Warning: URL Host: " + urlHostName + " vs. " + session.getPeerHost());
 					return true;
@@ -50,6 +51,7 @@ public class HttpsTrusts {
 	}
 	
 	static class HttpsTrustsTM implements javax.net.ssl.TrustManager,javax.net.ssl.X509TrustManager {
+		@Override
 		public java.security.cert.X509Certificate[] getAcceptedIssuers() {
 			return null;
 		}
@@ -62,11 +64,13 @@ public class HttpsTrusts {
 			return true;
 		}
 
+		@Override
 		public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType)
 				throws java.security.cert.CertificateException {
 			return;
 		}
 
+		@Override
 		public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType)
 				throws java.security.cert.CertificateException {
 			return;

maxkey-common/src/main/java/org/dromara/maxkey/util/JdbcUtils.java

@@ -56,20 +56,22 @@ public class JdbcUtils {
 	}
 
 	public static void release(Connection conn, Statement stmt, ResultSet rs) {
-		if (rs != null)
+		if (rs != null) {
 			try {
 				rs.close();
 				rs = null;
 			} catch (SQLException e) {
 				System.out.println("SQLException");
 			}
-		if (stmt != null)
+		}
+		if (stmt != null) {
 			try {
 				stmt.close();
 				stmt = null;
 			} catch (SQLException e) {
 				System.out.println("SQLException");
 			}
+		}
 		if (conn != null) {
 			try {
 				conn.close();
@@ -81,27 +83,30 @@ public class JdbcUtils {
 	}
 	
 	public static void release(Connection conn, Statement stmt, PreparedStatement pstmt, ResultSet rs) {
-		if (rs != null)
+		if (rs != null) {
 			try {
 				rs.close();
 				rs = null;
 			} catch (SQLException e) {
 				System.out.println("ResultSet Close Exception");
 			}
-		if (stmt != null)
+		}
+		if (stmt != null) {
 			try {
 				stmt.close();
 				stmt = null;
 			} catch (SQLException e) {
 				System.out.println("Statement Close Exception");
 			}
-		if (pstmt != null)
+		}
+		if (pstmt != null) {
 			try {
 				pstmt.close();
 				pstmt = null;
 			} catch (SQLException e) {
 				System.out.println("PreparedStatement Close Exception");
 			}
+		}
 		if (conn != null) {
 			try {
 				conn.close();

maxkey-common/src/main/java/org/dromara/maxkey/util/StringUtils.java

@@ -45,9 +45,9 @@ public final class StringUtils extends org.apache.commons.lang3.StringUtils {
 
         try {
             byte[] utf8_bytes = strValue.getBytes("UTF-8");
-            if (utf8_bytes.length <= bytelen)
+            if (utf8_bytes.length <= bytelen) {
                 return strValue;
-
+            }
             byte[] cutoff_bytes = new byte[real_bytelen];
             System.arraycopy(utf8_bytes, 0, cutoff_bytes, 0, real_bytelen);
 
@@ -56,8 +56,9 @@ public final class StringUtils extends org.apache.commons.lang3.StringUtils {
             return strResult;
 
         } catch (Exception e) {
-            if (strValue.length() < strlen)
+            if (strValue.length() < strlen) {
                 return strValue;
+            }
             return strValue.substring(0, strlen);
         }
 
@@ -249,8 +250,9 @@ public final class StringUtils extends org.apache.commons.lang3.StringUtils {
 
     public static String list2String(List<String> list, String split) {
         String string = "";
-        if (list == null)
+        if (list == null) {
             return string;
+        }
         for (int i = 0; i < list.size(); i++) {
             if (list.get(i) != null && !list.get(i).equals("")) {
                 string += list.get(i) + split;

maxkey-common/src/main/java/org/dromara/maxkey/util/UUIDGenerator.java

@@ -100,18 +100,18 @@ public final class UUIDGenerator {
      * @param bytes UUID content
      */
     public UUIDGenerator(byte[] bytes) {
-        if (bytes.length != 16)
+        if (bytes.length != 16) {
             throw new RuntimeException("Attempted to parse malformed UUID: " + Arrays.toString(bytes));
-
+        }
         content = Arrays.copyOf(bytes, 16);
     }
 
     public UUIDGenerator(String id) {
         id = id.trim();
 
-        if (id.length() != 36)
+        if (id.length() != 36) {
             throw new RuntimeException("Attempted to parse malformed UUID: " + id);
-
+        }
         content = new byte[16];
         char[] chars = id.toCharArray();
 
@@ -180,12 +180,15 @@ public final class UUIDGenerator {
      * @return four bit number representing offset from '0'
      */
     private static int intValue(char x) {
-        if (x >= '0' && x <= '9')
+        if (x >= '0' && x <= '9') {
             return x - '0';
-        if (x >= 'a' && x <= 'f')
+        }
+        if (x >= 'a' && x <= 'f') {
             return x - 'a' + 10;
-        if (x >= 'A' && x <= 'F')
+        }
+        if (x >= 'A' && x <= 'F') {
             return x - 'A' + 10;
+        }
         throw new RuntimeException("Error parsing UUID at character: " + x);
     }
 
@@ -267,9 +270,9 @@ public final class UUIDGenerator {
      * @return id of process that generated the UUID, or -1 for unrecognized format
      */
     public int getProcessId() {
-        if (getVersion() != VERSION)
+        if (getVersion() != VERSION) {
             return -1;
-
+        }
         return ((content[4] & 0xFF) << 8) | (content[5] & 0xFF);
     }
 
@@ -278,9 +281,9 @@ public final class UUIDGenerator {
      * @return millisecond UTC timestamp from generation of the UUID, or null for unrecognized format
      */
     public Date getTimestamp() {
-        if (getVersion() != VERSION)
+        if (getVersion() != VERSION) {
             return null;
-
+        }
         long time;
         time  = ((long)content[10] & 0xFF) << 40;
         time |= ((long)content[11] & 0xFF) << 32;
@@ -298,9 +301,9 @@ public final class UUIDGenerator {
      * @return byte array of UUID fragment, or null for unrecognized format
      */
     public byte[] getMacFragment() {
-        if (getVersion() != 'b')
+        if (getVersion() != 'b') {
             return null;
-
+        }
         byte[] x = new byte[6];
 
         x[0] = 0;
@@ -315,18 +318,24 @@ public final class UUIDGenerator {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
+        if (this == o) {
-        if (o == null || getClass() != o.getClass()) return false;
+        	return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+        	return false;
+        }
 
         UUIDGenerator that = (UUIDGenerator) o;
 
-        if (this.content.length != that.content.length)
+        if (this.content.length != that.content.length) {
             return false;
+        }
 
-        for (int i = 0; i < this.content.length; i++)
+        for (int i = 0; i < this.content.length; i++) {
-            if (this.content[i] != that.content[i])
+            if (this.content[i] != that.content[i]) {
                 return false;
-
+            }
+        }
         return true;
     }
 
@@ -341,9 +350,9 @@ public final class UUIDGenerator {
             //byte[] mac = NetworkInterface.getNetworkInterfaces().nextElement().getHardwareAddress();
             byte[] mac = EthernetAddress.fromInterface().toByteArray();
             // if the machine is not connected to a network it has no active MAC address
-            if (mac == null)
+            if (mac == null) {
                 mac = new byte[] {0, 0, 0, 0, 0, 0};
-
+            }
             return mac;
         } catch (Exception e) {
             throw new RuntimeException("Could not get MAC address");
@@ -357,9 +366,9 @@ public final class UUIDGenerator {
         final String jvmName = ManagementFactory.getRuntimeMXBean().getName();
         final int index = jvmName.indexOf('@');
 
-        if (index < 1)
+        if (index < 1) {
             throw new RuntimeException("Could not get PID");
-
+        }
         try {
             return Integer.parseInt(jvmName.substring(0, index)) % MAX_PID;
         } catch (NumberFormatException e) {

maxkey-common/src/main/java/org/dromara/maxkey/uuid/TimestampUUIDGenerator.java

@@ -62,6 +62,7 @@ public class TimestampUUIDGenerator
   *
   * @throws IllegalStateException if adjustmentOverflow() throws it
   */
+ @Override
  public UUID nextUUID()
  {
 	synchronized(this) {

maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUID.java

@@ -111,8 +111,12 @@ public final class UUID implements Serializable
              byte[] node)
      throws NullPointerException, IllegalArgumentException
  {
-     if(node == null) throw new NullPointerException();
+     if(node == null) {
-     if(node.length != 6) throw new IllegalArgumentException();
+    	 throw new NullPointerException();
+     }
+     if(node.length != 6) {
+    	 throw new IllegalArgumentException();
+     }
 
      this.time_low = time_low;
      this.time_mid = time_mid;
@@ -135,20 +139,33 @@ public final class UUID implements Serializable
             IllegalArgumentException,
             NumberFormatException
  {
-     if(s == null) throw new NullPointerException();
+     if(s == null) {
-     if(s.length() != 36) throw new IllegalArgumentException();
+    	 throw new NullPointerException();
+     }
+     if(s.length() != 36) {
+    	 throw new IllegalArgumentException();
+     }
      time_low = parseHex(s.substring(0, 8));
-     if(s.charAt(8) != '-') throw new IllegalArgumentException();
+     if(s.charAt(8) != '-') {
+    	 throw new IllegalArgumentException();
+     }
      time_mid = (short) parseHex(s.substring(9, 13));
-     if(s.charAt(13) != '-') throw new IllegalArgumentException();
+     if(s.charAt(13) != '-') {
+    	 throw new IllegalArgumentException();
+     }
      time_hi_and_version = (short) parseHex(s.substring(14, 18));
-     if(s.charAt(18) != '-') throw new IllegalArgumentException();
+     if(s.charAt(18) != '-') {
+    	 throw new IllegalArgumentException();
+     }
      clock_seq_hi_and_reserved = (byte) parseHex(s.substring(19, 21));
      clock_seq_low = (byte) parseHex(s.substring(21, 23));
-     if(s.charAt(23) != '-') throw new IllegalArgumentException();
+     if(s.charAt(23) != '-') {
+    	 throw new IllegalArgumentException();
+     }
      node = new byte[6];
-     for(int i = 0; i < 6; i++)
+     for(int i = 0; i < 6; i++) {
          node[i] = (byte) parseHex(s.substring(2 * i + 24, 2 * i + 26));
+     }
  }
 
  /**
@@ -160,7 +177,9 @@ public final class UUID implements Serializable
   */
  public UUID(DataInput in) throws IOException
  {
-     if(in == null) throw new NullPointerException();
+     if(in == null) {
+    	 throw new NullPointerException();
+     }
      readData(in);
  }
 
@@ -172,8 +191,12 @@ public final class UUID implements Serializable
   */
  public UUID(byte[] data)
  {
-     if(data == null) throw new NullPointerException();
+     if(data == null) {
-     if(data.length != 16) throw new IllegalArgumentException();
+    	 throw new NullPointerException();
+     }
+     if(data.length != 16) {
+    	 throw new IllegalArgumentException();
+     }
      try {
          readData(new DataInputStream(new ByteArrayInputStream(data)));
      } catch(IOException ex) {
@@ -221,19 +244,22 @@ public final class UUID implements Serializable
  /*
   * Returns true if two UUIDs are equal by value.
   */
- public boolean equals(Object obj)
+ @Override
- {
+ public boolean equals(Object obj){
-     if(obj == null || !(obj instanceof UUID))
+     if(obj == null || !(obj instanceof UUID)) {
          return false;
-
+     }
      UUID other = (UUID) obj;
 
-     if(this == other) return true;
+     if(this == other) {
+    	 return true;
+     }
 
      if(hash_code != 0 &&
         other.hash_code != 0 &&
-        hash_code != other.hash_code)
+        hash_code != other.hash_code) {
          return false;
+     }
 
      return
          time_low == other.time_low &&
@@ -247,14 +273,16 @@ public final class UUID implements Serializable
  /**
   * Returns a hash code for this UUID.
   */
+ @Override
  public int hashCode()
  {
      if(hash_code == 0) {
          synchronized(this) {
              if(hash_code == 0) {
                  hash_code = toString().hashCode();
-                 if(hash_code == 0)
+                 if(hash_code == 0) {
                      hash_code = -1;
+                 }
              }
          }
      }
@@ -266,9 +294,9 @@ public final class UUID implements Serializable
   */
  private static void appendHex(StringBuffer sb, long num, int digits)
  {
-     if(digits > 0 && digits < 16)
+     if(digits > 0 && digits < 16) {
          num = num & ((1L << (digits * 4)) - 1);
-
+     }
      String str = Long.toHexString(num);
      int len = str.length();
      while(len < digits) {
@@ -283,15 +311,16 @@ public final class UUID implements Serializable
   */
  private static int parseHex(String s) throws NumberFormatException
  {
-     if(s.charAt(0) == '-')
+     if(s.charAt(0) == '-') {
          throw new NumberFormatException();
-
+     }
      return Integer.parseInt(s, 16);
  }
 
  /**
   * Returns the string representation of this UUID.
   */
+ @Override
  public String toString()
  {
      if(string_rep == null) {
@@ -307,8 +336,9 @@ public final class UUID implements Serializable
                  appendHex(sb, clock_seq_hi_and_reserved, 2);
                  appendHex(sb, clock_seq_low, 2);
                  sb.append('-');
-                 for(int i = 0; i < 6; i++)
+                 for(int i = 0; i < 6; i++) {
                      appendHex(sb, node[i], 2);
+                 }
                  string_rep = sb.toString();
              }
          }
@@ -343,9 +373,9 @@ public final class UUID implements Serializable
   */
  public static UUID generate()
  {
-     if(default_generator == null)
+     if(default_generator == null) {
          default_generator = new TimestampUUIDGenerator(UUIDRandomness.randomClockSequence(), NodeIDGetter.getNodeID());
-     
+     }
      return default_generator.nextUUID();
  }
 

maxkey-common/src/main/java/org/dromara/maxkey/uuid/UUIDRandomness.java

@@ -69,7 +69,9 @@ public final class UUIDRandomness
 	synchronized(random) {
 	    next = random.nextInt(16383);
 	}
-	if(next >= prev) next++;
+	if(next >= prev) {
+		next++;
+	}
 	return next;
     }
 }

maxkey-common/src/main/java/org/dromara/maxkey/uuid/UnsynchronizedTimestampUUIDGenerator.java

@@ -69,13 +69,15 @@ public class UnsynchronizedTimestampUUIDGenerator implements UUIDGenerator
  public UnsynchronizedTimestampUUIDGenerator(int clock_sequence,
                                              byte[] node)
  {
-     if(clock_sequence < 0 || clock_sequence >= 16384)
+     if(clock_sequence < 0 || clock_sequence >= 16384) {
          throw new IllegalArgumentException();
-     if(node == null)
+     }
+     if(node == null) {
          throw new NullPointerException();
-     if(node.length != 6)
+     }
+     if(node.length != 6) {
          throw new IllegalArgumentException();
-
+     }
      this.clock_sequence = clock_sequence;
      this.node = (byte[]) node.clone();
      checkSystemTime();
@@ -89,8 +91,9 @@ public class UnsynchronizedTimestampUUIDGenerator implements UUIDGenerator
      long sys_time = System.currentTimeMillis();
 
      /* If monotonicity is lost, bump clock_sequence. */
-     if(sys_time < last_time)
+     if(sys_time < last_time) {
          clock_sequence = UUIDRandomness.nextRandomClockSequence(clock_sequence);
+     }
 
      /* If the clock ticked, clear the adjustment. */
      if(sys_time != last_time) {
@@ -106,8 +109,9 @@ public class UnsynchronizedTimestampUUIDGenerator implements UUIDGenerator
  protected void adjustmentOverflow() throws IllegalStateException
  {
      checkSystemTime();
-     if(clock_adj >= CLOCK_RES)
+     if(clock_adj >= CLOCK_RES) {
          throw new IllegalStateException();
+     }
  }
 
  /**
@@ -115,10 +119,13 @@ public class UnsynchronizedTimestampUUIDGenerator implements UUIDGenerator
   *
   * @throws IllegalStateException if adjustmentOverflow() throws it
   */
+ @Override
  public UUID nextUUID()
  {
      long unique_time = (last_time + EPOCH_OFFSET) * CLOCK_RES + clock_adj;
-     if(++clock_adj > CLOCK_RES) adjustmentOverflow();
+     if(++clock_adj > CLOCK_RES) {
+    	 adjustmentOverflow();
+     }
 
      return new UUID((int) (unique_time & 0xFFFFFFFF),
                      (short) ((unique_time >> 32) & 0xFFFF),

maxkey-core/src/main/java/org/dromara/maxkey/configuration/oidc/OIDCProviderMetadataDetails.java

@@ -137,8 +137,9 @@ public class OIDCProviderMetadataDetails implements OIDCProviderMetadata {
         builder.append("[");
         int i = 0;
         for (Iterator<?> iterator = collection.iterator(); iterator.hasNext() && i < maxLen; i++) {
-            if (i > 0)
+            if (i > 0) {
                 builder.append(", ");
+            }
             builder.append(iterator.next());
         }
         builder.append("]");

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java

@@ -68,7 +68,7 @@ public class AccountsService  extends JpaService<Accounts>{
 		return (AccountsMapper)super.getMapper();
 	}
 	
-	
+	@Override
 	 public boolean insert(Accounts account) {
 	     if (super.insert(account)) {
 	            if(provisionService.getApplicationConfig().isProvisionSupport()) {
@@ -89,7 +89,8 @@ public class AccountsService  extends JpaService<Accounts>{
 	     return false;
 	 }
 	 
-   public boolean update(Accounts account) {
+	@Override
+	public boolean update(Accounts account) {
          if (super.update(account)) {
         	 if(provisionService.getApplicationConfig().isProvisionSupport()) {
                     UserInfo loadUserInfo = userInfoService.findUserRelated(account.getUserId());
@@ -112,6 +113,8 @@ public class AccountsService  extends JpaService<Accounts>{
    public boolean updateStatus(Accounts accounts) {
 	   return this.getMapper().updateStatus(accounts) > 0;
    }
+   
+   @Override
    public boolean remove(String id) {
        Accounts account = this.get(id);
        if (super.remove(id)) {
@@ -196,7 +199,9 @@ public class AccountsService  extends JpaService<Accounts>{
 	    		for(int i =1 ;i < 100 ;i++) {
 	    			accountResult = account + i;
 	    			AccountsList =getMapper().queryByAppIdAndAccount(accountsStrategy.getAppId(),accountResult + accountsStrategy.getSuffixes());
-	    			if(AccountsList.isEmpty())break;
+	    			if(AccountsList.isEmpty()) {
+	    				break;
+	    			}
 	    		}
    		}
    	}

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java

@@ -161,8 +161,9 @@ public class OrganizationsService  extends JpaService<Organizations>{
 		rootOrg.setReorgNamePath(true);
 
 		for (Organizations org : orgList) {
-			if (org.isReorgNamePath())
+			if (org.isReorgNamePath()) {
 				continue;
+			}
 			if (org.getParentId().equalsIgnoreCase(rootOrg.getId())) {
 				reorg(orgMap, orgList, org);
 			}

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java

@@ -72,6 +72,7 @@ public class UserInfoService extends JpaService<UserInfo> {
 		return (UserInfoMapper)super.getMapper();
 	}
 	
+	@Override
     public boolean insert(UserInfo userInfo) {
     	this.passwordEncoder(userInfo);
         if (super.insert(userInfo)) {
@@ -108,6 +109,7 @@ public class UserInfoService extends JpaService<UserInfo> {
         return false;
     }
 	
+    @Override
     public boolean update(UserInfo userInfo) {
     	ChangePassword changePassword = this.passwordEncoder(userInfo);
         if (super.update(userInfo)) {
@@ -127,6 +129,7 @@ public class UserInfoService extends JpaService<UserInfo> {
         return false;
     }
 	
+    @Override
 	public boolean delete(UserInfo userInfo) {
 	    UserInfo loadUserInfo = null;
 	    if(provisionService.getApplicationConfig().isProvisionSupport()) {

maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java

@@ -71,7 +71,9 @@ public class AccountsServiceTest {
 	
 	@Before
 	public void initSpringContext(){
-		if(context!=null) return;
+		if(context!=null) {
+			return;
+		}
 		_logger.info("init Spring Context...");
 		SimpleDateFormat sdf_ymdhms =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String startTime=sdf_ymdhms.format(new Date());

maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java

@@ -59,7 +59,9 @@ public class AppsServiceTest {
 	
 	@Before
 	public void initSpringContext(){
-		if(context!=null) return;
+		if(context!=null) {
+			return;
+		}
 		_logger.info("init Spring Context...");
 		SimpleDateFormat sdf_ymdhms =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String startTime=sdf_ymdhms.format(new Date());

maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java

@@ -120,7 +120,9 @@ public class FormBasedDetailsServiceTest {
 	
 	@Before
 	public void initSpringContext(){
-		if(context!=null) return;
+		if(context!=null) {
+			return;
+		}
 		_logger.info("init Spring Context...");
 		SimpleDateFormat sdf_ymdhms =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String startTime=sdf_ymdhms.format(new Date());

maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractWebApplicationService.java

@@ -55,6 +55,7 @@ public abstract class AbstractWebApplicationService  {
         this.artifactId = artifactId;
     }
 
+    @Override
     public final String toString() {
         return this.id;
     }
@@ -102,6 +103,7 @@ public abstract class AbstractWebApplicationService  {
         return this.originalUrl;
     }
 
+    @Override
     public boolean equals(final Object object) {
         if (object == null) {
             return false;
@@ -116,6 +118,7 @@ public abstract class AbstractWebApplicationService  {
         return false;
     }
 
+    @Override
     public int hashCode() {
         final int prime = 41;
         int result = 1;

maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/RandomServiceTicketServices.java

@@ -27,6 +27,7 @@ public abstract class RandomServiceTicketServices implements TicketServices {
 	
 	private DefaultUniqueTicketIdGenerator generator=new DefaultUniqueTicketIdGenerator();
 
+	@Override
 	public String createTicket(Ticket ticket) {
 		//String code = generator.generate();
 		/*
@@ -83,6 +84,7 @@ public abstract class RandomServiceTicketServices implements TicketServices {
 		return ticketId;
 	}
 
+	@Override
 	public Ticket consumeTicket(String ticketId) throws Exception{
 		Ticket  ticket = this.remove(ticketId);
 		if (ticket == null) {

maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java

@@ -88,7 +88,7 @@ public class ServiceTicketImpl extends AbstractTicket  implements ServiceTicket{
      * policy in that, depending on the policy configuration, the ticket
      * may be considered expired.
      */
-
+    @Override
     public boolean isValidFor(final Service serviceToValidate) {
         update();
         return serviceToValidate.matches(this.service);

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultExpiringOAuth2RefreshToken.java

@@ -41,6 +41,7 @@ public class DefaultExpiringOAuth2RefreshToken extends DefaultOAuth2RefreshToken
 	 * 
 	 * @return The instant the token expires.
 	 */
+	@Override
 	public Date getExpiration() {
 		return expiration;
 	}

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/common/DefaultOAuth2AccessToken.java

@@ -95,10 +95,12 @@ public class DefaultOAuth2AccessToken implements Serializable, OAuth2AccessToken
      * 
      * @return The token value.
      */
+    @Override
     public String getValue() {
         return value;
     }
 
+    @Override
     public int getExpiresIn() {
         return expiration != null ? Long.valueOf((expiration.getTime() - System.currentTimeMillis()) / 1000L).intValue()
                 : 0;
@@ -113,6 +115,7 @@ public class DefaultOAuth2AccessToken implements Serializable, OAuth2AccessToken
      * 
      * @return The instant the token expires.
      */
+    @Override
     public Date getExpiration() {
         return expiration;
     }
@@ -131,6 +134,7 @@ public class DefaultOAuth2AccessToken implements Serializable, OAuth2AccessToken
      * 
      * @return true if the expiration is befor ethe current time
      */
+    @Override
     public boolean isExpired() {
         return expiration != null && expiration.before(new Date());
     }
@@ -142,6 +146,7 @@ public class DefaultOAuth2AccessToken implements Serializable, OAuth2AccessToken
      * 
      * @return The token type, as introduced in draft 11 of the OAuth 2 spec.
      */
+    @Override
     public String getTokenType() {
         return tokenType;
     }
@@ -161,6 +166,7 @@ public class DefaultOAuth2AccessToken implements Serializable, OAuth2AccessToken
      * 
      * @return The refresh token associated with the access token, if any.
      */
+    @Override
     public OAuth2RefreshToken getRefreshToken() {
         return refreshToken;
     }
@@ -180,6 +186,7 @@ public class DefaultOAuth2AccessToken implements Serializable, OAuth2AccessToken
      * 
      * @return The scope of the token.
      */
+    @Override
     public Set<String> getScope() {
         return scope;
     }
@@ -249,6 +256,7 @@ public class DefaultOAuth2AccessToken implements Serializable, OAuth2AccessToken
      * 
      * @return the additional information (default empty)
      */
+    @Override
     public Map<String, Object> getAdditionalInformation() {
         return additionalInformation;
     }

maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java

@@ -108,14 +108,15 @@ public class ExtractPostBindingAdapter implements ExtractBindingAdapter, Initial
 	@Override
 	public String extractSAMLMessage(HttpServletRequest request) {
 	    
-		if(StringUtils.isNotBlank(request.getParameter(SAML_REQUEST_POST_PARAM_NAME)))
+		if(StringUtils.isNotBlank(request.getParameter(SAML_REQUEST_POST_PARAM_NAME))) {
 			return request.getParameter(SAML_REQUEST_POST_PARAM_NAME);
-		else
+		}else {
 			return request.getParameter(SAML_RESPONSE_POST_PARAM_NAME);
+		}
 		
 	}
 	
-
+	@Override
 	public void buildSecurityPolicyResolver(KeyStore trustKeyStore) {
 	    _logger.debug("EntityName {}, KeystorePassword {}",
 	                    keyStoreLoader.getEntityName(),keyStoreLoader.getKeystorePassword());
@@ -133,6 +134,7 @@ public class ExtractPostBindingAdapter implements ExtractBindingAdapter, Initial
 	/**
 	 * @param securityPolicyResolver the securityPolicyResolver to set
 	 */
+	@Override
 	public void setSecurityPolicyResolver(
 			SecurityPolicyResolver securityPolicyResolver) {
 		this.securityPolicyResolver = securityPolicyResolver;
@@ -148,10 +150,12 @@ public class ExtractPostBindingAdapter implements ExtractBindingAdapter, Initial
 		this.saml20Detail=saml20Detail;
 	}
 
+	@Override
 	public AppsSAML20Details getSaml20Detail() {
 		return saml20Detail;
 	}
 
+	@Override
 	public KeyStoreLoader getKeyStoreLoader() {
 		return keyStoreLoader;
 	}

maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractRedirectBindingAdapter.java

@@ -42,6 +42,7 @@ public class ExtractRedirectBindingAdapter extends ExtractPostBindingAdapter{
 		this.securityPolicyResolver = securityPolicyResolver;
 	}
 	
+	@Override
 	public void buildSecurityPolicyResolver(KeyStore trustKeyStore) {
 
 		TrustResolver trustResolver = new TrustResolver(trustKeyStore,

maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java

@@ -171,6 +171,7 @@ public class PostBindingAdapter implements BindingAdapter, InitializingBean{
 	/**
 	 * @param securityPolicyResolver the securityPolicyResolver to set
 	 */
+	@Override
 	public void setSecurityPolicyResolver(
 			SecurityPolicyResolver securityPolicyResolver) {
 		this.securityPolicyResolver = securityPolicyResolver;
@@ -186,6 +187,7 @@ public class PostBindingAdapter implements BindingAdapter, InitializingBean{
 		return extractBindingAdapter.getKeyStoreLoader();
 	}
 
+	@Override
 	public Credential getSigningCredential() {
 		return signingCredential;
 	}
@@ -194,6 +196,7 @@ public class PostBindingAdapter implements BindingAdapter, InitializingBean{
 		this.signingCredential = signingCredential;
 	}
 
+	@Override
 	public Credential getSpSigningCredential() {
 		return spSigningCredential;
 	}
@@ -202,14 +205,17 @@ public class PostBindingAdapter implements BindingAdapter, InitializingBean{
 		this.spSigningCredential = spSigningCredential;
 	}
 	
+	@Override
 	public AuthnRequestInfo getAuthnRequestInfo() {
 		return authnRequestInfo;
 	}
 
+	@Override
 	public void setAuthnRequestInfo(AuthnRequestInfo authnRequestInfo) {
 		this.authnRequestInfo = authnRequestInfo;
 	}
 
+	@Override
 	public void setRelayState(String relayState) {
 		this.relayState = relayState;
 	}

maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/dromara/maxkey/autoconfigure/SynchronizerAutoConfiguration.java

@@ -95,7 +95,8 @@ public class SynchronizerAutoConfiguration   implements InitializingBean {
 
 	public List<Synchronizers> querySynchronizers(JdbcTemplate  jdbcTemplate) {
 		return  jdbcTemplate.query(SYNCHRONIZERS_SELECT_STATEMENT, new RowMapper<Synchronizers>() {
-        	public Synchronizers mapRow(ResultSet rs, int rowNum) throws SQLException {
+			@Override
+			public Synchronizers mapRow(ResultSet rs, int rowNum) throws SQLException {
 	        	 Synchronizers synchronizer = new Synchronizers();
 	        	 synchronizer.setId(         rs.getString("id"));
 	        	 synchronizer.setName(       rs.getString("name"));

maxkey-web-frontend/maxkey-web-mgt-app/.vscode/settings.json

@@ -2,10 +2,8 @@
   "typescript.tsdk": "./node_modules/typescript/lib",
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    // For ESLint
+    "source.fixAll.eslint": "explicit",
-    "source.fixAll.eslint": true,
+    "source.fixAll.stylelint": "explicit"
-    // For Stylelint
-    "source.fixAll.stylelint": true
   },
   "[markdown]": {
     "editor.formatOnSave": false

maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java

@@ -229,9 +229,10 @@ public class LoginEntryPoint {
 		 				String remeberMe = remeberMeManager.createRemeberMe(authentication, request, response);
 		 				authJwt.setRemeberMe(remeberMe);
 			 		}
-		 			if(WebContext.getAttribute(WebConstants.CURRENT_USER_PASSWORD_SET_TYPE)!=null)
+		 			if(WebContext.getAttribute(WebConstants.CURRENT_USER_PASSWORD_SET_TYPE)!=null) {
 		 				authJwt.setPasswordSetType(
 		 					(Integer)WebContext.getAttribute(WebConstants.CURRENT_USER_PASSWORD_SET_TYPE));
+		 			}
 		 			authJwtMessage = new Message<AuthJwt>(authJwt);
 		 			
 		 		}else {//fail

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/LocalizationController.java

@@ -53,7 +53,9 @@ public class LocalizationController {
 		@RequestMapping(value={"/forward/{property}"})
 		public ModelAndView forward(@PathVariable("property") String property,@CurrentUser UserInfo currentUser){
 			Localization localization = localizationRepository.get(property,currentUser.getInstId());
-			if(localization == null )localization = new Localization();
+			if(localization == null ) {
+				localization = new Localization();
+			}
 			localization.setProperty(property);
 			localization.setInstId(currentUser.getInstId());
 			return new ModelAndView("localization/updateLocalization","model",localization);