Merge branch 'master' into auto

src/main/java/cn/qg/holmes/controller/mock/MockController.java

 package cn.qg.holmes.controller.mock;
 
 import cn.qg.holmes.common.JsonResult;
-import cn.qg.holmes.encrypt.EncryptConvertor;
-import cn.qg.holmes.encrypt.EncryptFactory;
-import cn.qg.holmes.encrypt.YeebaoEncryptConvertor;
 import cn.qg.holmes.entity.mock.Mock;
 import cn.qg.holmes.entity.mock.MockModule;
 import cn.qg.holmes.service.mock.MockModuleService;
 import cn.qg.holmes.service.mock.MockService;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;

src/main/java/cn/qg/holmes/interceptor/YeebaoInterceptor.java

@@ -67,13 +67,13 @@ public class YeebaoInterceptor implements HandlerInterceptor {
             if (mock.getType() == 1) {
                 responseMap = disposeResponseMap(requestMap, responseMap);
                 // 针对 /tzt-api/api/bankcard/check 接口特殊处理
-                if (uri.equals("/tzt-api/api/bankcard/check")) {
+                if (uri.equals("/tzt-api/api/bankcard/check") && mock.getFlag() == 1) {
                     responseMap = handleBankCardCheckResponse(requestMap, responseMap);
                 }
-                if (uri.equals("/tzt-api/api/bindcard/request")) {
+                if (uri.equals("/tzt-api/api/bindcard/request") && mock.getFlag() == 1) {
                     responseMap = handleBindCardRequest(requestMap, responseMap);
                 }
-                if (uri.equals("/tzt-api/api/bindcard/confirm")) {
+                if (uri.equals("/tzt-api/api/bindcard/confirm") && mock.getFlag() == 1) {
                     responseMap = handleBindCardConfirm(requestMap, responseMap);
                 }
                 constructResponse(response, encryptConvertor.encrypt(JSON.toJSONString(responseMap)), "application/json; charset=utf-8");
@@ -206,7 +206,7 @@ public class YeebaoInterceptor implements HandlerInterceptor {
      * @return 响应Map
      */
     public Map<String, Object> handleBankCardCheckResponse(Map<String, Object> requestMap, Map<String, Object> responseMap) {
-        String cardNo = requestMap.get("cardNo").toString();
+        String cardNo = requestMap.get("cardno").toString();
         String bankCode =  BankCardUtils.getCardCode(cardNo);
         String bankName = BankCardUtils.getBankName(bankCode);
         responseMap.put("bankcode", bankCode);