修改项目结果，新增vcc还款结果回调接口

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.*.mapper")
+@MapperScan(value = "cn.qg.qaplatform.mapper.*")
 public class QaPlatformApplication {
 
     public static void main(String[] args) {

src/main/java/cn/qg/qaplatform/automation/controller/InterfaceController.java

-package cn.qg.qaplatform.automation.controller;
-
-import cn.qg.qaplatform.automation.domain.Interface;
-import cn.qg.qaplatform.automation.service.InterfaceService;
-import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.utils.JsonResult;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@CrossOrigin
-@RestController
-@RequestMapping("/interface")
-public class InterfaceController {
-    @Autowired
-    InterfaceService interfaceService;
-
-    @GetMapping("/list")
-    public JsonResult getInterfaceList(Integer projectId, Integer moduleId,
-                                       @RequestParam(defaultValue = "1") Integer pageNum,
-                                       @RequestParam(defaultValue = "10") Integer pageSize) {
-        IPage<Interface> page = interfaceService.getInterfaceList(projectId, moduleId, pageNum, pageSize);
-        Map<String, Object> map = new HashMap<>();
-        map.put("list", page.getRecords());
-        map.put("total", page.getTotal());
-        return JsonResult.success(map);
-    }
-
-    @PostMapping("/add")
-    public JsonResult<Boolean> addInterface(@RequestBody Interface entity) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(interfaceService.save(entity));
-    }
-
-    @PostMapping("/update")
-    public JsonResult updateInterface(@RequestBody Interface entity) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(interfaceService.saveOrUpdate(entity));
-    }
-
-    @GetMapping("/delete")
-    public JsonResult deleteInterface(Integer id) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(interfaceService.removeById(id));
-    }
-}

src/main/java/cn/qg/qaplatform/automation/controller/ModuleController.java

-package cn.qg.qaplatform.automation.controller;
-
-import cn.qg.qaplatform.automation.domain.Module;
-import cn.qg.qaplatform.automation.service.ModuleService;
-import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.utils.JsonResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@CrossOrigin
-@RestController
-@RequestMapping("/module")
-public class ModuleController {
-    @Autowired
-    ModuleService moduleService;
-
-    @GetMapping("/list")
-    public  JsonResult getModuleList() {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(moduleService.list());
-    }
-
-    @PostMapping("/add")
-    public JsonResult addModule(@RequestBody Module module) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(moduleService.save(module));
-    }
-
-    @PostMapping("/update")
-    public JsonResult updateModule(@RequestBody Module module) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(moduleService.updateById(module));
-    }
-
-    @GetMapping("/delete")
-    public JsonResult deleteModule(Integer id) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(moduleService.removeById(id));
-    }
-}

src/main/java/cn/qg/qaplatform/automation/controller/ProjectController.java

-package cn.qg.qaplatform.automation.controller;
-
-import cn.qg.qaplatform.automation.domain.Project;
-import cn.qg.qaplatform.automation.service.ProjectService;
-import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.utils.JsonResult;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-
-@CrossOrigin
-@RestController
-@RequestMapping("/project")
-public class ProjectController {
-    @Autowired
-    ProjectService projectService;
-
-    @GetMapping("/list")
-    public JsonResult getProjectList() {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(projectService.list());
-    }
-
-    @PostMapping("/add")
-    public JsonResult addProject(@RequestBody Project project) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(projectService.save(project));
-    }
-
-    @PostMapping("/update")
-    public JsonResult updateProject(@RequestBody Project project) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(projectService.updateById(project));
-    }
-
-    @GetMapping("/delete")
-    public JsonResult deleteProject(Integer id) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(projectService.removeById(id));
-    }
-}

src/main/java/cn/qg/qaplatform/automation/controller/TestcaseController.java

-package cn.qg.qaplatform.automation.controller;
-
-import cn.qg.qaplatform.automation.domain.Testcase;
-import cn.qg.qaplatform.automation.service.AssertService;
-import cn.qg.qaplatform.automation.service.TestcaseService;
-import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.utils.JsonResult;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@CrossOrigin
-@RestController
-@RequestMapping("/testcase")
-public class TestcaseController {
-
-    @Autowired
-    TestcaseService testcaseService;
-
-    @Autowired
-    AssertService assertService;
-
-    @GetMapping("/list")
-    public JsonResult getTestcaseList(Integer projectId, Integer moduleId,
-                                      @RequestParam(defaultValue = "1") Integer pageNum,
-                                      @RequestParam(defaultValue = "10") Integer pageSize) {
-        IPage<Testcase> pageEntity = testcaseService.getTestcaseList(projectId, moduleId, pageNum, pageSize);
-        Map<String, Object> map = new HashMap<>();
-        map.put("list", pageEntity.getRecords());
-        map.put("total", pageEntity.getTotal());
-        return JsonResult.success(map);
-    }
-
-    @GetMapping("/type")
-    public JsonResult getTestcaseTypes() {
-        Map<String, String> map = new HashMap<>();
-        map.put("0", "标准用例");
-        map.put("1", "正常用例");
-        map.put("2", "异常用例");
-        return JsonResult.success(map);
-    }
-
-    @PostMapping("/add")
-    public JsonResult addTestcase(@RequestBody Testcase testcase) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(testcaseService.save(testcase));
-    }
-
-    @GetMapping("/execute")
-    public JsonResult executeTestcase(Integer testcaseId) throws Exception {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        Map<String, Object> resultMap = new HashMap<>();
-        JSONObject response = testcaseService.exexuteTestcase(testcaseId);
-        Boolean assertResult = assertService.assertResponse(testcaseId, response);
-        resultMap.put("response", response);
-        resultMap.put("assertResult", assertResult);
-        if (response != null && assertResult) {
-            return JsonResult.success(resultMap);
-        } else {
-            return JsonResult.serverFailed(resultMap);
-        }
-    }
-
-    @PostMapping("/update")
-    public JsonResult updateTestcase(@RequestBody Testcase testcase) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        Boolean updateResult = testcaseService.updateById(testcase);
-        return JsonResult.success(updateResult);
-    }
-
-    @GetMapping("/delete")
-    public JsonResult deleteTestcase(Integer id) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        return JsonResult.success(testcaseService.removeById(id));
-    }
-}

src/main/java/cn/qg/qaplatform/automation/domain/Assertion.java

-package cn.qg.qaplatform.automation.domain;
-
-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 Assertion {
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-    private Integer testcaseId;
-    private String comparator;
-    private String path;
-    private String expect;
-    @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/automation/domain/Extraction.java

-package cn.qg.qaplatform.automation.domain;
-
-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 Extraction {
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-    private Integer testcaseId;
-    private String path;
-    private String varName;
-    @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/automation/domain/Interface.java

-package cn.qg.qaplatform.automation.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 接口实体类
- */
-@Data
-public class Interface {
-
-    /**
-     * 主键id
-     */
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 接口名称
-     */
-    private String name;
-
-    /**
-     * 接口路径
-     */
-    private String url;
-
-    /**
-     * 请求方法
-     */
-    private String method;
-
-    /**
-     * 参数类型
-     */
-    private String paramsType;
-
-    private Integer moduleId;
-
-    private Integer projectId;
-
-    /**
-     * 创建者
-     */
-    private String author;
-
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    @TableField(exist = false)
-    private String projectName;
-
-    @TableField(exist = false)
-    private String moduleName;
-}
-

src/main/java/cn/qg/qaplatform/automation/domain/Module.java

-package cn.qg.qaplatform.automation.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 模块实体类
- */
-@Data
-public class Module {
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    private String name;
-    private Integer projectId;
-    @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/automation/domain/Project.java

-package cn.qg.qaplatform.automation.domain;
-
-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 Project {
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-    private String name;
-    private String host;
-    @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/automation/domain/Testcase.java

-package cn.qg.qaplatform.automation.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 用例实体类
- */
-@Data
-public class Testcase {
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    private Integer interfaceId;
-
-    private String name;
-
-    @TableField(value = "type")
-    private Integer type;
-
-    private String headers;
-
-    @TableField(value = "params")
-    private String params;
-
-    private String author;
-
-    private Integer projectId;
-
-    private Integer moduleId;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mmLss")
-    private Date updateTime;
-
-    @TableField(exist = false)
-    private String projectName;
-
-    @TableField(exist = false)
-    private String moduleName;
-}

src/main/java/cn/qg/qaplatform/automation/mapper/AssertionMapper.java

-package cn.qg.qaplatform.automation.mapper;
-
-import cn.qg.qaplatform.automation.domain.Assertion;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-public interface AssertionMapper extends BaseMapper<Assertion> {
-}

src/main/java/cn/qg/qaplatform/automation/mapper/ExtractionMapper.java

-package cn.qg.qaplatform.automation.mapper;
-
-import cn.qg.qaplatform.automation.domain.Extraction;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-public interface ExtractionMapper extends BaseMapper<Extraction> {
-}

src/main/java/cn/qg/qaplatform/automation/mapper/InterfaceMapper.java

-package cn.qg.qaplatform.automation.mapper;
-
-import cn.qg.qaplatform.automation.domain.Interface;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-public interface InterfaceMapper extends BaseMapper<Interface> {
-    IPage<Interface> getInterfaceList(IPage<Interface> page, Integer projectId, Integer moduleId);
-}

src/main/java/cn/qg/qaplatform/automation/mapper/ModuleMapper.java

-package cn.qg.qaplatform.automation.mapper;
-
-import cn.qg.qaplatform.automation.domain.Module;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-public interface ModuleMapper extends BaseMapper<Module> {
-}

src/main/java/cn/qg/qaplatform/automation/mapper/ProjectMapper.java

-package cn.qg.qaplatform.automation.mapper;
-
-import cn.qg.qaplatform.automation.domain.Project;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-public interface ProjectMapper extends BaseMapper<Project> {
-}

src/main/java/cn/qg/qaplatform/automation/mapper/TestcaseMapper.java

-package cn.qg.qaplatform.automation.mapper;
-
-import cn.qg.qaplatform.automation.domain.Testcase;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-public interface TestcaseMapper extends BaseMapper<Testcase> {
-    IPage<Testcase> getTestcaseList(IPage<Testcase> page, Integer projectId, Integer moduleId);
-}

src/main/java/cn/qg/qaplatform/automation/service/AssertService.java

-package cn.qg.qaplatform.automation.service;
-
-import cn.qg.qaplatform.automation.domain.Assertion;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface AssertService extends IService<Assertion> {
-
-    Boolean assertResponse(Integer testcaseId, JSONObject response);
-}

src/main/java/cn/qg/qaplatform/automation/service/ExtractionService.java

-package cn.qg.qaplatform.automation.service;
-
-import cn.qg.qaplatform.automation.domain.Extraction;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface ExtractionService extends IService<Extraction> {
-}

src/main/java/cn/qg/qaplatform/automation/service/InterfaceService.java

-package cn.qg.qaplatform.automation.service;
-
-import cn.qg.qaplatform.automation.domain.Interface;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 接口类
- */
-public interface InterfaceService extends IService<Interface> {
-
-    IPage<Interface> getInterfaceList(Integer projectId, Integer moduleId, Integer pageNum, Integer pageSize);
-}

src/main/java/cn/qg/qaplatform/automation/service/ModuleService.java

-package cn.qg.qaplatform.automation.service;
-
-import cn.qg.qaplatform.automation.domain.Module;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface ModuleService extends IService<Module> {
-}

src/main/java/cn/qg/qaplatform/automation/service/ProjectService.java

-package cn.qg.qaplatform.automation.service;
-
-import cn.qg.qaplatform.automation.domain.Project;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface ProjectService extends IService<Project> {
-}

src/main/java/cn/qg/qaplatform/automation/service/TestcaseService.java

-package cn.qg.qaplatform.automation.service;
-
-import cn.qg.qaplatform.automation.domain.Testcase;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.net.URISyntaxException;
-
-public interface TestcaseService extends IService<Testcase> {
-    IPage<Testcase> getTestcaseList(Integer projectId, Integer moduleId, Integer pageNum, Integer pageSize);
-    JSONObject exexuteTestcase(Integer testcaseId) throws Exception;
-}

src/main/java/cn/qg/qaplatform/automation/service/impl/AssertServiceImpl.java

-package cn.qg.qaplatform.automation.service.impl;
-
-import cn.qg.qaplatform.automation.domain.Assertion;
-import cn.qg.qaplatform.automation.mapper.AssertionMapper;
-import cn.qg.qaplatform.automation.service.AssertService;
-import cn.qg.qaplatform.utils.assertion.assertUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Slf4j
-@Service
-public class AssertServiceImpl extends ServiceImpl<AssertionMapper, Assertion> implements AssertService {
-
-    @Autowired
-    AssertionMapper assertionMapper;
-
-    @Override
-    public Boolean assertResponse(Integer testcaseId, JSONObject response) {
-        QueryWrapper<Assertion> assertionQueryWrapper = new QueryWrapper<>();
-        assertionQueryWrapper.eq("testcase_id", testcaseId);
-        List<Assertion> assertionList = assertionMapper.selectList(assertionQueryWrapper);
-        if (assertionList != null) {
-            for (Assertion assertion: assertionList) {
-                Boolean assertResult = assertUtil.assertJsonResponse(response, assertion.getComparator(), assertion.getPath(), assertion.getExpect());
-                if (!assertResult) {
-                    log.info("断言失败，本次断言的内容为，对比符：" + assertion.getComparator() + "，检查项：" + assertion.getPath() + "，期望值：" + assertion.getExpect());
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-}

src/main/java/cn/qg/qaplatform/automation/service/impl/ExtractionServiceImpl.java

-package cn.qg.qaplatform.automation.service.impl;
-
-import cn.qg.qaplatform.automation.domain.Extraction;
-import cn.qg.qaplatform.automation.mapper.ExtractionMapper;
-import cn.qg.qaplatform.automation.service.ExtractionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ExtractionServiceImpl extends ServiceImpl<ExtractionMapper, Extraction> implements ExtractionService {
-
-}

src/main/java/cn/qg/qaplatform/automation/service/impl/InterfaceServiceImpl.java

-package cn.qg.qaplatform.automation.service.impl;
-
-import cn.qg.qaplatform.automation.domain.Interface;
-import cn.qg.qaplatform.automation.mapper.InterfaceMapper;
-import cn.qg.qaplatform.automation.service.InterfaceService;
-import cn.qg.qaplatform.config.SwitchDataSource;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-@Service
-public class InterfaceServiceImpl extends ServiceImpl<InterfaceMapper, Interface> implements InterfaceService {
-
-    @Autowired
-    InterfaceMapper interfaceMapper;
-
-    @Override
-    public IPage<Interface> getInterfaceList(Integer projectId, Integer moduleId, Integer pageNum, Integer pageSize) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        IPage<Interface> page = new Page<>(pageNum, pageSize);
-        return interfaceMapper.getInterfaceList(page, projectId, moduleId);
-    }
-}

src/main/java/cn/qg/qaplatform/automation/service/impl/ModuleServiceImpl.java

-package cn.qg.qaplatform.automation.service.impl;
-
-import cn.qg.qaplatform.automation.domain.Module;
-import cn.qg.qaplatform.automation.mapper.ModuleMapper;
-import cn.qg.qaplatform.automation.service.ModuleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, Module> implements ModuleService {
-}

src/main/java/cn/qg/qaplatform/automation/service/impl/ProjectServiceImpl.java

-package cn.qg.qaplatform.automation.service.impl;
-
-import cn.qg.qaplatform.automation.domain.Project;
-import cn.qg.qaplatform.automation.mapper.ProjectMapper;
-import cn.qg.qaplatform.automation.service.ProjectService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
-}

src/main/java/cn/qg/qaplatform/automation/service/impl/TestcaseServiceImpl.java

-package cn.qg.qaplatform.automation.service.impl;
-
-import cn.qg.qaplatform.automation.domain.Interface;
-import cn.qg.qaplatform.automation.domain.Project;
-import cn.qg.qaplatform.automation.domain.Testcase;
-import cn.qg.qaplatform.automation.mapper.*;
-import cn.qg.qaplatform.automation.service.TestcaseService;
-import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.utils.HttpClientUtils;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Slf4j
-@Service
-public class TestcaseServiceImpl extends ServiceImpl<TestcaseMapper, Testcase> implements TestcaseService {
-    @Autowired
-    TestcaseMapper testcaseMapper;
-
-    @Autowired
-    InterfaceMapper interfaceMapper;
-
-    @Autowired
-    ProjectMapper projectMapper;
-
-    @Override
-    public IPage<Testcase> getTestcaseList(Integer projectId, Integer moduleId, Integer pageNum, Integer pageSize) {
-        SwitchDataSource.dataSourceSwitch("localhost", "automation");
-        IPage<Testcase> page = new Page<>(pageNum, pageSize);
-        return testcaseMapper.getTestcaseList(page, projectId, moduleId);
-    }
-
-    /**
-     * 执行测试用例的方法
-     * @param testcaseId 测试用例id
-     * @return
-     */
-    @Override
-    public JSONObject exexuteTestcase(Integer testcaseId) throws Exception {
-        Testcase testcase = testcaseMapper.selectById(testcaseId);
-        Interface interfaceEntity = interfaceMapper.selectById(testcase.getInterfaceId());
-        Project project = projectMapper.selectById(interfaceEntity.getProjectId());
-        String url = project.getHost().concat(interfaceEntity.getUrl());
-        JSONObject response = new JSONObject();
-        log.info("本次执行用例名为" + testcase.getName() + ", url为：" + url);
-        if (interfaceEntity.getMethod().equals("GET")) {
-            Map<String, Object> headers = JSON.parseObject(testcase.getHeaders(), HashMap.class);
-            Map<String, Object> params = JSON.parseObject(testcase.getParams(), HashMap.class);
-            response = HttpClientUtils.doGetReturnJson(url, params, headers);
-            return response;
-        } else if (interfaceEntity.getMethod().equals("POST")) {
-            Map<String, Object> headers = JSON.parseObject(testcase.getHeaders(), HashMap.class);
-            if (interfaceEntity.getParamsType().equals("form")) {
-                Map<String, Object> formData = JSON.parseObject(testcase.getParams(), HashMap.class);
-                response = HttpClientUtils.doPost(url, formData, headers);
-                return response;
-            } else if (interfaceEntity.getParamsType().equals("json")) {
-                JSONObject resposne = HttpClientUtils.doPostJson(url, testcase.getParams(), headers);
-                return resposne;
-            }
-        } else {
-            throw new Exception("请求方式不支持，当前只支持GET、POST请求！");
-        }
-        return null;
-    }
-}

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

@@ -2,12 +2,10 @@ package cn.qg.qaplatform.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@MapperScan("cn.qg.qaplatform.*.mapper*")
 public class MybatisPlusConfig {
 
     @Bean

src/main/java/cn/qg/qaplatform/zdata/controller/common/NamespaceController.java → src/main/java/cn/qg/qaplatform/controller/common/NamespaceController.java

-package cn.qg.qaplatform.zdata.controller.common;
+package cn.qg.qaplatform.controller.common;
 
 import cn.qg.qaplatform.enums.Namespace;
 import cn.qg.qaplatform.utils.EnumUtils;

src/main/java/cn/qg/qaplatform/stools/controller/CommonController.java → src/main/java/cn/qg/qaplatform/controller/stools/CommonController.java

-package cn.qg.qaplatform.stools.controller;
+package cn.qg.qaplatform.controller.stools;
 
 import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.stools.entity.LoginInfo;
-import cn.qg.qaplatform.stools.service.CommonService;
-import cn.qg.qaplatform.stools.service.LoginInfoService;
+import cn.qg.qaplatform.entity.stools.LoginInfo;
+import cn.qg.qaplatform.service.stools.CommonService;
+import cn.qg.qaplatform.service.stools.LoginInfoService;
 import cn.qg.qaplatform.utils.JsonResult;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

src/main/java/cn/qg/qaplatform/stools/controller/JenkinsBuildController.java → src/main/java/cn/qg/qaplatform/controller/stools/JenkinsBuildController.java

-package cn.qg.qaplatform.stools.controller;
+package cn.qg.qaplatform.controller.stools;
 
-import cn.qg.qaplatform.stools.utils.JenkinsApi;
-import cn.qg.qaplatform.stools.vo.JenkinsBuildInfo;
+import cn.qg.qaplatform.utils.JenkinsApi;
+import cn.qg.qaplatform.vo.JenkinsBuildInfo;
 import cn.qg.qaplatform.utils.JsonResult;
 import com.offbytwo.jenkins.model.Build;
 import org.springframework.web.bind.annotation.*;

src/main/java/cn/qg/qaplatform/stools/controller/KdspDecryptController.java → src/main/java/cn/qg/qaplatform/controller/stools/KdspDecryptController.java

-package cn.qg.qaplatform.stools.controller;
+package cn.qg.qaplatform.controller.stools;
 
 import cn.qg.qaplatform.utils.JsonResult;
-import cn.qg.qaplatform.stools.utils.kdsp.AESUtil;
-import cn.qg.qaplatform.stools.utils.kdsp.RSA;
-import cn.qg.qaplatform.stools.vo.EncryptRequest;
+import cn.qg.qaplatform.encrypt.kdsp.AESUtil;
+import cn.qg.qaplatform.encrypt.kdsp.RSA;
+import cn.qg.qaplatform.vo.EncryptRequest;
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

src/main/java/cn/qg/qaplatform/zdata/controller/vcc/VccGenController.java → src/main/java/cn/qg/qaplatform/controller/zdata/vcc/VccGenController.java

-package cn.qg.qaplatform.zdata.controller.vcc;
+package cn.qg.qaplatform.controller.zdata.vcc;
 
 import cn.qg.qaplatform.utils.JsonResult;
-import cn.qg.qaplatform.zdata.entity.VccOpenResultVo;
-import cn.qg.qaplatform.zdata.service.vcc.VccDataService;
+import cn.qg.qaplatform.entity.zdata.VccOpenResultVo;
+import cn.qg.qaplatform.service.zdata.vcc.VccDataService;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,4 +49,11 @@ public class VccGenController {
         }
         return JsonResult.success(vccDataService.vccManualRiskControl(namespace, phoneNo, result, amount));
     }
+
+    @GetMapping("/repay/callback")
+    public JsonResult vccRepayCallback(String namespace, String phoneNo, Integer result) {
+        JSONObject response = vccDataService.vccRepayCallback(namespace, phoneNo, result);
+        return JsonResult.success(response);
+    }
+
 }

src/main/java/cn/qg/qaplatform/zdata/controller/vcc/VccQueryController.java → src/main/java/cn/qg/qaplatform/controller/zdata/vcc/VccQueryController.java

-package cn.qg.qaplatform.zdata.controller.vcc;
+package cn.qg.qaplatform.controller.zdata.vcc;
 
 import cn.qg.qaplatform.utils.JsonResult;
-import cn.qg.qaplatform.zdata.enums.VccStatusEnum;
-import cn.qg.qaplatform.zdata.entity.VccUserEntity;
-import cn.qg.qaplatform.zdata.service.vcc.VccDataService;
+import cn.qg.qaplatform.enums.VccStatusEnum;
+import cn.qg.qaplatform.entity.zdata.VccUserEntity;
+import cn.qg.qaplatform.service.zdata.vcc.VccDataService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/qg/qaplatform/zdata/controller/xyqb/ClearDataController.java → src/main/java/cn/qg/qaplatform/controller/zdata/xyqb/ClearDataController.java

-package cn.qg.qaplatform.zdata.controller.xyqb;
+package cn.qg.qaplatform.controller.zdata.xyqb;
 
 import cn.qg.qaplatform.utils.JsonResult;
-import cn.qg.qaplatform.zdata.service.xyqb.ClearDataService;
+import cn.qg.qaplatform.service.zdata.xyqb.ClearDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/cn/qg/qaplatform/zdata/controller/xyqb/XyqbGenController.java → src/main/java/cn/qg/qaplatform/controller/zdata/xyqb/XyqbGenController.java

-package cn.qg.qaplatform.zdata.controller.xyqb;
+package cn.qg.qaplatform.controller.zdata.xyqb;
 
 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.XyqbApplyDataVo;
-import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
-import cn.qg.qaplatform.zdata.service.xyqb.LexinDataService;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbGenDataService;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
+import cn.qg.qaplatform.enums.ChannelEnum;
+import cn.qg.qaplatform.enums.FundEnum;
+import cn.qg.qaplatform.entity.zdata.XyqbApplyDataVo;
+import cn.qg.qaplatform.entity.zdata.XjfqGenProcessVo;
+import cn.qg.qaplatform.service.zdata.xyqb.LexinDataService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbGenDataService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbBasicQueryService;
 import cn.qg.qaplatform.utils.EnumUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/cn/qg/qaplatform/zdata/controller/xyqb/XyqbQueryController.java → src/main/java/cn/qg/qaplatform/controller/zdata/xyqb/XyqbQueryController.java

-package cn.qg.qaplatform.zdata.controller.xyqb;
+package cn.qg.qaplatform.controller.zdata.xyqb;
 
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbQueryService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbQueryService;
 import cn.qg.qaplatform.utils.JsonResult;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbBasicQueryService;
 import cn.qg.qaplatform.utils.page.PageResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

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

src/main/java/cn/qg/qaplatform/stools/utils/kdsp/AESUtil.java → src/main/java/cn/qg/qaplatform/encrypt/kdsp/AESUtil.java

-package cn.qg.qaplatform.stools.utils.kdsp;
+package cn.qg.qaplatform.encrypt.kdsp;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;

src/main/java/cn/qg/qaplatform/stools/utils/kdsp/ConfigureEncryptAndDecrypt.java → src/main/java/cn/qg/qaplatform/encrypt/kdsp/ConfigureEncryptAndDecrypt.java

-package cn.qg.qaplatform.stools.utils.kdsp;
+package cn.qg.qaplatform.encrypt.kdsp;
 
 public class ConfigureEncryptAndDecrypt {
     public static final String CHAR_ENCODING = "UTF-8";

src/main/java/cn/qg/qaplatform/stools/utils/kdsp/RSA.java → src/main/java/cn/qg/qaplatform/encrypt/kdsp/RSA.java

-package cn.qg.qaplatform.stools.utils.kdsp;
+package cn.qg.qaplatform.encrypt.kdsp;
 
 import java.security.Key;
 import java.security.KeyFactory;

src/main/java/cn/qg/qaplatform/stools/entity/LoginInfo.java → src/main/java/cn/qg/qaplatform/entity/stools/LoginInfo.java

-package cn.qg.qaplatform.stools.entity;
+package cn.qg.qaplatform.entity.stools;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/cn/qg/qaplatform/zdata/entity/VccOpenResultVo.java → src/main/java/cn/qg/qaplatform/entity/zdata/VccOpenResultVo.java

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

src/main/java/cn/qg/qaplatform/zdata/entity/VccUserEntity.java → src/main/java/cn/qg/qaplatform/entity/zdata/VccUserEntity.java

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

src/main/java/cn/qg/qaplatform/zdata/entity/XjfqGenProcessVo.java → src/main/java/cn/qg/qaplatform/entity/zdata/XjfqGenProcessVo.java

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

src/main/java/cn/qg/qaplatform/zdata/entity/XjfqUserEntity.java → src/main/java/cn/qg/qaplatform/entity/zdata/XjfqUserEntity.java

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

src/main/java/cn/qg/qaplatform/zdata/entity/XyqbApplyDataVo.java → src/main/java/cn/qg/qaplatform/entity/zdata/XyqbApplyDataVo.java

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

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

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

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

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

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

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

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

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

src/main/java/cn/qg/qaplatform/stools/mapper/CommonMapper.java → src/main/java/cn/qg/qaplatform/mapper/stools/CommonMapper.java

-package cn.qg.qaplatform.stools.mapper;
+package cn.qg.qaplatform.mapper.stools;
 
 public interface CommonMapper {
 

src/main/java/cn/qg/qaplatform/stools/mapper/LoginInfoMapper.java → src/main/java/cn/qg/qaplatform/mapper/stools/LoginInfoMapper.java

-package cn.qg.qaplatform.stools.mapper;
+package cn.qg.qaplatform.mapper.stools;
 
-import cn.qg.qaplatform.stools.entity.LoginInfo;
+import cn.qg.qaplatform.entity.stools.LoginInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface LoginInfoMapper extends BaseMapper<LoginInfo> {

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

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

src/main/java/cn/qg/qaplatform/mapper/zdata/VccAccountMapper.java

+package cn.qg.qaplatform.mapper.zdata;
+
+import java.util.Map;
+
+public interface VccAccountMapper {
+
+    Integer getNewestRepayOrderNo(String userId);
+
+    Map<String, Object> getNewestRepayResult(String userId);
+}

src/main/java/cn/qg/qaplatform/zdata/mapper/VccDataMapper.java → src/main/java/cn/qg/qaplatform/mapper/zdata/VccDataMapper.java

-package cn.qg.qaplatform.zdata.mapper;
+package cn.qg.qaplatform.mapper.zdata;
 
-import cn.qg.qaplatform.zdata.entity.VccUserEntity;
+import cn.qg.qaplatform.entity.zdata.VccUserEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -20,4 +20,5 @@ public interface VccDataMapper {
      * 查看vcc风控授信信息
      */
     Map<String, Object> getVccRiskRecord(String uuid);
+
 }

src/main/java/cn/qg/qaplatform/zdata/mapper/XyqbLoanDataMapper.java → src/main/java/cn/qg/qaplatform/mapper/zdata/XyqbLoanDataMapper.java

-package cn.qg.qaplatform.zdata.mapper;
+package cn.qg.qaplatform.mapper.zdata;
 
-
-import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
-import cn.qg.qaplatform.zdata.entity.XjfqUserEntity;
+import cn.qg.qaplatform.entity.zdata.XjfqGenProcessVo;
+import cn.qg.qaplatform.entity.zdata.XjfqUserEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

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

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

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

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

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

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

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

src/main/java/cn/qg/qaplatform/stools/service/CommonService.java → src/main/java/cn/qg/qaplatform/service/stools/CommonService.java

-package cn.qg.qaplatform.stools.service;
+package cn.qg.qaplatform.service.stools;
 
 public interface CommonService {
 

src/main/java/cn/qg/qaplatform/stools/service/LoginInfoService.java → src/main/java/cn/qg/qaplatform/service/stools/LoginInfoService.java

-package cn.qg.qaplatform.stools.service;
+package cn.qg.qaplatform.service.stools;
 
-import cn.qg.qaplatform.stools.entity.LoginInfo;
+import cn.qg.qaplatform.entity.stools.LoginInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface LoginInfoService extends IService<LoginInfo> {

src/main/java/cn/qg/qaplatform/stools/service/impl/CommonServiceImpl.java → src/main/java/cn/qg/qaplatform/service/stools/impl/CommonServiceImpl.java

-package cn.qg.qaplatform.stools.service.impl;
+package cn.qg.qaplatform.service.stools.impl;
 
 import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.stools.mapper.CommonMapper;
-import cn.qg.qaplatform.stools.service.CommonService;
+import cn.qg.qaplatform.mapper.stools.CommonMapper;
+import cn.qg.qaplatform.service.stools.CommonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/qg/qaplatform/stools/service/impl/LoginInfoServiceImpl.java → src/main/java/cn/qg/qaplatform/service/stools/impl/LoginInfoServiceImpl.java

-package cn.qg.qaplatform.stools.service.impl;
+package cn.qg.qaplatform.service.stools.impl;
 
-import cn.qg.qaplatform.stools.entity.LoginInfo;
-import cn.qg.qaplatform.stools.mapper.LoginInfoMapper;
-import cn.qg.qaplatform.stools.service.LoginInfoService;
+import cn.qg.qaplatform.entity.stools.LoginInfo;
+import cn.qg.qaplatform.mapper.stools.LoginInfoMapper;
+import cn.qg.qaplatform.service.stools.LoginInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

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

-package cn.qg.qaplatform.zdata.service.risk;
+package cn.qg.qaplatform.service.zdata.risk;
 
 /**
  * 风控相关服务

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

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

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

-package cn.qg.qaplatform.zdata.service.vcc;
+package cn.qg.qaplatform.service.zdata.vcc;
 
-import cn.qg.qaplatform.zdata.entity.VccOpenResultVo;
-import cn.qg.qaplatform.zdata.entity.VccUserEntity;
+import cn.qg.qaplatform.entity.zdata.VccOpenResultVo;
+import cn.qg.qaplatform.entity.zdata.VccUserEntity;
 import cn.qg.qaplatform.utils.page.PageResult;
+import com.alibaba.fastjson.JSONObject;
 
 
 /**
@@ -26,4 +27,7 @@ public interface VccDataService {
     VccUserEntity queryUserVccStatus(String namespace, String phoneNo);
 
     Boolean vccManualRiskControl(String namespace,  String phoneNo, Boolean result, Integer amount);
+
+    JSONObject vccRepayCallback(String namespace, String phoneNo, Integer result);
+
 }

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

-package cn.qg.qaplatform.zdata.service.vcc.impl;
+package cn.qg.qaplatform.service.zdata.vcc.impl;
 
 import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
-import cn.qg.qaplatform.zdata.enums.VccStatusEnum;
-import cn.qg.qaplatform.zdata.mapper.VccDataMapper;
-import cn.qg.qaplatform.zdata.entity.VccOpenResultVo;
-import cn.qg.qaplatform.zdata.entity.VccUserEntity;
-import cn.qg.qaplatform.zdata.mapper.XyqbLoanDataMapper;
-import cn.qg.qaplatform.zdata.process.Vcc;
-import cn.qg.qaplatform.zdata.service.risk.RuleEngineService;
-import cn.qg.qaplatform.zdata.service.vcc.VccDataService;
+import cn.qg.qaplatform.entity.zdata.XjfqGenProcessVo;
+import cn.qg.qaplatform.enums.VccStatusEnum;
+import cn.qg.qaplatform.mapper.zdata.VccAccountMapper;
+import cn.qg.qaplatform.mapper.zdata.VccDataMapper;
+import cn.qg.qaplatform.entity.zdata.VccOpenResultVo;
+import cn.qg.qaplatform.entity.zdata.VccUserEntity;
+import cn.qg.qaplatform.mapper.zdata.XyqbLoanDataMapper;
+import cn.qg.qaplatform.process.Vcc;
+import cn.qg.qaplatform.service.zdata.risk.RuleEngineService;
+import cn.qg.qaplatform.service.zdata.vcc.VccDataService;
+import cn.qg.qaplatform.utils.HttpClientUtils;
 import cn.qg.qaplatform.utils.page.PageResult;
 import cn.qg.qaplatform.utils.page.PageUtil;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbBasicQueryService;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -32,6 +34,9 @@ public class VccDataServiceImpl implements VccDataService {
     @Autowired
     VccDataMapper vccDataMapper;
 
+    @Autowired
+    VccAccountMapper vccAccountMapper;
+
     @Autowired
     RuleEngineService ruleEngineService;
 
@@ -183,6 +188,14 @@ public class VccDataServiceImpl implements VccDataService {
         return vccDataMapper.queryUserVccStatus(phoneNo);
     }
 
+    /**
+     * vcc手动风控回调
+     * @param namespace 环境
+     * @param phoneNo 手机号
+     * @param result 结果，true/false
+     * @param amount 授信金额
+     * @return
+     */
     @Override
     public Boolean vccManualRiskControl(String namespace, String phoneNo, Boolean result, Integer amount) {
         SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
@@ -201,4 +214,33 @@ public class VccDataServiceImpl implements VccDataService {
         return creditResult.get("content").toString().equals("success");
     }
 
+    /**
+     * vcc还款回调
+     * @param namespace 环境
+     * @param phoneNo 手机号
+     * @param result 回调结果，true/false
+     * @return
+     */
+    @Override
+    public JSONObject vccRepayCallback(String namespace, String phoneNo, Integer result) {
+        String url = "https://acs-" + namespace + ".liangkebang.net/ex/paycenter/repay_notify";
+        SwitchDataSource.dataSourceSwitch(namespace, "xyqb_user");
+        XjfqGenProcessVo xjfqGenProcessVo = xyqbLoanDataMapper.getUserInfoByPhoneNo(phoneNo);
+        SwitchDataSource.dataSourceSwitch(namespace, "acsdb");
+        Integer orderNo = vccAccountMapper.getNewestRepayOrderNo(xjfqGenProcessVo.getUserId());
+        Map<String, Object> formData = new HashMap<>();
+        formData.put("orderNo", orderNo);
+        if (result.equals(1)) {
+            formData.put("remark", "还款成功");
+        }
+        if (result.equals(2)) {
+            formData.put("remark", "还款失败");
+        }
+        formData.put("payStatus", result);
+        formData.put("orderData", "{\"payApproachDesc\":\"易宝-广达小贷-VCC专用\",\"orderId\":\"79884519018498\",\"payApproach\":\"65\",\"payApproachName\":\"YEE_PAY_GDXD_VCC\",\"payGateway\":\"0\",\"cardNo\":\"6217000025253636858\",\"payGatewayName\":\"YEE_PAY\"}");
+        JSONObject response = HttpClientUtils.doPost(url, formData);
+        log.info("vcc还款回调结果：{}", response);
+        return response;
+    }
+
 }

src/main/java/cn/qg/qaplatform/zdata/service/xyqb/ClearDataService.java → src/main/java/cn/qg/qaplatform/service/zdata/xyqb/ClearDataService.java

-package cn.qg.qaplatform.zdata.service.xyqb;
+package cn.qg.qaplatform.service.zdata.xyqb;
 
 /**
  * 清除羊小咩数据

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

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

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

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

src/main/java/cn/qg/qaplatform/zdata/service/xyqb/XyqbBasicQueryService.java → src/main/java/cn/qg/qaplatform/service/zdata/xyqb/XyqbBasicQueryService.java

-package cn.qg.qaplatform.zdata.service.xyqb;
+package cn.qg.qaplatform.service.zdata.xyqb;
 
-import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
-import cn.qg.qaplatform.zdata.entity.XjfqUserEntity;
+import cn.qg.qaplatform.entity.zdata.XjfqGenProcessVo;
+import cn.qg.qaplatform.entity.zdata.XjfqUserEntity;
 
 import java.util.List;
 import java.util.Map;

src/main/java/cn/qg/qaplatform/zdata/service/xyqb/XyqbGenDataService.java → src/main/java/cn/qg/qaplatform/service/zdata/xyqb/XyqbGenDataService.java

-package cn.qg.qaplatform.zdata.service.xyqb;
+package cn.qg.qaplatform.service.zdata.xyqb;
 
-import cn.qg.qaplatform.zdata.entity.XyqbApplyDataVo;
-import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
+import cn.qg.qaplatform.entity.zdata.XyqbApplyDataVo;
+import cn.qg.qaplatform.entity.zdata.XjfqGenProcessVo;
 
 import java.io.IOException;
 

src/main/java/cn/qg/qaplatform/zdata/service/xyqb/XyqbQueryService.java → src/main/java/cn/qg/qaplatform/service/zdata/xyqb/XyqbQueryService.java

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

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

-package cn.qg.qaplatform.zdata.service.xyqb.impl;
+package cn.qg.qaplatform.service.zdata.xyqb.impl;
 
 import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
-import cn.qg.qaplatform.zdata.service.xyqb.ClearDataService;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
+import cn.qg.qaplatform.entity.zdata.XjfqGenProcessVo;
+import cn.qg.qaplatform.service.zdata.xyqb.ClearDataService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbBasicQueryService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;

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

-package cn.qg.qaplatform.zdata.service.xyqb.impl;
+package cn.qg.qaplatform.service.zdata.xyqb.impl;
 
-import cn.qg.qaplatform.zdata.enums.ChannelEnum;
-import cn.qg.qaplatform.zdata.entity.XyqbApplyDataVo;
-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.xyqb.QueryInProcessStatusService;
-import cn.qg.qaplatform.zdata.service.xyqb.LexinDataService;
+import cn.qg.qaplatform.entity.zdata.XyqbApplyDataVo;
+import cn.qg.qaplatform.process.Common;
+import cn.qg.qaplatform.process.Lexin;
+import cn.qg.qaplatform.process.Xyqb;
+import cn.qg.qaplatform.service.zdata.xyqb.QueryInProcessStatusService;
+import cn.qg.qaplatform.service.zdata.xyqb.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/zdata/service/xyqb/impl/QueryInProcessStatusServiceImpl.java → src/main/java/cn/qg/qaplatform/service/zdata/xyqb/impl/QueryInProcessStatusServiceImpl.java

-package cn.qg.qaplatform.zdata.service.xyqb.impl;
+package cn.qg.qaplatform.service.zdata.xyqb.impl;
 
 import cn.qg.qaplatform.config.WebSocketServer;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
-import cn.qg.qaplatform.zdata.service.xyqb.QueryInProcessStatusService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbBasicQueryService;
+import cn.qg.qaplatform.service.zdata.xyqb.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/zdata/service/xyqb/impl/XyqbBasicQueryServiceImpl.java → src/main/java/cn/qg/qaplatform/service/zdata/xyqb/impl/XyqbBasicQueryServiceImpl.java

-package cn.qg.qaplatform.zdata.service.xyqb.impl;
+package cn.qg.qaplatform.service.zdata.xyqb.impl;
 
-import cn.qg.qaplatform.zdata.enums.LoanStatus;
+import cn.qg.qaplatform.enums.LoanStatus;
 import cn.qg.qaplatform.enums.Namespace;
-import cn.qg.qaplatform.zdata.mapper.XyqbLoanDataMapper;
-import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
-import cn.qg.qaplatform.zdata.entity.XjfqUserEntity;
+import cn.qg.qaplatform.mapper.zdata.XyqbLoanDataMapper;
+import cn.qg.qaplatform.entity.zdata.XjfqGenProcessVo;
+import cn.qg.qaplatform.entity.zdata.XjfqUserEntity;
 import cn.qg.qaplatform.config.SwitchDataSource;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbBasicQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

-package cn.qg.qaplatform.zdata.service.xyqb.impl;
+package cn.qg.qaplatform.service.zdata.xyqb.impl;
 
 import cn.qg.qaplatform.config.WebSocketServer;
-import cn.qg.qaplatform.zdata.entity.XyqbApplyDataVo;
-import cn.qg.qaplatform.zdata.entity.XjfqGenProcessVo;
-import cn.qg.qaplatform.zdata.process.Xyqb;
-import cn.qg.qaplatform.zdata.service.xyqb.QueryInProcessStatusService;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbGenDataService;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
+import cn.qg.qaplatform.entity.zdata.XyqbApplyDataVo;
+import cn.qg.qaplatform.entity.zdata.XjfqGenProcessVo;
+import cn.qg.qaplatform.process.Xyqb;
+import cn.qg.qaplatform.service.zdata.xyqb.QueryInProcessStatusService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbGenDataService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbBasicQueryService;
 import com.alibaba.fastjson.JSONException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

-package cn.qg.qaplatform.zdata.service.xyqb.impl;
+package cn.qg.qaplatform.service.zdata.xyqb.impl;
 
-import cn.qg.qaplatform.zdata.entity.XjfqUserEntity;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbQueryService;
-import cn.qg.qaplatform.zdata.service.xyqb.XyqbBasicQueryService;
+import cn.qg.qaplatform.entity.zdata.XjfqUserEntity;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbQueryService;
+import cn.qg.qaplatform.service.zdata.xyqb.XyqbBasicQueryService;
 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/utils/EnumUtils.java

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

src/main/java/cn/qg/qaplatform/stools/utils/JenkinsApi.java → src/main/java/cn/qg/qaplatform/utils/JenkinsApi.java

-package cn.qg.qaplatform.stools.utils;
+package cn.qg.qaplatform.utils;
 
 import com.offbytwo.jenkins.JenkinsServer;
 import com.offbytwo.jenkins.model.*;

src/main/java/cn/qg/qaplatform/stools/vo/EncryptRequest.java → src/main/java/cn/qg/qaplatform/vo/EncryptRequest.java

-package cn.qg.qaplatform.stools.vo;
+package cn.qg.qaplatform.vo;
 
 import lombok.Data;
 

src/main/java/cn/qg/qaplatform/stools/vo/JenkinsBuildInfo.java → src/main/java/cn/qg/qaplatform/vo/JenkinsBuildInfo.java

-package cn.qg.qaplatform.stools.vo;
+package cn.qg.qaplatform.vo;
 
 import lombok.Data;
 

src/main/resources/mapper/automation/InterfaceMapper.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.automation.mapper.InterfaceMapper">
-
-    <select id="getInterfaceList" resultType="cn.qg.qaplatform.automation.domain.Interface">
-        select i.*,
-               p.name as projectName,
-               m.name as moduleName
-        from interface i, project p, `module` m
-        where i.project_id = p.id and i.module_id = m.id
-        <if test="projectId != null">
-            AND i.`project_id` = #{projectId}
-        </if>
-        <if test="moduleId != null">
-            AND i.`module_id` = #{moduleId}
-        </if>
-    </select>
-</mapper>
\ No newline at end of file

src/main/resources/mapper/automation/TestcaseMapper.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.automation.mapper.TestcaseMapper">
-
-    <select id="getTestcaseList" resultType="cn.qg.qaplatform.automation.domain.Testcase">
-        select t.*,
-               p.name as projectName,
-               m.name as moduleName
-        from testcase t, `interface` i, `project` p, `module` m
-        where t.`interface_id` = i.`id` and i.`project_id` = p.id and i.`module_id` = m.id
-        <if test="projectId != null">
-            AND i.`project_id` = #{projectId}
-        </if>
-        <if test="moduleId != null">
-            AND i.`module_id` = #{moduleId}
-        </if>
-    </select>
-</mapper>
\ No newline at end of file

src/main/resources/mapper/stools/CommonMapper.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.stools.mapper.CommonMapper">
+<mapper namespace="cn.qg.qaplatform.mapper.stools.CommonMapper">
 
     <insert id="addLoginWhiteList">
         INSERT INTO `white_list` (`key`, `key_type`, `enable`) VALUE (#{key}, #{keyType}, '1');

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.zdata.mapper.RuleEngineMapper">
+<mapper namespace="cn.qg.qaplatform.mapper.zdata.RuleEngineMapper">
 
     <insert id="addBlackList">
         INSERT INTO `black_list_config` (`uuid`, `expir_date`, `type`, `enable`) VALUES (#{uuid}, '14', '0', '1');

src/main/resources/mapper/zdata/VccAccountMapper.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.mapper.zdata.VccAccountMapper">
+
+    <select id="getNewestRepayOrderNo" resultType="java.lang.Integer">
+        select `id` from `acs_pay_order` where `user_id` = #{userId} order by `id` desc limit 1
+    </select>
+
+    <select id="getNewestRepayResult" resultType="java.util.Map">
+        select * from `acs_pay_order` where `user_id` = #{userId} order by `id` desc limit 1
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/zdata/VccDataMapper.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.zdata.mapper.VccDataMapper">
+<mapper namespace="cn.qg.qaplatform.mapper.zdata.VccDataMapper">
 
-    <select id="queryVccDataByStatus" resultType="cn.qg.qaplatform.zdata.entity.VccUserEntity">
+    <select id="queryVccDataByStatus" resultType="cn.qg.qaplatform.entity.zdata.VccUserEntity">
         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.zdata.entity.VccUserEntity">
+    <select id="queryUserVccStatus" resultType="cn.qg.qaplatform.entity.zdata.VccUserEntity">
         select
         `phone_no` as phoneNo,
         `user_id` as userId,

src/main/resources/mapper/zdata/XyqbLoanDataMapper.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.zdata.mapper.XyqbLoanDataMapper">
+<mapper namespace="cn.qg.qaplatform.mapper.zdata.XyqbLoanDataMapper">
     <!-- 注册未申请 -->
     <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.zdata.entity.XjfqUserEntity">
+    <select id="getUserDataListByUuidList" parameterType="java.util.List" resultType="cn.qg.qaplatform.entity.zdata.XjfqUserEntity">
         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.zdata.entity.XjfqUserEntity">
+    <select id="getUserDataListByUserIdList" resultType="cn.qg.qaplatform.entity.zdata.XjfqUserEntity">
         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.zdata.entity.XjfqGenProcessVo">
+    <select id="getUserInfoByPhoneNo" resultType="cn.qg.qaplatform.entity.zdata.XjfqGenProcessVo">
         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/test/java/cn/qg/qaplatform/test/Lexin.java

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