优化项目，新增mock模块

src/main/java/cn/qg/qaplatform/QaPlatformApplication.java

@@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-@MapperScan(value = "cn.qg.qaplatform.dao")
+@MapperScan(value = "cn.qg.qaplatform.*.mapper")
 public class QaPlatformApplication {
 
     public static void main(String[] args) {

src/main/java/cn/qg/qaplatform/common/aspect/HttpLogAspect.java → src/main/java/cn/qg/qaplatform/aspect/HttpLogAspect.java

-package cn.qg.qaplatform.common.aspect;
+package cn.qg.qaplatform.aspect;
 
 import cn.qg.qaplatform.utils.JsonTransUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -17,6 +17,7 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.ArrayList;
@@ -32,7 +33,7 @@ import java.util.Map;
 public class HttpLogAspect {
     private static final Logger logger = LoggerFactory.getLogger(HttpLogAspect.class);
 
-    @Pointcut("execution(public * cn.qg.qaplatform.controller..*.*(..))")
+    @Pointcut("execution(public * cn.qg.qaplatform.zdata.controller..*.*(..))")
     public void httpRequestLog() {}
 
     /**

src/main/java/cn/qg/qaplatform/config/Swagger2Config.java

@@ -23,7 +23,7 @@ public class Swagger2Config {
                 .groupName("测试平台后台")
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("cn.qg.qaplatform.controller"))
+                .apis(RequestHandlerSelectors.basePackage("cn.qg.qaplatform.zdata.controller"))
                 .paths(PathSelectors.any())
                 .build()
                 .securitySchemes(securitySchemes())

src/main/java/cn/qg/qaplatform/common/SwitchDataSource.java → src/main/java/cn/qg/qaplatform/config/SwitchDataSource.java

-package cn.qg.qaplatform.common;
+package cn.qg.qaplatform.config;
 
-import cn.qg.qaplatform.common.enums.Namespace;
-import cn.qg.qaplatform.config.DynamicDataSource;
+import cn.qg.qaplatform.enums.Namespace;
 import com.alibaba.druid.pool.DruidDataSource;
 
 
@@ -15,6 +14,20 @@ public class SwitchDataSource {
 
     public static void dataSourceSwitch(String namespace, String database) {
 
+        /**
+         * dev1环境
+         */
+        if (namespace.equals("dev1")) {
+            DruidDataSource druidDataSource = new DruidDataSource();
+            String url = Namespace.DEV1.getUrl() + database + SUFFIX;
+            String dbKey = Namespace.DEV1.getKey();
+            druidDataSource.setUrl(url);
+            druidDataSource.setUsername(Namespace.DEV1.getUsername());
+            druidDataSource.setPassword(Namespace.DEV1.getPassword());
+            DynamicDataSource.dataSourcesMap.put(dbKey, druidDataSource);
+            DynamicDataSource.setDataSource(dbKey);
+        }
+
         /**
          * pre 环境
          */

src/main/java/cn/qg/qaplatform/common/enums/ErrorType.java → src/main/java/cn/qg/qaplatform/enums/ErrorType.java

-package cn.qg.qaplatform.common.enums;
+package cn.qg.qaplatform.enums;
 
 /**
  * 定义错误类别

src/main/java/cn/qg/qaplatform/common/enums/Namespace.java → src/main/java/cn/qg/qaplatform/enums/Namespace.java

-package cn.qg.qaplatform.common.enums;
+package cn.qg.qaplatform.enums;
 
 public enum Namespace {
 
-    PRE("pre","pre", "jdbc:mysql://172.17.5.14:32178/", "qa", "qatest"),
+    DEV1("dev1", "dev1", "jdbc:mysql://172.17.5.16:32661/", "qa", "qatest"),
+    PRE("pre","pre", "jdbc:mysql://172.17.5.17:32178/", "qa", "qatest"),
     QA("qa", "qa","jdbc:mysql://172.17.5.16:32743/", "qa", "qatest"),
     QA2("qa2", "qa2", "jdbc:mysql://172.17.5.5:31905/", "qa", "qatest"),
     QA3("qa3", "qa3","jdbc:mysql://172.17.5.14:32659/", "qa", "qatest"),

src/main/java/cn/qg/qaplatform/mock/config/InterceptorConfig.java

+package cn.qg.qaplatform.mock.config;
+
+import cn.qg.qaplatform.mock.interceptor.PayInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+
+@Configuration
+public class InterceptorConfig implements WebMvcConfigurer {
+
+    @Bean
+    public PayInterceptor payInterceptor() {
+        return new PayInterceptor();
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(payInterceptor()).addPathPatterns("/mock/**");
+    }
+
+}

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

+package cn.qg.qaplatform.mock.controller;
+
+import cn.qg.qaplatform.utils.JsonResult;
+import cn.qg.qaplatform.config.SwitchDataSource;
+import cn.qg.qaplatform.mock.entity.Mock;
+import cn.qg.qaplatform.mock.mapper.MockMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+public class MockController {
+
+    @Autowired
+    MockMapper mockMapper;
+
+    @RequestMapping(value = "/mock/**", method = { RequestMethod.GET, RequestMethod.POST})
+    public void mockMethod() {}
+
+    @GetMapping("/test")
+    public JsonResult test() {
+        SwitchDataSource.dataSourceSwitch("pre", "qa");
+        QueryWrapper<Mock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("url", "/pay");
+        Mock mock = mockMapper.selectOne(queryWrapper);
+        return JsonResult.success(mock);
+    }
+}

src/main/java/cn/qg/qaplatform/mock/entity/Mock.java

+package cn.qg.qaplatform.mock.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Mock {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    private String url;
+    private String description;
+    private String success;
+    private String fail;
+    private Integer flag;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+}

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

+package cn.qg.qaplatform.mock.interceptor;
+
+import cn.qg.qaplatform.config.SwitchDataSource;
+import cn.qg.qaplatform.mock.entity.Mock;
+import cn.qg.qaplatform.mock.mapper.MockMapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.Nullable;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
+
+@Slf4j
+public class PayInterceptor implements HandlerInterceptor {
+
+    @Autowired
+    MockMapper mockMapper;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
+            throws Exception {
+        SwitchDataSource.dataSourceSwitch("pre", "qa");
+        String uri = request.getRequestURI().substring(5);
+        QueryWrapper<Mock> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("url", uri);
+        Mock mock = mockMapper.selectOne(queryWrapper);
+        response.setHeader("Content-type", "application/json;charset=UTF-8");
+        response.setCharacterEncoding("UTF-8");
+        PrintWriter printWriter = response.getWriter();
+        if (mock.getFlag().equals(1)) {
+            printWriter.write(mock.getSuccess());
+        } else if (mock.getFlag().equals(0)) {
+            printWriter.write(mock.getFail());
+        }
+        // 对请求进行解密TF
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
+                            @Nullable ModelAndView modelAndView) throws Exception {
+        // 对请求加密
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
+                                 @Nullable Exception ex) throws Exception {
+        log.info("calling afterCompletion");
+
+    }
+}

src/main/java/cn/qg/qaplatform/mock/mapper/MockMapper.java

+package cn.qg.qaplatform.mock.mapper;
+
+import cn.qg.qaplatform.mock.entity.Mock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface MockMapper extends BaseMapper<Mock> {
+}

src/main/java/cn/qg/qaplatform/utils/DBUtils.java

 package cn.qg.qaplatform.utils;
 
-import cn.qg.qaplatform.common.enums.Namespace;
+import cn.qg.qaplatform.enums.Namespace;
 import org.apache.commons.dbutils.QueryRunner;
 
 import java.sql.*;

src/main/java/cn/qg/qaplatform/utils/EnumUtils.java

 package cn.qg.qaplatform.utils;
 
-import cn.qg.qaplatform.common.enums.ChannelEnum;
+import cn.qg.qaplatform.zdata.enums.ChannelEnum;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Field;

src/main/java/cn/qg/qaplatform/common/JsonResult.java → src/main/java/cn/qg/qaplatform/utils/JsonResult.java

-package cn.qg.qaplatform.common;
+package cn.qg.qaplatform.utils;
 
-import cn.qg.qaplatform.common.enums.ErrorType;
+import cn.qg.qaplatform.enums.ErrorType;
 import lombok.Data;
 
 /**

src/main/java/cn/qg/qaplatform/utils/Encrypt/LexinEncrypt.java → src/main/java/cn/qg/qaplatform/zdata/Encrypt/LexinEncrypt.java

-package cn.qg.qaplatform.utils.Encrypt;
+package cn.qg.qaplatform.zdata.Encrypt;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;

src/main/java/cn/qg/qaplatform/controller/GenLoanUserDataController.java → src/main/java/cn/qg/qaplatform/zdata/controller/GenLoanUserDataController.java

-package cn.qg.qaplatform.controller;
+package cn.qg.qaplatform.zdata.controller;
 
-import cn.qg.qaplatform.common.JsonResult;
-import cn.qg.qaplatform.common.enums.ChannelEnum;
-import cn.qg.qaplatform.common.enums.FundEnum;
-import cn.qg.qaplatform.domain.ApplyDataVo;
-import cn.qg.qaplatform.domain.GenLoanUser;
-import cn.qg.qaplatform.service.LexinDataService;
-import cn.qg.qaplatform.service.XyqbDataService;
-import cn.qg.qaplatform.service.QueryBasicLoanStatusDataService;
+import cn.qg.qaplatform.utils.JsonResult;
+import cn.qg.qaplatform.zdata.enums.ChannelEnum;
+import cn.qg.qaplatform.zdata.enums.FundEnum;
+import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
+import cn.qg.qaplatform.zdata.entity.GenLoanUser;
+import cn.qg.qaplatform.zdata.service.LexinDataService;
+import cn.qg.qaplatform.zdata.service.XyqbDataService;
+import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
 import cn.qg.qaplatform.utils.EnumUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/cn/qg/qaplatform/controller/GenVccController.java → src/main/java/cn/qg/qaplatform/zdata/controller/GenVccController.java

-package cn.qg.qaplatform.controller;
+package cn.qg.qaplatform.zdata.controller;
 
-import cn.qg.qaplatform.common.JsonResult;
-import cn.qg.qaplatform.domain.GenVccUser;
-import cn.qg.qaplatform.service.VccDataService;
+import cn.qg.qaplatform.utils.JsonResult;
+import cn.qg.qaplatform.zdata.entity.GenVccUser;
+import cn.qg.qaplatform.zdata.service.VccDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/qg/qaplatform/controller/QueryLoanUserDataController.java → src/main/java/cn/qg/qaplatform/zdata/controller/QueryLoanUserDataController.java

-package cn.qg.qaplatform.controller;
+package cn.qg.qaplatform.zdata.controller;
 
-import cn.qg.qaplatform.service.QueryLoanUserDataService;
-import cn.qg.qaplatform.common.JsonResult;
-import cn.qg.qaplatform.service.QueryBasicLoanStatusDataService;
+import cn.qg.qaplatform.zdata.service.QueryLoanUserDataService;
+import cn.qg.qaplatform.utils.JsonResult;
+import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/cn/qg/qaplatform/controller/QueryVccController.java → src/main/java/cn/qg/qaplatform/zdata/controller/QueryVccController.java

-package cn.qg.qaplatform.controller;
+package cn.qg.qaplatform.zdata.controller;
 
-import cn.qg.qaplatform.common.JsonResult;
-import cn.qg.qaplatform.common.enums.VccStatusEnum;
-import cn.qg.qaplatform.domain.QueryVccUser;
-import cn.qg.qaplatform.service.VccDataService;
+import cn.qg.qaplatform.utils.JsonResult;
+import cn.qg.qaplatform.zdata.enums.VccStatusEnum;
+import cn.qg.qaplatform.zdata.entity.QueryVccUser;
+import cn.qg.qaplatform.zdata.service.VccDataService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/cn/qg/qaplatform/domain/ApplyDataVo.java → src/main/java/cn/qg/qaplatform/zdata/entity/ApplyDataVo.java

-package cn.qg.qaplatform.domain;
+package cn.qg.qaplatform.zdata.entity;
 
 import lombok.Data;
 

src/main/java/cn/qg/qaplatform/domain/GenLoanUser.java → src/main/java/cn/qg/qaplatform/zdata/entity/GenLoanUser.java

-package cn.qg.qaplatform.domain;
+package cn.qg.qaplatform.zdata.entity;
 
 import lombok.Data;
 

src/main/java/cn/qg/qaplatform/domain/GenVccUser.java → src/main/java/cn/qg/qaplatform/zdata/entity/GenVccUser.java

-package cn.qg.qaplatform.domain;
+package cn.qg.qaplatform.zdata.entity;
 
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 public class GenVccUser {
     /**

src/main/java/cn/qg/qaplatform/domain/QueryLoanUser.java → src/main/java/cn/qg/qaplatform/zdata/entity/QueryLoanUser.java

-package cn.qg.qaplatform.domain;
+package cn.qg.qaplatform.zdata.entity;
 
 import lombok.Data;
 import java.util.Date;

src/main/java/cn/qg/qaplatform/domain/QueryVccUser.java → src/main/java/cn/qg/qaplatform/zdata/entity/QueryVccUser.java

-package cn.qg.qaplatform.domain;
+package cn.qg.qaplatform.zdata.entity;
 
 import lombok.Data;
 

src/main/java/cn/qg/qaplatform/common/enums/ChannelEnum.java → src/main/java/cn/qg/qaplatform/zdata/enums/ChannelEnum.java

-package cn.qg.qaplatform.common.enums;
+package cn.qg.qaplatform.zdata.enums;
 
 /**
  * 渠道枚举

src/main/java/cn/qg/qaplatform/common/enums/FundEnum.java → src/main/java/cn/qg/qaplatform/zdata/enums/FundEnum.java

-package cn.qg.qaplatform.common.enums;
+package cn.qg.qaplatform.zdata.enums;
 
 /**
  * 资方枚举

src/main/java/cn/qg/qaplatform/common/enums/LoanStatus.java → src/main/java/cn/qg/qaplatform/zdata/enums/LoanStatus.java

-package cn.qg.qaplatform.common.enums;
+package cn.qg.qaplatform.zdata.enums;
 
 /**
  * 借款状态枚举

src/main/java/cn/qg/qaplatform/common/enums/VccStatusEnum.java → src/main/java/cn/qg/qaplatform/zdata/enums/VccStatusEnum.java

-package cn.qg.qaplatform.common.enums;
+package cn.qg.qaplatform.zdata.enums;
 
 
 /**

src/main/java/cn/qg/qaplatform/dao/QueryBasicLoanStatusDataMapper.java → src/main/java/cn/qg/qaplatform/zdata/mapper/QueryBasicLoanStatusDataMapper.java

-package cn.qg.qaplatform.dao;
+package cn.qg.qaplatform.zdata.mapper;
 
 
-import cn.qg.qaplatform.domain.GenLoanUser;
-import cn.qg.qaplatform.domain.QueryLoanUser;
+import cn.qg.qaplatform.zdata.entity.GenLoanUser;
+import cn.qg.qaplatform.zdata.entity.QueryLoanUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

src/main/java/cn/qg/qaplatform/dao/QueryVccDataMapper.java → src/main/java/cn/qg/qaplatform/zdata/mapper/QueryVccDataMapper.java

-package cn.qg.qaplatform.dao;
+package cn.qg.qaplatform.zdata.mapper;
 
-import cn.qg.qaplatform.domain.QueryVccUser;
+import cn.qg.qaplatform.zdata.entity.QueryVccUser;
 
 import java.util.List;
 

src/main/java/cn/qg/qaplatform/dao/RuleEngineMapper.java → src/main/java/cn/qg/qaplatform/zdata/mapper/RuleEngineMapper.java

-package cn.qg.qaplatform.dao;
+package cn.qg.qaplatform.zdata.mapper;
 
 public interface RuleEngineMapper {
 

src/main/java/cn/qg/qaplatform/process/Common.java → src/main/java/cn/qg/qaplatform/zdata/process/Common.java

-package cn.qg.qaplatform.process;
+package cn.qg.qaplatform.zdata.process;
 
 import cn.qg.qaplatform.config.WebSocketServer;
 import cn.qg.qaplatform.utils.DBUtils;
-import cn.qg.qaplatform.utils.Encrypt.LexinEncrypt;
+import cn.qg.qaplatform.zdata.Encrypt.LexinEncrypt;
 import cn.qg.qaplatform.utils.HttpClientUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

src/main/java/cn/qg/qaplatform/process/Lexin.java → src/main/java/cn/qg/qaplatform/zdata/process/Lexin.java

-package cn.qg.qaplatform.process;
+package cn.qg.qaplatform.zdata.process;
 
 import cn.qg.qaplatform.config.WebSocketServer;
-import cn.qg.qaplatform.domain.ApplyDataVo;
-import cn.qg.qaplatform.utils.Encrypt.LexinEncrypt;
+import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
+import cn.qg.qaplatform.zdata.Encrypt.LexinEncrypt;
 import cn.qg.qaplatform.utils.HttpClientUtils;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;

src/main/java/cn/qg/qaplatform/process/Vcc.java → src/main/java/cn/qg/qaplatform/zdata/process/Vcc.java

-package cn.qg.qaplatform.process;
+package cn.qg.qaplatform.zdata.process;
 
 import cn.qg.qaplatform.utils.DBUtils;
 import cn.qg.qaplatform.utils.EncryptUtils;
@@ -17,7 +17,6 @@ import java.io.InputStreamReader;
 import java.net.URISyntaxException;
 import java.sql.SQLException;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/cn/qg/qaplatform/process/Xyqb.java → src/main/java/cn/qg/qaplatform/zdata/process/Xyqb.java

-package cn.qg.qaplatform.process;
+package cn.qg.qaplatform.zdata.process;
 
 import cn.qg.qaplatform.config.WebSocketServer;
 import cn.qg.qaplatform.utils.DBUtils;

src/main/java/cn/qg/qaplatform/service/LexinDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/LexinDataService.java

-package cn.qg.qaplatform.service;
+package cn.qg.qaplatform.zdata.service;
 
-import cn.qg.qaplatform.domain.ApplyDataVo;
+import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
 
 /**
  * 乐信数据

src/main/java/cn/qg/qaplatform/service/QueryBasicLoanStatusDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/QueryBasicLoanStatusDataService.java

-package cn.qg.qaplatform.service;
+package cn.qg.qaplatform.zdata.service;
 
-import cn.qg.qaplatform.domain.GenLoanUser;
-import cn.qg.qaplatform.domain.QueryLoanUser;
+import cn.qg.qaplatform.zdata.entity.GenLoanUser;
+import cn.qg.qaplatform.zdata.entity.QueryLoanUser;
 
 import java.util.List;
 import java.util.Map;

src/main/java/cn/qg/qaplatform/service/QueryInProcessStatusService.java → src/main/java/cn/qg/qaplatform/zdata/service/QueryInProcessStatusService.java

-package cn.qg.qaplatform.service;
+package cn.qg.qaplatform.zdata.service;
 
 /**
  * 查询造数据流程中的状态

src/main/java/cn/qg/qaplatform/service/QueryLoanUserDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/QueryLoanUserDataService.java

-package cn.qg.qaplatform.service;
+package cn.qg.qaplatform.zdata.service;
 
 import cn.qg.qaplatform.utils.page.PageResult;
 

src/main/java/cn/qg/qaplatform/service/RuleEngineService.java → src/main/java/cn/qg/qaplatform/zdata/service/RuleEngineService.java

-package cn.qg.qaplatform.service;
+package cn.qg.qaplatform.zdata.service;
 
 /**
  * 风控相关接口

src/main/java/cn/qg/qaplatform/service/VccDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/VccDataService.java

-package cn.qg.qaplatform.service;
+package cn.qg.qaplatform.zdata.service;
 
-import cn.qg.qaplatform.domain.GenVccUser;
-import cn.qg.qaplatform.domain.QueryVccUser;
+import cn.qg.qaplatform.zdata.entity.GenVccUser;
+import cn.qg.qaplatform.zdata.entity.QueryVccUser;
 import cn.qg.qaplatform.utils.page.PageResult;
 
 

src/main/java/cn/qg/qaplatform/service/XyqbDataService.java → src/main/java/cn/qg/qaplatform/zdata/service/XyqbDataService.java

-package cn.qg.qaplatform.service;
+package cn.qg.qaplatform.zdata.service;
 
-import cn.qg.qaplatform.domain.ApplyDataVo;
-import cn.qg.qaplatform.domain.GenLoanUser;
+import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
+import cn.qg.qaplatform.zdata.entity.GenLoanUser;
 
 import java.io.IOException;
 

src/main/java/cn/qg/qaplatform/service/impl/LexinDataServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/impl/LexinDataServiceImpl.java

-package cn.qg.qaplatform.service.impl;
+package cn.qg.qaplatform.zdata.service.impl;
 
-import cn.qg.qaplatform.common.enums.ChannelEnum;
-import cn.qg.qaplatform.domain.ApplyDataVo;
-import cn.qg.qaplatform.process.Common;
-import cn.qg.qaplatform.process.Lexin;
-import cn.qg.qaplatform.process.Xyqb;
-import cn.qg.qaplatform.service.QueryInProcessStatusService;
-import cn.qg.qaplatform.service.LexinDataService;
+import cn.qg.qaplatform.zdata.enums.ChannelEnum;
+import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
+import cn.qg.qaplatform.zdata.process.Common;
+import cn.qg.qaplatform.zdata.process.Lexin;
+import cn.qg.qaplatform.zdata.process.Xyqb;
+import cn.qg.qaplatform.zdata.service.QueryInProcessStatusService;
+import cn.qg.qaplatform.zdata.service.LexinDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/cn/qg/qaplatform/service/impl/QueryBasicLoanStatusDataServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/impl/QueryBasicLoanStatusDataServiceImpl.java

-package cn.qg.qaplatform.service.impl;
-
-import cn.qg.qaplatform.common.enums.LoanStatus;
-import cn.qg.qaplatform.common.enums.Namespace;
-import cn.qg.qaplatform.dao.QueryBasicLoanStatusDataMapper;
-import cn.qg.qaplatform.domain.GenLoanUser;
-import cn.qg.qaplatform.domain.QueryLoanUser;
-import cn.qg.qaplatform.common.SwitchDataSource;
-import cn.qg.qaplatform.service.QueryBasicLoanStatusDataService;
+package cn.qg.qaplatform.zdata.service.impl;
+
+import cn.qg.qaplatform.zdata.enums.LoanStatus;
+import cn.qg.qaplatform.enums.Namespace;
+import cn.qg.qaplatform.zdata.mapper.QueryBasicLoanStatusDataMapper;
+import cn.qg.qaplatform.zdata.entity.GenLoanUser;
+import cn.qg.qaplatform.zdata.entity.QueryLoanUser;
+import cn.qg.qaplatform.config.SwitchDataSource;
+import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/qg/qaplatform/service/impl/QueryInProcessStatusServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/impl/QueryInProcessStatusServiceImpl.java

-package cn.qg.qaplatform.service.impl;
+package cn.qg.qaplatform.zdata.service.impl;
 
 import cn.qg.qaplatform.config.WebSocketServer;
-import cn.qg.qaplatform.service.QueryBasicLoanStatusDataService;
-import cn.qg.qaplatform.service.QueryInProcessStatusService;
+import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
+import cn.qg.qaplatform.zdata.service.QueryInProcessStatusService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/qg/qaplatform/service/impl/QueryLoanUserDataServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/impl/QueryLoanUserDataServiceImpl.java

-package cn.qg.qaplatform.service.impl;
+package cn.qg.qaplatform.zdata.service.impl;
 
-import cn.qg.qaplatform.domain.QueryLoanUser;
-import cn.qg.qaplatform.service.QueryLoanUserDataService;
-import cn.qg.qaplatform.service.QueryBasicLoanStatusDataService;
+import cn.qg.qaplatform.zdata.entity.QueryLoanUser;
+import cn.qg.qaplatform.zdata.service.QueryLoanUserDataService;
+import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import cn.qg.qaplatform.utils.page.PageUtil;
 import com.github.pagehelper.PageHelper;

src/main/java/cn/qg/qaplatform/service/impl/RuleEngineServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/impl/RuleEngineServiceImpl.java

-package cn.qg.qaplatform.service.impl;
+package cn.qg.qaplatform.zdata.service.impl;
 
-import cn.qg.qaplatform.common.SwitchDataSource;
-import cn.qg.qaplatform.dao.RuleEngineMapper;
-import cn.qg.qaplatform.service.RuleEngineService;
+import cn.qg.qaplatform.config.SwitchDataSource;
+import cn.qg.qaplatform.zdata.mapper.RuleEngineMapper;
+import cn.qg.qaplatform.zdata.service.RuleEngineService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/qg/qaplatform/service/impl/VccDataServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/impl/VccDataServiceImpl.java

-package cn.qg.qaplatform.service.impl;
+package cn.qg.qaplatform.zdata.service.impl;
 
-import cn.qg.qaplatform.common.SwitchDataSource;
-import cn.qg.qaplatform.common.enums.VccStatusEnum;
-import cn.qg.qaplatform.dao.QueryVccDataMapper;
-import cn.qg.qaplatform.domain.GenVccUser;
-import cn.qg.qaplatform.domain.QueryVccUser;
-import cn.qg.qaplatform.process.Vcc;
-import cn.qg.qaplatform.service.RuleEngineService;
-import cn.qg.qaplatform.service.VccDataService;
+import cn.qg.qaplatform.config.SwitchDataSource;
+import cn.qg.qaplatform.zdata.enums.VccStatusEnum;
+import cn.qg.qaplatform.zdata.mapper.QueryVccDataMapper;
+import cn.qg.qaplatform.zdata.entity.GenVccUser;
+import cn.qg.qaplatform.zdata.entity.QueryVccUser;
+import cn.qg.qaplatform.zdata.process.Vcc;
+import cn.qg.qaplatform.zdata.service.RuleEngineService;
+import cn.qg.qaplatform.zdata.service.VccDataService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import cn.qg.qaplatform.utils.page.PageUtil;
 import com.alibaba.fastjson.JSONObject;

src/main/java/cn/qg/qaplatform/service/impl/XyqbDataServiceImpl.java → src/main/java/cn/qg/qaplatform/zdata/service/impl/XyqbDataServiceImpl.java

-package cn.qg.qaplatform.service.impl;
+package cn.qg.qaplatform.zdata.service.impl;
 
 import cn.qg.qaplatform.config.WebSocketServer;
-import cn.qg.qaplatform.domain.ApplyDataVo;
-import cn.qg.qaplatform.domain.GenLoanUser;
-import cn.qg.qaplatform.process.Xyqb;
-import cn.qg.qaplatform.service.QueryInProcessStatusService;
-import cn.qg.qaplatform.service.XyqbDataService;
-import cn.qg.qaplatform.service.QueryBasicLoanStatusDataService;
+import cn.qg.qaplatform.zdata.entity.ApplyDataVo;
+import cn.qg.qaplatform.zdata.entity.GenLoanUser;
+import cn.qg.qaplatform.zdata.process.Xyqb;
+import cn.qg.qaplatform.zdata.service.QueryInProcessStatusService;
+import cn.qg.qaplatform.zdata.service.XyqbDataService;
+import cn.qg.qaplatform.zdata.service.QueryBasicLoanStatusDataService;
 import com.alibaba.fastjson.JSONException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/resources/application.yml

@@ -6,6 +6,9 @@ spring:
     password: qatest
     driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      break-after-acquire-failure: true   # 连接失败后不重试
+      connection-error-retry-attempts: 1
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
@@ -25,8 +28,8 @@ server:
 
 # mybatis-plus 配置
 mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
-  type-aliases-package: cn.qg.qaplatform.domain
+  mapper-locations: classpath:mapper/*/*.xml
+  type-aliases-package: cn.qg.qaplatform.*.entity
   configuration:
     map-underscore-to-camel-case: true
 

src/main/resources/mapper/QueryBasicLoanStatusDataMapper.xml → src/main/resources/mapper/zdata/QueryBasicLoanStatusDataMapper.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.qg.qaplatform.dao.QueryBasicLoanStatusDataMapper">
+<mapper namespace="cn.qg.qaplatform.zdata.mapper.QueryBasicLoanStatusDataMapper">
     <!-- 注册未申请 -->
     <select id="getUnApplyLoanUserUuidList" resultType="java.lang.String">
         SELECT `uuid` FROM `apply_list`
@@ -13,7 +13,7 @@
     </select>
 
     <!-- 根据uuidList获取用户信息列表   -->
-    <select id="getUserDataListByUuidList" parameterType="java.util.List" resultType="cn.qg.qaplatform.domain.QueryLoanUser">
+    <select id="getUserDataListByUuidList" parameterType="java.util.List" resultType="cn.qg.qaplatform.zdata.entity.QueryLoanUser">
         SELECT `id` as userId, `phone_no` as phoneNo, `uuid`, `registered_from` as registeredFrom, `enable`, `created_at` as createdAt  FROM `user`
         where `uuid` in
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
@@ -28,7 +28,7 @@
     </select>
 
     <!-- 根据userIdList获取用户信息List   -->
-    <select id="getUserDataListByUserIdList" resultType="cn.qg.qaplatform.domain.QueryLoanUser">
+    <select id="getUserDataListByUserIdList" resultType="cn.qg.qaplatform.zdata.entity.QueryLoanUser">
         SELECT  `id` as userId, `uuid`, `phone_no` as phoneNo, `registered_from` as registeredFrom, `enable`, `created_at` as createdAt FROM `user`
         where `id` in
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
@@ -94,7 +94,7 @@
     </select>
 
     <!--  根据手机号获取用户信息-->
-    <select id="getUserInfoByPhoneNo" resultType="cn.qg.qaplatform.domain.GenLoanUser">
+    <select id="getUserInfoByPhoneNo" resultType="cn.qg.qaplatform.zdata.entity.GenLoanUser">
         SELECT `id` as userId, `phone_no` as phoneNo, `uuid`, `registered_from` as registeredFrom, `created_at` as createdAt  FROM `user`
         WHERE `phone_no` = #{phoneNo}
     </select>

src/main/resources/mapper/QueryVccDataMapper.xml → src/main/resources/mapper/zdata/QueryVccDataMapper.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.qg.qaplatform.dao.QueryVccDataMapper">
+<mapper namespace="cn.qg.qaplatform.zdata.mapper.QueryVccDataMapper">
 
-    <select id="queryVccDataByStatus" resultType="cn.qg.qaplatform.domain.QueryVccUser">
+    <select id="queryVccDataByStatus" resultType="cn.qg.qaplatform.zdata.entity.QueryVccUser">
         select
         `phone_no` as phoneNo,
         `user_id` as userId,
@@ -18,7 +18,7 @@
          order by id desc
     </select>
 
-    <select id="queryUserVccStatus" resultType="cn.qg.qaplatform.domain.QueryVccUser">
+    <select id="queryUserVccStatus" resultType="cn.qg.qaplatform.zdata.entity.QueryVccUser">
         select
         `phone_no` as phoneNo,
         `user_id` as userId,

src/main/resources/mapper/RuleEngineMapper.xml → src/main/resources/mapper/zdata/RuleEngineMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.qg.qaplatform.dao.RuleEngineMapper">
+<mapper namespace="cn.qg.qaplatform.zdata.mapper.RuleEngineMapper">
 
     <insert id="addBlackList">
         INSERT INTO `black_list_config` (`uuid`, `expir_date`, `type`, `enable`) VALUES (#{uuid}, '14', '0', '1');

src/test/java/cn/qg/qaplatform/test/Lexin.java

 package cn.qg.qaplatform.test;
 
-import cn.qg.qaplatform.process.Common;
-import cn.qg.qaplatform.process.Xyqb;
+import cn.qg.qaplatform.zdata.process.Common;
+import cn.qg.qaplatform.zdata.process.Xyqb;
 import cn.qg.qaplatform.utils.DBUtils;
-import cn.qg.qaplatform.utils.Encrypt.LexinEncrypt;
+import cn.qg.qaplatform.zdata.Encrypt.LexinEncrypt;
 import cn.qg.qaplatform.utils.HttpClientUtils;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.util.DigestUtils;