chore[litemall-core]: 采用spring的Base64Util来简化ExpressService代码

litemall-core/src/main/java/org/linlinjava/litemall/core/express/ExpressService.java

@@ -1,9 +1,10 @@
 package org.linlinjava.litemall.core.express;
 
 import org.linlinjava.litemall.core.express.config.ExpressConfig;
-import org.linlinjava.litemall.core.util.TinymallRequestUtil;
+import org.linlinjava.litemall.core.util.HttpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Base64Utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -47,14 +48,14 @@ public class ExpressService {
         String requestData = "{'OrderCode':'','ShipperCode':'" + expCode + "','LogisticCode':'" + expNo + "'}";
 
         Map<String, String> params = new HashMap<String, String>();
-        params.put("RequestData", urlEncoder(requestData, "UTF-8"));
+        params.put("RequestData", URLEncoder.encode(requestData, "UTF-8"));
         params.put("EBusinessID", config.getAppId());
         params.put("RequestType", "1002");
         String dataSign = encrypt(requestData, config.getAppKey(), "UTF-8");
-        params.put("DataSign", urlEncoder(dataSign, "UTF-8"));
+        params.put("DataSign", URLEncoder.encode(dataSign, "UTF-8"));
         params.put("DataType", "2");
 
-        String result = TinymallRequestUtil.sendPost(ReqURL, params);
+        String result = HttpUtil.sendPost(ReqURL, params);
 
         //根据公司业务处理返回的信息......
 
@@ -68,7 +69,6 @@ public class ExpressService {
      * @param charset 编码方式
      * @throws Exception
      */
-    @SuppressWarnings("unused")
     private String MD5(String str, String charset) throws Exception {
         MessageDigest md = MessageDigest.getInstance("MD5");
         md.update(str.getBytes(charset));
@@ -85,77 +85,27 @@ public class ExpressService {
     }
 
     /**
-     * base64编码
-     *
-     * @param str     内容
-     * @param charset 编码方式
-     * @throws UnsupportedEncodingException
-     */
-    private String base64(String str, String charset) throws UnsupportedEncodingException {
-        String encoded = base64Encode(str.getBytes(charset));
-        return encoded;
-    }
-
-    @SuppressWarnings("unused")
-    private String urlEncoder(String str, String charset) throws UnsupportedEncodingException {
-        String result = URLEncoder.encode(str, charset);
-        return result;
-    }
-
-    /**
-     * 电商Sign签名生成
+     * Sign签名生成
      *
      * @param content  内容
      * @param keyValue Appkey
      * @param charset  编码方式
      * @return DataSign签名
-     * @throws UnsupportedEncodingException ,Exception
      */
-    @SuppressWarnings("unused")
-    private String encrypt(String content, String keyValue, String charset) throws UnsupportedEncodingException, Exception {
+    private String encrypt(String content, String keyValue, String charset)  {
         if (keyValue != null) {
-            return base64(MD5(content + keyValue, charset), charset);
+            content = content + keyValue;
+        }
+        byte[] src = new byte[0];
+        try {
+            src = MD5(content, charset).getBytes(charset);
+            return Base64Utils.encodeToString(src);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        return base64(MD5(content, charset), charset);
+
+        return null;
     }
 
-    private static char[] base64EncodeChars = new char[]{
-            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-            'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-            'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-            'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-            'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
-            'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-            'w', 'x', 'y', 'z', '0', '1', '2', '3',
-            '4', '5', '6', '7', '8', '9', '+', '/'};
 
-    private static String base64Encode(byte[] data) {
-        StringBuffer sb = new StringBuffer();
-        int len = data.length;
-        int i = 0;
-        int b1, b2, b3;
-        while (i < len) {
-            b1 = data[i++] & 0xff;
-            if (i == len) {
-                sb.append(base64EncodeChars[b1 >>> 2]);
-                sb.append(base64EncodeChars[(b1 & 0x3) << 4]);
-                sb.append("==");
-                break;
-            }
-            b2 = data[i++] & 0xff;
-            if (i == len) {
-                sb.append(base64EncodeChars[b1 >>> 2]);
-                sb.append(base64EncodeChars[((b1 & 0x03) << 4) | ((b2 & 0xf0) >>> 4)]);
-                sb.append(base64EncodeChars[(b2 & 0x0f) << 2]);
-                sb.append("=");
-                break;
-            }
-            b3 = data[i++] & 0xff;
-            sb.append(base64EncodeChars[b1 >>> 2]);
-            sb.append(base64EncodeChars[((b1 & 0x03) << 4) | ((b2 & 0xf0) >>> 4)]);
-            sb.append(base64EncodeChars[((b2 & 0x0f) << 2) | ((b3 & 0xc0) >>> 6)]);
-            sb.append(base64EncodeChars[b3 & 0x3f]);
-        }
-        return sb.toString();
-    }
 }

litemall-core/src/main/java/org/linlinjava/litemall/core/util/TinymallRequestUtil.java

@@ -13,7 +13,7 @@ import java.util.Map;
  *
  * @return 远程资源的响应结果
  */
-public class TinymallRequestUtil {
+public class HttpUtil {
     /**
      * 向指定 URL 发送POST方法的请求
      *