yshop1.7发布,后台升級eladmin2.4(前端,后台权限,代码生成器等重构),修复商品分类等一些问题

yshop-tools/src/main/java/co/yixiang/utils/AliPayStatusEnum.java

@@ -7,31 +7,21 @@ package co.yixiang.utils;
  */
 public enum  AliPayStatusEnum {
 
-    /**
-     * 交易成功
-     */
+    /** 交易成功 */
     FINISHED("交易成功", "TRADE_FINISHED"),
 
-    /**
-     * 支付成功
-     */
+    /** 支付成功 */
     SUCCESS("支付成功", "TRADE_SUCCESS"),
 
-    /**
-     * 交易创建
-     */
+    /** 交易创建 */
     BUYER_PAY("交易创建", "WAIT_BUYER_PAY"),
 
-    /**
-     * 交易关闭
-     */
+    /** 交易关闭 */
     CLOSED("交易关闭", "TRADE_CLOSED");
 
-    private String name;
     private String value;
 
     AliPayStatusEnum(String name, String value) {
-        this.name = name;
         this.value = value;
     }
 

yshop-tools/src/main/java/co/yixiang/utils/AlipayUtils.java

@@ -1,6 +1,5 @@
 package co.yixiang.utils;
 
-import cn.hutool.core.util.StrUtil;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.internal.util.AlipaySignature;
 import co.yixiang.domain.AlipayConfig;
@@ -9,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -22,7 +20,7 @@ public class AlipayUtils {
 
     /**
      * 生成订单号
-     * @return
+     * @return String
      */
     public String getOrderCode() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -35,24 +33,22 @@ public class AlipayUtils {
         String[] split1 = s.split(" ");
         String s1 = split1[0] + split1[1];
         String[] split2 = s1.split(":");
-        String s2 = split2[0] + split2[1] + split2[2] + a;
-        return s2;
+        return split2[0] + split2[1] + split2[2] + a;
     }
 
     /**
      * 校验签名
-     * @param request
-     * @return
+     * @param request HttpServletRequest
+     * @param alipay 阿里云配置
+     * @return boolean
      */
     public boolean rsaCheck(HttpServletRequest request, AlipayConfig alipay){
 
-        /**
-         *  获取支付宝POST过来反馈信息
-         */
+        // 获取支付宝POST过来反馈信息
         Map<String,String> params = new HashMap<>(1);
         Map requestParams = request.getParameterMap();
-        for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
-            String name = (String) iter.next();
+        for (Object o : requestParams.keySet()) {
+            String name = (String) o;
             String[] values = (String[]) requestParams.get(name);
             String valueStr = "";
             for (int i = 0; i < values.length; i++) {
@@ -63,17 +59,12 @@ public class AlipayUtils {
         }
 
         try {
-            boolean verifyResult = AlipaySignature.rsaCheckV1(params,
+            return AlipaySignature.rsaCheckV1(params,
                     alipay.getPublicKey(),
                     alipay.getCharset(),
                     alipay.getSignType());
-            return verifyResult;
         } catch (AlipayApiException e) {
             return false;
         }
     }
-
-    public boolean isEmpty(String str){
-        return StrUtil.isEmpty(str);
-    }
 }

yshop-tools/src/main/java/co/yixiang/utils/QiNiuUtil.java

@@ -1,6 +1,7 @@
 package co.yixiang.utils;
 
 import com.qiniu.storage.Region;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -11,18 +12,18 @@ import java.util.Date;
  */
 public class QiNiuUtil {
 
-    public static final String HUAD = "华东";
+    private static final String HUAD = "华东";
 
-    public static final String HUAB = "华北";
+    private static final String HUAB = "华北";
 
-    public static final String HUAN = "华南";
+    private static final String HUAN = "华南";
 
-    public static final String BEIM = "北美";
+    private static final String BEIM = "北美";
 
     /**
      * 得到机房的对应关系
-     * @param zone
-     * @return
+     * @param zone 机房名称
+     * @return Region
      */
     public static Region getRegion(String zone){
 
@@ -42,17 +43,15 @@ public class QiNiuUtil {
 
     /**
      * 默认不指定key的情况下，以文件内容的hash值作为文件名
-     * @param file
-     * @return
+     * @param file 文件名
+     * @return String
      */
     public static String getKey(String file){
-        StringBuffer key = new StringBuffer(FileUtil.getFileNameNoEx(file));
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         Date date = new Date();
-        key.append("-");
-        key.append(sdf.format(date));
-        key.append(".");
-        key.append(FileUtil.getExtensionName(file));
-        return key.toString();
+        return FileUtil.getFileNameNoEx(file) + "-" +
+                sdf.format(date) +
+                "." +
+                FileUtil.getExtensionName(file);
     }
 }