1.3.2

crmeb/src/main/java/com/utils/CrmebUtil.java

@@ -603,6 +603,7 @@ public class CrmebUtil {
 
     /**
      * 同比率计算 //同比增长率= ((当前周期 - 上一个周期) ÷ 上一个周期 ) *100%
+     * 如果上个周期为0， = 当前周期 * 100%
      * @param b1 当前周期
      * @param b2 上一个周期
      * @author Mr.Zhang
@@ -619,7 +620,7 @@ public class CrmebUtil {
 
         if(b2.equals(BigDecimal.ZERO)){
             //b2是0
-            return BigDecimal.TEN.multiply(BigDecimal.TEN).setScale(2, BigDecimal.ROUND_UP);
+            return b1.setScale(2, BigDecimal.ROUND_UP);
         }
 
         return (b1.subtract(b2)).multiply(BigDecimal.TEN).multiply(BigDecimal.TEN).divide(b2, BigDecimal.ROUND_UP);
@@ -679,7 +680,7 @@ public class CrmebUtil {
      * @return 生成的随机码
      */
     public static String getOrderNo(String payType){
-        return getOrderNoPrefix(payType) + DateUtil.nowDate(Constants.DATE_TIME_FORMAT_NUM) + randomCount(11111, 99999);
+        return payType + DateUtil.nowDate(Constants.DATE_TIME_FORMAT_NUM) + randomCount(11111, 99999);
     }
 
     /**

crmeb/src/main/java/com/utils/RequestUtil.java

@@ -99,7 +99,8 @@ public class RequestUtil extends HttpServlet{
     public static String getUri(HttpServletRequest request){
         String uri = request.getRequestURI();
         List<String> list = CrmebUtil.stringToArrayStrRegex(uri, "/");
-        list.removeIf(StringUtils::isNumeric);
+        list.removeIf(StringUtils::isNumeric); //去掉url中的数字参数
+        list.removeIf(c -> c.contains(","));// 去掉url中的逗号分隔参数
         return StringUtils.join(list, "/");
     }
 }

crmeb/src/main/java/com/utils/RestTemplateUtil.java

@@ -21,6 +21,7 @@ import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -68,6 +69,17 @@ public class RestTemplateUtil {
             " (" + System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version") +
             ") Java/" + System.getProperty("java.version") + " HttpClient/" + HttpClient.class.getPackage().getImplementationVersion();
 
+//    /**
+//     * 设置超时时间
+//     */
+//    public RestTemplateUtil() {
+//        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+//        //30s
+//        requestFactory.setConnectTimeout(30*1000);
+//        requestFactory.setReadTimeout(30*1000);
+//        restTemplate = new RestTemplate(requestFactory);
+//    }
+
     /**
      * 发送GET请求
      * @param url
@@ -436,6 +448,11 @@ public class RestTemplateUtil {
         HttpEntity<MultiValueMap<String, Object>> requestEntity =
                 new HttpEntity<>(params, headers);
 
+//        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+//        //30s
+//        requestFactory.setConnectTimeout(30*1000);
+//        requestFactory.setReadTimeout(30*1000);
+//        restTemplate = new RestTemplate(requestFactory);
         return restTemplate.postForEntity(url, requestEntity, String.class).getBody();
     }
 }

crmeb/src/main/java/com/utils/UploadUtil.java

@@ -1,6 +1,7 @@
 package com.utils;
 
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import com.constants.Constants;
 import com.exception.CrmebException;
 import com.zbkj.crmeb.upload.vo.FileResultVo;
@@ -35,7 +36,8 @@ public class UploadUtil {
 
     //类型
 //    private static String imagePath = "/image";
-    private static String type = "/image";
+//    private static String type = "/image";
+    private static String type = "/crmebimage";
 
 
     //模块
@@ -260,12 +262,17 @@ public class UploadUtil {
         }
         // 文件名
         String fileName = multipartFile.getOriginalFilename();
+        System.out.println("fileName = " + fileName);
         // 文件后缀名
         String extName = FilenameUtils.getExtension(fileName);
         if (StringUtils.isEmpty(extName)) {
             throw new RuntimeException("文件类型未定义不能上传...");
         }
 
+        if (fileName.length() > 99) {
+            fileName = StrUtil.subPre(fileName, 90).concat(".").concat(extName);
+        }
+
         //文件大小验证
         checkSize(multipartFile.getSize());