update

src/main/java/cn/qg/qaplatform/mock/interceptor/YeebaoInterceptor.java

@@ -116,16 +116,16 @@ public class YeebaoInterceptor implements HandlerInterceptor {
         Map<String, Object> responseMap = new HashMap<>();
         String responseStr = null;
         if (mock.getFlag().equals(1)) {
-            if (mock.getType() == 2) {
-                responseStr = mock.getSuccess();
-            } else if (mock.getType() == 1) {
+            if (mock.getType() == 1) {
                 responseMap = JsonTransUtils.strToMap(mock.getSuccess());
+            } else if (mock.getType() == 2) {
+                responseStr = mock.getSuccess();
             }
         } else if (mock.getFlag().equals(0)) {
-            if (mock.getType() == 2) {
-                responseStr = mock.getSuccess();
-            } else if (mock.getType() == 1) {
+            if (mock.getType() == 1) {
                 responseMap = JsonTransUtils.strToMap(mock.getSuccess());
+            } else if (mock.getType() == 2) {
+                responseStr = mock.getSuccess();
             }
         }
         if (mock.getEncrypt() == 1) {
@@ -144,24 +144,19 @@ public class YeebaoInterceptor implements HandlerInterceptor {
                 modifyResponse(response, encryptConvertor.encrypt(JsonTransUtils.mapToJson(responseMap)));
                 return true;
             }
-            // 判断返回是字符串还是json,1-字符串，2-json
+            // 判断返回是字符串还是json,1-json，2-字符串
             if (mock.getType() == 1) {
-                modifyResponse(response, encryptConvertor.encrypt(responseStr));
-                return true;
-            } else if (mock.getType() == 2) {
                 responseMap = handleResponseMap(requestMap, responseMap);
                 if (uri.equals("/tzt-api/api/bindcard/request")) {
                     requestMap.put("yborderid", "TZAUba0c7b8" + requestMap.get("requestno") + "95c929ca802e");
                 }
                 modifyResponse(response, encryptConvertor.encrypt(JsonTransUtils.mapToJson(responseMap)), "application/json; charset=utf-8");
                 return true;
-            }
-        } else if (mock.getEncrypt() == 0) {
-            if (uri.equals("/tzt-api/api/divide/record")) {
-                responseStr = "{\"dividelist\":[{\"divideamount\":\"0.01\",\"dividevalue\":\"0.01\",\"dividemode\":\"AMOUNT\",\"ledgerno\":\"10000449633\"}],\"errorcode\":\"\",\"errormsg\":\"\",\"free1\":\"\",\"free2\":\"\",\"free3\":\"\",\"merchantno\":\"10000449592\",\"requestno\":\"67467179200514\",\"sign\":\"RzhX1vUEQp1nI5lDCeroMr0VgOJ1pQknwN++Y7oyTUAvHErLUtZcNQulCUlh3iwlzRHWL5uJain6NQ79Z2T38MZ8hqDohpReFH31YMWoDytJJpS5B2zLTVZIyHq4GmjmS/HXDpvZnMgoZibOESLsKLbS7dTnhdxy8ceDliJhBQ4=\",\"status\":\"DIVIDE_SUCCESS\",\"yborderid\":\"TZNC19ec1bd4222e489c9409854452b31138\"}";
-                modifyResponse(response, responseStr);
+            } else if (mock.getType() == 2) {
+                modifyResponse(response, encryptConvertor.encrypt(responseStr));
                 return true;
             }
+        } else if (mock.getEncrypt() == 0) {
             // 针对 /balance-board/transfer 接口特殊处理
             if (uri.equals("/balance-board/transfer")) {
                 BufferedReader br = request.getReader();
@@ -170,6 +165,7 @@ public class YeebaoInterceptor implements HandlerInterceptor {
                 while((str = br.readLine()) != null){
                     requestData.append(str);
                 }
+                br.close();
                 String cmd = requestData.toString().split("<cmd>")[1].split("</cmd>")[0];
                 log.info("yeepay-transfer cmd-------- {}", cmd);
                 String transferResponse = null;
@@ -189,10 +185,10 @@ public class YeebaoInterceptor implements HandlerInterceptor {
                 return false;
             }
             if (mock.getType() == 1) {
-                modifyResponse(response, responseStr);
+                modifyResponse(response, JsonTransUtils.mapToJson(responseMap));
                 return true;
             } else if (mock.getType() == 2) {
-                modifyResponse(response, JsonTransUtils.mapToJson(responseMap));
+                modifyResponse(response, responseStr);
                 return true;
             }
         }