代码优化

framework-base/src/main/java/com/chelvc/framework/base/context/RestContextHolder.java

@@ -81,7 +81,7 @@ public final class RestContextHolder {
             return function.apply(getGlobalTemplate());
         } catch (Exception e) {
             if (ErrorUtils.contains(e, IOException.class)) {
-                log.warn("Rest invoke failed and retry later: {}", e.getMessage());
+                log.warn("Rest request failed and retry later: {}", e.getMessage());
                 // 请求重试
                 return function.apply(new RestTemplate());
             }
@@ -101,7 +101,7 @@ public final class RestContextHolder {
         return execute(rest -> {
             boolean debug = log.isDebugEnabled();
             if (debug) {
-                log.debug("Rest invoke: {}", url);
+                log.debug("Rest request: {}", url);
             }
             T response = rest.getForObject(url, type);
             if (debug) {
@@ -124,7 +124,7 @@ public final class RestContextHolder {
         return execute(rest -> {
             boolean debug = log.isDebugEnabled();
             if (debug) {
-                log.debug("Rest invoke: {}, {}", url, Arrays.toString(parameters));
+                log.debug("Rest request: {}, {}", url, Arrays.toString(parameters));
             }
             T response = rest.getForObject(url, type, parameters);
             if (debug) {
@@ -147,7 +147,7 @@ public final class RestContextHolder {
         return execute(rest -> {
             boolean debug = log.isDebugEnabled();
             if (debug) {
-                log.debug("Rest invoke: {}, {}", url, parameters);
+                log.debug("Rest request: {}, {}", url, parameters);
             }
             T response = rest.getForObject(url, type, parameters);
             if (debug) {
@@ -170,7 +170,7 @@ public final class RestContextHolder {
         return execute(rest -> {
             boolean debug = log.isDebugEnabled();
             if (debug) {
-                log.debug("Rest invoke: {}, {}", url, request);
+                log.debug("Rest request: {}, {}", url, request);
             }
             T response = rest.postForObject(url, request, type);
             if (debug) {
@@ -195,7 +195,7 @@ public final class RestContextHolder {
         return execute(rest -> {
             boolean debug = log.isDebugEnabled();
             if (debug) {
-                log.debug("Rest invoke: {}, {}, {}", url, request, Arrays.toString(parameters));
+                log.debug("Rest request: {}, {}, {}", url, request, Arrays.toString(parameters));
             }
             T response = rest.postForObject(url, request, type, parameters);
             if (debug) {
@@ -220,7 +220,7 @@ public final class RestContextHolder {
         return execute(rest -> {
             boolean debug = log.isDebugEnabled();
             if (debug) {
-                log.debug("Rest invoke: {}, {}, {}", url, request, parameters);
+                log.debug("Rest request: {}, {}, {}", url, request, parameters);
             }
             T response = rest.postForObject(url, request, type, parameters);
             if (debug) {
@@ -242,7 +242,7 @@ public final class RestContextHolder {
         return execute(rest -> {
             boolean debug = log.isDebugEnabled();
             if (debug) {
-                log.debug("Rest invoke: {}", entity.getUrl());
+                log.debug("Rest request: {}", entity.getUrl());
             }
             T response = rest.exchange(entity, type).getBody();
             if (debug) {
@@ -264,7 +264,7 @@ public final class RestContextHolder {
         return execute(rest -> {
             boolean debug = log.isDebugEnabled();
             if (debug) {
-                log.debug("Rest invoke: {}", entity.getUrl());
+                log.debug("Rest request: {}", entity.getUrl());
             }
             T response = rest.exchange(entity, type).getBody();
             if (debug) {
@@ -290,7 +290,7 @@ public final class RestContextHolder {
             boolean debug = log.isDebugEnabled();
             if (debug) {
                 Object body = ObjectUtils.ifNull(entity, HttpEntity::getBody);
-                log.debug("Rest invoke: {}, {}", url, body);
+                log.debug("Rest request: {}, {}", url, body);
             }
             T response = rest.exchange(url, method, entity, type).getBody();
             if (debug) {
@@ -317,7 +317,7 @@ public final class RestContextHolder {
             boolean debug = log.isDebugEnabled();
             if (debug) {
                 Object body = ObjectUtils.ifNull(entity, HttpEntity::getBody);
-                log.debug("Rest invoke: {}, {}, {}", url, body, Arrays.toString(parameters));
+                log.debug("Rest request: {}, {}, {}", url, body, Arrays.toString(parameters));
             }
             T response = rest.exchange(url, method, entity, type, parameters).getBody();
             if (debug) {
@@ -344,7 +344,7 @@ public final class RestContextHolder {
             boolean debug = log.isDebugEnabled();
             if (debug) {
                 Object body = ObjectUtils.ifNull(entity, HttpEntity::getBody);
-                log.debug("Rest invoke: {}, {}, {}", url, body, parameters);
+                log.debug("Rest request: {}, {}, {}", url, body, parameters);
             }
             T response = rest.exchange(url, method, entity, type, parameters).getBody();
             if (debug) {
@@ -370,7 +370,7 @@ public final class RestContextHolder {
             boolean debug = log.isDebugEnabled();
             if (debug) {
                 Object body = ObjectUtils.ifNull(entity, HttpEntity::getBody);
-                log.debug("Rest invoke: {}, {}", url, body);
+                log.debug("Rest request: {}, {}", url, body);
             }
             T response = rest.exchange(url, method, entity, type).getBody();
             if (debug) {
@@ -397,7 +397,7 @@ public final class RestContextHolder {
             boolean debug = log.isDebugEnabled();
             if (debug) {
                 Object body = ObjectUtils.ifNull(entity, HttpEntity::getBody);
-                log.debug("Rest invoke: {}, {}, {}", url, body, Arrays.toString(parameters));
+                log.debug("Rest request: {}, {}, {}", url, body, Arrays.toString(parameters));
             }
             T response = rest.exchange(url, method, entity, type, parameters).getBody();
             if (debug) {
@@ -424,7 +424,7 @@ public final class RestContextHolder {
             boolean debug = log.isDebugEnabled();
             if (debug) {
                 Object body = ObjectUtils.ifNull(entity, HttpEntity::getBody);
-                log.debug("Rest invoke: {}, {}, {}", url, body, parameters);
+                log.debug("Rest request: {}, {}, {}", url, body, parameters);
             }
             T response = rest.exchange(url, method, entity, type, parameters).getBody();
             if (debug) {

framework-base/src/main/java/com/chelvc/framework/base/crypto/AbstractCipherHandler.java

@@ -1,9 +1,12 @@
 package com.chelvc.framework.base.crypto;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import javax.crypto.Cipher;
 
 import com.chelvc.framework.common.util.CodecUtils;
+import com.chelvc.framework.common.util.StringUtils;
+import org.apache.commons.codec.binary.Base64;
 
 /**
  * 加解密处理抽象实现
@@ -32,9 +35,25 @@ public abstract class AbstractCipherHandler implements CipherHandler {
         return CodecUtils.codec(encryptor, bytes);
     }
 
+    @Override
+    public String encrypt(String plaintext) {
+        if (StringUtils.isEmpty(plaintext)) {
+            return plaintext;
+        }
+        return Base64.encodeBase64String(this.encrypt(plaintext.getBytes(StandardCharsets.UTF_8)));
+    }
+
     @Override
     public byte[] decrypt(byte[] bytes) {
         Cipher decrypter = Objects.requireNonNull(this.getDecrypter());
         return CodecUtils.codec(decrypter, bytes);
     }
+
+    @Override
+    public String decrypt(String ciphertext) {
+        if (StringUtils.isEmpty(ciphertext)) {
+            return ciphertext;
+        }
+        return new String(this.decrypt(CodecUtils.decodeBase64(ciphertext)), StandardCharsets.UTF_8);
+    }
 }

framework-base/src/main/java/com/chelvc/framework/base/crypto/CipherHandler.java

@@ -1,17 +1,14 @@
 package com.chelvc.framework.base.crypto;
 
-import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import com.chelvc.framework.common.util.CodecUtils;
 import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,12 +38,7 @@ public interface CipherHandler {
      * @param plaintext 明文
      * @return 密文
      */
-    default String encrypt(String plaintext) {
-        if (StringUtils.isEmpty(plaintext)) {
-            return plaintext;
-        }
-        return Base64.encodeBase64String(this.encrypt(plaintext.getBytes(StandardCharsets.UTF_8)));
-    }
+    String encrypt(String plaintext);
 
     /**
      * 数据加密
@@ -166,12 +158,7 @@ public interface CipherHandler {
      * @param ciphertext 密文
      * @return 明文
      */
-    default String decrypt(String ciphertext) {
-        if (StringUtils.isEmpty(ciphertext)) {
-            return ciphertext;
-        }
-        return new String(this.decrypt(CodecUtils.decodeBase64(ciphertext)), StandardCharsets.UTF_8);
-    }
+    String decrypt(String ciphertext);
 
     /**
      * 数据解密