20220207_2后端日志更新代码_代码质量测试1-编译器自测修复

src/main/java/com/jkcredit/invoice/credit/SimpleCORSFilter.java

@@ -1,6 +1,5 @@
 package com.jkcredit.invoice.credit;
 
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jkcredit.invoice.common.ApiResult;
 import com.jkcredit.invoice.common.DataResult;
@@ -8,6 +7,7 @@ import com.jkcredit.invoice.common.RequestApi;
 import com.jkcredit.invoice.common.ResponseCode;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.service.customer.CustomerService;
+import com.jkcredit.invoice.util.CorsFilterCheckUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,8 +21,6 @@ import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @Description: 跨域请求拦截器
@@ -277,60 +275,16 @@ public class SimpleCORSFilter implements Filter {
     }
 
     private String getApi(String request){
-        String api = "";
-        Pattern p=Pattern.compile("api=(\\w+)&");
-        Matcher m=p.matcher(request);
-        while(m.find()){
-            api = m.group(1);
-        }
-        if(StringUtils.isEmpty(api)){
-            api = JSONObject.parseObject(request.substring(0, request.length()-1)).getString("api");
-        }
-        return  api;
+        return  CorsFilterCheckUtil.getApi(request);
     }
     private String getAppKey(String request){
-        String appkey = "";
-        Pattern p=Pattern.compile("appKey=(\\w+)&");
-        Matcher m=p.matcher(request);
-        while(m.find()){
-            appkey = m.group(1);
-        }
-
-        if(StringUtils.isEmpty(appkey)){
-            appkey = JSONObject.parseObject(request.substring(0, request.length()-1)).getString("appKey");
-
-        }
-        return  appkey;
+        return  CorsFilterCheckUtil.getAppKey(request);
     }
     private String getAppSecret(String request){
-        String appSecret = "";
-        Pattern p=Pattern.compile("appSecret=(\\w+)&");
-        Matcher m=p.matcher(request);
-        while(m.find()){
-            appSecret = m.group(1);
-        }
-
-        if(StringUtils.isEmpty(appSecret)){
-            appSecret = JSONObject.parseObject(request.substring(0, request.length()-1)).getString("appSecret");
-
-        }
-
-        return  appSecret;
+        return  CorsFilterCheckUtil.getAppSecret(request);
     }
     private String getData(String request){
-        String data = "";
-        Pattern p=Pattern.compile("data=([^&]*)&");
-        Matcher m=p.matcher(request);
-        while(m.find()){
-            data = m.group(1);
-
-        }
-
-        if(StringUtils.isEmpty(data)){
-           // data = getsrt("\"data\":", ",", request).trim();;
-            data = JSONObject.parseObject(request.substring(0, request.length()-1)).getString("data");
-        }
-        return  data;
+        return  CorsFilterCheckUtil.getData(request);
     }
     /**
      * 用户 Token 校验

src/main/java/com/jkcredit/invoice/credit/custInterface/NoCarInterServiceImpl.java

@@ -548,7 +548,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
         noCarWayBill.setIntfaceStartTime(DateUtil.getCurrentDateStr());
         noCarWayBill.setUpdateTime(DateUtil.getCurrentDateStr());
         NoCarWayBill curr = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
-        if(curr == null){
+        if(null == curr){
             noCarWaybillMapper.insert(noCarWayBill);
         }else{
             if(curr.getBillwayStatus()<1)

src/main/java/com/jkcredit/invoice/model/entity/Calculate/NoCarCalculateInfor.java

@@ -185,8 +185,12 @@ public class NoCarCalculateInfor {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o){
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
         NoCarCalculateInfor that = (NoCarCalculateInfor) o;
         return Objects.equals(tradeId, that.tradeId);
     }

src/main/java/com/jkcredit/invoice/util/Base64Util.java

@@ -26,7 +26,9 @@ public class Base64Util {
             e.printStackTrace();
         } finally {
             try {
-                if (null != inStream) inStream.close();
+                if (null != inStream) {
+                    inStream.close();
+                }
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -36,7 +38,9 @@ public class Base64Util {
 
     //合并数组
     public static byte[] byteMerger(byte[] totalArr, byte[] mergerArr, int mergerLen) {
-        if (null == totalArr || null == mergerArr) return totalArr;
+        if (null == totalArr || null == mergerArr){
+            return totalArr;
+        }
         if (mergerLen == 0 || mergerLen > mergerArr.length) {
             throw new RuntimeException("mergerLen : " + mergerArr + " ,mergerArrLen : " + mergerArr.length);
         }

src/main/java/com/jkcredit/invoice/util/CorsFilterCheckUtil.java

@@ -0,0 +1,81 @@
+package com.jkcredit.invoice.util;
+
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.regex.Pattern.*;
+
+/**
+ * @description: Pattern
+ * @author: mashengyi
+ * @create: 2019-05-30 17:24
+ * @version: V1.0
+ **/
+public class CorsFilterCheckUtil {
+
+
+    public static String getApi(String requestApi) {
+        String api = "";
+        Pattern p= compile("api=(\\w+)&");
+        Matcher m=p.matcher(requestApi);
+        while(m.find()){
+            api = m.group(1);
+        }
+        if(StringUtils.isEmpty(api)){
+            api = JSONObject.parseObject(requestApi.substring(0, requestApi.length()-1)).getString("api");
+        }
+        return  api;
+    }
+
+
+
+    public static String getAppKey(String requestAppkey) {
+        String appkey = "";
+        Pattern p= compile("appKey=(\\w+)&");
+        Matcher m=p.matcher(requestAppkey);
+        while(m.find()){
+            appkey = m.group(1);
+        }
+        if(StringUtils.isEmpty(appkey)){
+            appkey = JSONObject.parseObject(requestAppkey.substring(0, requestAppkey.length()-1)).getString("appKey");
+        }
+        return  appkey;
+    }
+
+
+
+    public static String getAppSecret(String requestAppSecret) {
+        String appSecret = "";
+        Pattern p= compile("appSecret=(\\w+)&");
+        Matcher m=p.matcher(requestAppSecret);
+        while(m.find()){
+            appSecret = m.group(1);
+        }
+        if(StringUtils.isEmpty(appSecret)){
+            appSecret = JSONObject.parseObject(requestAppSecret.substring(0, requestAppSecret.length()-1)).getString("appSecret");
+        }
+        return  appSecret;
+    }
+
+
+
+    public static String getData(String requestData) {
+        String data = "";
+        Pattern p= compile("data=([^&]*)&");
+        Matcher m=p.matcher(requestData);
+        while(m.find()){
+            data = m.group(1);
+
+        }
+        if(StringUtils.isEmpty(data)){
+            // data = getsrt("\"data\":", ",", request).trim();;
+            data = JSONObject.parseObject(requestData.substring(0, requestData.length()-1)).getString("data");
+        }
+        return  data;
+    }
+
+}