调整代码结构

eladmin-system/src/main/java/me/zhengjie/appapi/mapper/package-info.java

@@ -1 +0,0 @@
-package me.zhengjie.appapi.mapper;

eladmin-system/src/main/java/me/zhengjie/appapi/service/BorrowerService.java

@@ -1,38 +0,0 @@
-package me.zhengjie.appapi.service;
-
-import me.zhengjie.appapi.dto.OrderDetailDto;
-import me.zhengjie.appapi.dto.OrderDto;
-import me.zhengjie.appapi.entity.BorrowerEntity;
-import me.zhengjie.appapi.entity.OrderEntity;
-import me.zhengjie.appapi.entity.SysUserEntity;
-import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.appapi.plus.AbstractService;
-import me.zhengjie.appapi.vo.BorrowerVo;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 借款人 服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-21
- */
-public interface BorrowerService extends AbstractService<BorrowerEntity> {
-
-	BaseResponse saveBorrowerOrder(BorrowerVo vo, SysUserEntity entity);
-
-	List<OrderDetailDto> getBorrower(String businessNo);
-
-	List<BorrowerEntity> getBorrowerByCondition();
-
-	public BorrowerEntity getMainBorrower(BorrowerEntity entity);
-
-	public BaseResponse<OrderDetailDto> borrowerInfo(Map<String,String> map);
-
-	List<OrderEntity> getOrderList(String phone,String status, Integer pageIndex, Integer pageSize);
-
-	List<OrderDto> getSubOrderList(String businessNo,String status, Integer pageIndex, Integer pageSize);
-}

eladmin-system/src/main/java/me/zhengjie/appapi/service/GuaranteeService.java

@@ -1,29 +0,0 @@
-package me.zhengjie.appapi.service;
-
-import java.util.Map;
-
-import me.zhengjie.appapi.dto.OrderDetailDto;
-import me.zhengjie.appapi.entity.GuaranteeEntity;
-import me.zhengjie.appapi.entity.SysUserEntity;
-import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.appapi.plus.AbstractService;
-import me.zhengjie.appapi.vo.GuaranteeVo;
-
-/**
- * <p>
- * 担保人 服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-25
- */
-public interface GuaranteeService extends AbstractService<GuaranteeEntity> {
-	public BaseResponse<OrderDetailDto> guaranteeInfo(Map<String, String> map);
-
-	/**
-	 * 创建/修改担保订单
-	 * @param vo
-	 * @param userEntity
-	 */
-	public void saveGuarantee(GuaranteeVo vo, SysUserEntity userEntity);
-}

eladmin-system/src/main/java/me/zhengjie/appapi/service/ModelService.java

@@ -1,16 +0,0 @@
-package me.zhengjie.appapi.service;
-
-import me.zhengjie.appapi.entity.ModelEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-public interface ModelService extends IService<ModelEntity> {
-
-}

eladmin-system/src/main/java/me/zhengjie/appapi/service/MortgageService.java

@@ -1,29 +0,0 @@
-package me.zhengjie.appapi.service;
-
-import java.util.Map;
-
-import me.zhengjie.appapi.dto.OrderDetailDto;
-import me.zhengjie.appapi.entity.MortgageEntity;
-import me.zhengjie.appapi.entity.SysUserEntity;
-import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.appapi.plus.AbstractService;
-import me.zhengjie.appapi.vo.MortgageVo;
-
-/**
- * <p>
- * 抵押人 服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-22
- */
-public interface MortgageService extends AbstractService<MortgageEntity> {
-	public BaseResponse<OrderDetailDto> mortgageInfo(Map<String, String> map);
-
-	/**
-	 * 创建/修改抵押订单
-	 * @param vo
-	 * @param userEntity
-	 */
-	public void saveMortgage(MortgageVo vo, SysUserEntity userEntity);
-}

eladmin-system/src/main/java/me/zhengjie/appapi/service/NotaryNoteService.java

@@ -1,26 +0,0 @@
-package me.zhengjie.appapi.service;
-
-import me.zhengjie.appapi.entity.NotaryNoteEntity;
-import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.appapi.plus.AbstractService;
-import me.zhengjie.appapi.vo.NotaryNoteVo;
-
-import java.util.List;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 公证笔录表 服务类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-public interface NotaryNoteService extends AbstractService<NotaryNoteEntity> {
-
-	public JSONObject getNotaryNoteByType(NotaryNoteVo notary);
-
-	public BaseResponse saveNotaryNote(NotaryNoteVo notary);
-}

eladmin-system/src/main/java/me/zhengjie/appapi/service/OperationLogService.java

@@ -1,7 +0,0 @@
-package me.zhengjie.appapi.service;
-
-import me.zhengjie.appapi.entity.OperationLog;
-
-public interface OperationLogService {
-	public void insert(OperationLog log);
-}

eladmin-system/src/main/java/me/zhengjie/appapi/service/OrderRoomIdService.java

@@ -1,8 +0,0 @@
-package me.zhengjie.appapi.service;
-
-import me.zhengjie.appapi.entity.OrderRoomIdEntity;
-import me.zhengjie.appapi.plus.AbstractService;
-
-public interface OrderRoomIdService extends AbstractService<OrderRoomIdEntity> {
-
-}

eladmin-system/src/main/java/me/zhengjie/appapi/service/impl/ModelServiceImpl.java

@@ -1,22 +0,0 @@
-package me.zhengjie.appapi.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import me.zhengjie.appapi.entity.ModelEntity;
-import me.zhengjie.appapi.mapper.IModelDao;
-import me.zhengjie.appapi.service.ModelService;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author humuyu
- * @since 2022-03-10
- */
-@Service
-public class ModelServiceImpl extends ServiceImpl<IModelDao, ModelEntity> implements ModelService {
-
-}

eladmin-system/src/main/java/me/zhengjie/appapi/service/impl/OrderRoomIdServiceImpl.java

@@ -1,13 +0,0 @@
-package me.zhengjie.appapi.service.impl;
-
-import org.springframework.stereotype.Service;
-
-import me.zhengjie.appapi.entity.OrderRoomIdEntity;
-import me.zhengjie.appapi.mapper.IOrderRoomIdDao;
-import me.zhengjie.appapi.plus.AbstractServiceImpl;
-import me.zhengjie.appapi.service.OrderRoomIdService;
-
-@Service
-public class OrderRoomIdServiceImpl extends AbstractServiceImpl<IOrderRoomIdDao, OrderRoomIdEntity> implements OrderRoomIdService  {
-
-}

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/SetEvidence.java

@@ -1,8 +0,0 @@
-package me.zhengjie.appapi.tencent.utils;
-
-public class SetEvidence {
-	
-	
-	
-	
-}

eladmin-system/src/main/java/me/zhengjie/appapi/entity/response/BaseResponse.java

@@ -1,10 +1,9 @@
-package me.zhengjie.appapi.entity.response;
+package me.zhengjie.base;
 
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import me.zhengjie.domain.order.OrderBizCodeMessage;
-import me.zhengjie.base.ResultCode;
 
 import java.io.Serializable;
 
@@ -17,7 +16,7 @@ import java.io.Serializable;
 @ToString
 @Getter
 @Setter
-public class BaseResponse<T> implements Serializable {
+public class AppBaseResponse<T> implements Serializable {
 
 	private static final long serialVersionUID = 4806867295263258476L;
 
@@ -34,28 +33,28 @@ public class BaseResponse<T> implements Serializable {
 	/**
 	 * 响应结果
 	 */
-	private ResultData<T> data;
+	private AppResultData<T> data;
 
 	private Object result;
 
-	public BaseResponse() {
+	public AppBaseResponse() {
 
 	}
 
-	public BaseResponse(String code) {
+	public AppBaseResponse(String code) {
 		this.code = code;
 	}
 
-	public BaseResponse(String code, String msg) {
+	public AppBaseResponse(String code, String msg) {
 		this.code = code;
 		this.msg = msg;
 	}
 
-	public BaseResponse(Object result) {
+	public AppBaseResponse(Object result) {
 		this.result = result;
 	}
 
-	public BaseResponse(ResultCode result) {
+	public AppBaseResponse(ResultCode result) {
 		this.code = String.valueOf(result.code());
 		this.msg = result.message();
 	}
@@ -65,17 +64,17 @@ public class BaseResponse<T> implements Serializable {
 		this.msg = msg;
 	}
 
-	public static BaseResponse<?> succ(Object result) {
-		return new BaseResponse<>(result);
+	public static AppBaseResponse<?> succ(Object result) {
+		return new AppBaseResponse<>(result);
 	}
 
-	public static BaseResponse<?> success() {
-		return new BaseResponse<>(ResultCode.SUCCESS);
+	public static AppBaseResponse<?> success() {
+		return new AppBaseResponse<>(ResultCode.SUCCESS);
 	}
 
-	public static BaseResponse<?> error(ResultCode result) {
+	public static AppBaseResponse<?> error(ResultCode result) {
 
-		return new BaseResponse<>(result);
+		return new AppBaseResponse<>(result);
 	}
 
 	public void fail(String code, String msg) {
@@ -93,7 +92,7 @@ public class BaseResponse<T> implements Serializable {
 		this.msg = orderBizCodeMessage.getMessage();
 	}
 
-	public void copy(BaseResponse result) {
+	public void copy(AppBaseResponse result) {
 		this.code = result.getCode();
 		this.msg = result.getMsg();
 	}

eladmin-system/src/main/java/me/zhengjie/appapi/entity/response/ResultData.java

@@ -1,8 +1,8 @@
-package me.zhengjie.appapi.entity.response;
+package me.zhengjie.base;
 
 
 import lombok.Data;
-import me.zhengjie.appapi.entity.request.Page;
+import me.zhengjie.base.Page;
 
 /**
  * @Name: ResultData
@@ -11,7 +11,7 @@ import me.zhengjie.appapi.entity.request.Page;
  * @Description:
  */
 @Data
-public class ResultData<T> {
+public class AppResultData<T> {
 
     /**
      * 结果集
@@ -24,11 +24,11 @@ public class ResultData<T> {
     private Page page;
 
 
-    public ResultData(T result) {
+    public AppResultData(T result) {
         this.result = result;
     }
 
-    public ResultData(T result, Page page) {
+    public AppResultData(T result, Page page) {
         this.result = result;
         this.page = page;
     }

eladmin-system/src/main/java/me/zhengjie/base/BaseController.java

@@ -3,7 +3,7 @@ package me.zhengjie.base;
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSON;
-import me.zhengjie.appapi.entity.SysUserEntity;
+import me.zhengjie.dao.mybatis.entity.SysUserEntity;
 import me.zhengjie.modules.security.security.TokenProvider;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

eladmin-system/src/main/java/me/zhengjie/appapi/entity/request/BaseRequest.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.entity.request;
+package me.zhengjie.base;
 
 import lombok.Data;
 

eladmin-system/src/main/java/me/zhengjie/appapi/entity/request/Page.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.entity.request;
+package me.zhengjie.base;
 
 import lombok.Data;
 

eladmin-system/src/main/java/me/zhengjie/base/ResultData.java

@@ -2,7 +2,6 @@ package me.zhengjie.base;
 
 
 import lombok.Data;
-import me.zhengjie.appapi.entity.request.Page;
 
 /**
  * @Name: ResultData

eladmin-system/src/main/java/me/zhengjie/appapi/config/AppConfigInfo.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.config;
+package me.zhengjie.base.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

eladmin-system/src/main/java/me/zhengjie/appapi/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.config;
+package me.zhengjie.base.config;
 
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;

eladmin-system/src/main/java/me/zhengjie/appapi/config/TencentHumanFaceVerify.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.config;
+package me.zhengjie.base.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;

eladmin-system/src/main/java/me/zhengjie/base/file/MinioFileHandle.java

@@ -14,8 +14,8 @@ import cn.hutool.core.io.IoUtil;
 import io.minio.MinioClient;
 import io.minio.PutObjectOptions;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.appapi.entity.FileInfoEntity;
-import me.zhengjie.appapi.service.FileInfoService;
+import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
+import me.zhengjie.service.bank.FileInfoService;
 
 @Slf4j
 @Primary

eladmin-system/src/main/java/me/zhengjie/base/mq/MessagePushConfig.java

@@ -3,13 +3,11 @@ package me.zhengjie.base.mq;
 import com.corundumstudio.socketio.Configuration;
 import com.corundumstudio.socketio.SocketConfig;
 import com.corundumstudio.socketio.SocketIOServer;
-import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.appapi.config.AppConfigInfo;
+import me.zhengjie.base.config.AppConfigInfo;
 import me.zhengjie.modules.mnt.websocket.WebSocketEventListenner;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;

eladmin-system/src/main/java/me/zhengjie/appapi/plus/AbstractService.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.plus;
+package me.zhengjie.base.plus;
 
 import java.lang.reflect.Field;
 import java.util.Collection;

eladmin-system/src/main/java/me/zhengjie/appapi/plus/AbstractServiceImpl.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.plus;
+package me.zhengjie.base.plus;
 
 import java.util.Map;
 

eladmin-system/src/main/java/me/zhengjie/appapi/plus/QueryKeyword.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.plus;
+package me.zhengjie.base.plus;
 
 
 import com.baomidou.mybatisplus.core.conditions.ISqlSegment;

eladmin-system/src/main/java/me/zhengjie/appapi/plus/QueryWapper.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.plus;
+package me.zhengjie.base.plus;
 
 import org.springframework.stereotype.Indexed;
 

eladmin-system/src/main/java/me/zhengjie/appapi/plus/QueryWapperEnum.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.plus;
+package me.zhengjie.base.plus;
 
 /**
  * @Description 查询枚举类

eladmin-system/src/main/java/me/zhengjie/appapi/plus/QueryWrapperUtil.java

@@ -1,10 +1,10 @@
-package me.zhengjie.appapi.plus;
+package me.zhengjie.base.plus;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
-import me.zhengjie.appapi.entity.BorrowerEntity;
+import me.zhengjie.dao.mybatis.entity.AppBorrowerEntity;
 
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.ObjectUtils;
@@ -111,7 +111,7 @@ public class QueryWrapperUtil {
 	}
 
 	public static void main(String[] args) {
-		LambdaQueryWrapper<BorrowerEntity> queryWrapper = new LambdaQueryWrapper<BorrowerEntity>();
-		queryWrapper.eq(BorrowerEntity::getBirth, "");
+		LambdaQueryWrapper<AppBorrowerEntity> queryWrapper = new LambdaQueryWrapper<AppBorrowerEntity>();
+		queryWrapper.eq(AppBorrowerEntity::getBirth, "");
 	}
 }

eladmin-system/src/main/java/me/zhengjie/base/util/AliSms.java

@@ -8,7 +8,7 @@ import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ServerException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
-import me.zhengjie.appapi.entity.Sms;
+import me.zhengjie.controller.bank.vo.Sms;
 
 public class AliSms {
 

eladmin-system/src/main/java/me/zhengjie/base/util/FileUploadUtil.java

@@ -20,9 +20,9 @@ import org.springframework.web.multipart.MultipartFile;
 import cn.hutool.core.io.IoUtil;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
-import me.zhengjie.appapi.vo.FileUploadVo;
-import me.zhengjie.appapi.vo.FileVo;
-import me.zhengjie.appapi.vo.ImageUploadVo;
+import me.zhengjie.controller.bank.vo.FileUploadVo;
+import me.zhengjie.controller.bank.vo.FileVo;
+import me.zhengjie.controller.bank.vo.ImageUploadVo;
 import me.zhengjie.base.file.FileHandle;
 import me.zhengjie.base.file.FileHandleVo;
 

eladmin-system/src/main/java/me/zhengjie/base/util/MinioUtils.java

@@ -7,7 +7,7 @@
 //import io.minio.PutObjectOptions;
 //import lombok.extern.slf4j.Slf4j;
 //
-//import me.zhengjie.appapi.config.AppConfigInfo;
+//import me.zhengjie.base.config.AppConfigInfo;
 //
 //@Slf4j
 //public class MinioUtils {

eladmin-system/src/main/java/me/zhengjie/base/util/TencentServiceUtil.java

@@ -149,7 +149,7 @@ public class TencentServiceUtil {
     }
 
     public static void main(String[] args) {
-        File file = new File("/Users/sakuya/Downloads/1656403417693.jpg");
+        File file = new File("/Users/sakuya/Downloads/1656379047403.jpg");
         byte[] fileBytes = null;
         FileInputStream fis = null;
         try {
@@ -161,6 +161,6 @@ public class TencentServiceUtil {
             e.printStackTrace();
         }
         String content = "data:image/png;base64," + Base64.encodeBase64String(fileBytes);
-        readInfoWithOCR(content);
+        System.out.println(readInfoWithOCR(content));
     }
 }

eladmin-system/src/main/java/me/zhengjie/base/util/TreeUtil.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import me.zhengjie.appapi.dto.AreaDto;
+import me.zhengjie.controller.bank.vo.AreaDto;
 
 public class TreeUtil {
 	// 把一个List转成树

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/h5face/GetH5FaceId.java

@@ -1,10 +1,10 @@
-package me.zhengjie.appapi.tencent.h5face;
+package me.zhengjie.base.util.tencent.h5face;
 import java.util.ArrayList;
 import java.util.Map;
 
-import me.zhengjie.appapi.tencent.utils.HttpClientUtil;
-import me.zhengjie.appapi.tencent.utils.JsonUtil;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.utils.HttpClientUtil;
+import me.zhengjie.base.util.tencent.utils.JsonUtil;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
 
 import net.sf.json.JSONObject;
 

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/h5face/Live02.java

@@ -1,10 +1,9 @@
-package me.zhengjie.appapi.tencent.h5face;
+package me.zhengjie.base.util.tencent.h5face;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import me.zhengjie.appapi.tencent.one.GetSIGNTicketTest;
-import me.zhengjie.appapi.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.one.access_token;
 import org.apache.http.Consts;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -12,10 +11,9 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
 import com.google.common.collect.Lists;
-import me.zhengjie.appapi.tencent.one.GetNONCETicket;
-import me.zhengjie.appapi.tencent.utils.HttpClientUtil;
-import me.zhengjie.appapi.tencent.utils.InvertCodeGeneratorUitls;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.one.GetNONCETicket;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
 /**
  * 
  * [公众号启动H5刷脸02]

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/h5face/SdkTest.java

@@ -1,15 +1,14 @@
-package me.zhengjie.appapi.tencent.h5face;
+package me.zhengjie.base.util.tencent.h5face;
 
 import java.util.ArrayList;
 import java.util.UUID;
 
 import com.alibaba.fastjson.JSONObject;
 
-import me.zhengjie.appapi.config.AppConfigInfo;
-import me.zhengjie.appapi.tencent.one.GetNONCETicket;
-import me.zhengjie.appapi.tencent.one.access_token;
-import me.zhengjie.appapi.tencent.utils.HttpClientUtil;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.one.GetNONCETicket;
+import me.zhengjie.base.util.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.utils.HttpClientUtil;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
 
 public class SdkTest {
 	final static String appid = "";

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/h5face/WebLogin2.java

@@ -1,10 +1,10 @@
-package me.zhengjie.appapi.tencent.h5face;
+package me.zhengjie.base.util.tencent.h5face;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import me.zhengjie.appapi.tencent.one.GetSIGNTicketTest;
-import me.zhengjie.appapi.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.one.GetSIGNTicketTest;
+import me.zhengjie.base.util.tencent.one.access_token;
 import org.apache.http.Consts;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -12,10 +12,9 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
 import com.google.common.collect.Lists;
-import me.zhengjie.appapi.tencent.one.GetNONCETicket;
-import me.zhengjie.appapi.tencent.utils.HttpClientUtil;
-import me.zhengjie.appapi.tencent.utils.InvertCodeGeneratorUitls;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.one.GetNONCETicket;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
 /**
  * 
  * [公众号启动H5刷脸02]

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/h5ocr/H5OcrLogin02.java

@@ -1,9 +1,9 @@
-package me.zhengjie.appapi.tencent.h5ocr;
+package me.zhengjie.base.util.tencent.h5ocr;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import me.zhengjie.appapi.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.one.access_token;
 import org.apache.http.Consts;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -11,10 +11,9 @@ import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
 
 import com.google.common.collect.Lists;
-import me.zhengjie.appapi.tencent.one.GetNONCETicket;
-import me.zhengjie.appapi.tencent.utils.HttpClientUtil;
-import me.zhengjie.appapi.tencent.utils.InvertCodeGeneratorUitls;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.one.GetNONCETicket;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
 /**
  * 
  * [公众号启动H5刷脸02]

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/h5result/GetLiveResult.java

@@ -1,25 +1,13 @@
-package me.zhengjie.appapi.tencent.h5result;
+package me.zhengjie.base.util.tencent.h5result;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
-import me.zhengjie.appapi.tencent.one.GetNONCETicket;
-import me.zhengjie.appapi.tencent.one.GetSIGNTicketTest;
-import me.zhengjie.appapi.tencent.one.access_token;
-import me.zhengjie.appapi.tencent.utils.InvertCodeGeneratorUitls;
-import me.zhengjie.appapi.tencent.utils.MyX509TrustManager;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
-import me.zhengjie.appapi.tencent.utils.Sha1Uitls;
-import me.zhengjie.appapi.tencent.utils.getUtils;
+import me.zhengjie.base.util.tencent.one.GetSIGNTicketTest;
+import me.zhengjie.base.util.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.utils.getUtils;
 /**
  * 
  * [人脸识别 服务端查询结果]

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/h5result/H5FaceResults.java

@@ -1,25 +1,13 @@
-package me.zhengjie.appapi.tencent.h5result;
+package me.zhengjie.base.util.tencent.h5result;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
-import me.zhengjie.appapi.tencent.one.GetNONCETicket;
-import me.zhengjie.appapi.tencent.one.GetSIGNTicketTest;
-import me.zhengjie.appapi.tencent.one.access_token;
-import me.zhengjie.appapi.tencent.utils.InvertCodeGeneratorUitls;
-import me.zhengjie.appapi.tencent.utils.MyX509TrustManager;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
-import me.zhengjie.appapi.tencent.utils.Sha1Uitls;
-import me.zhengjie.appapi.tencent.utils.getUtils;
+import me.zhengjie.base.util.tencent.one.GetSIGNTicketTest;
+import me.zhengjie.base.util.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.utils.getUtils;
 /**
  * 
  * [人脸识别 服务端查询结果]

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/h5result/OcrResults.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.h5result;
+package me.zhengjie.base.util.tencent.h5result;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -12,13 +12,12 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 
-import me.zhengjie.appapi.tencent.one.GetNONCETicket;
-import me.zhengjie.appapi.tencent.one.GetSIGNTicketTest;
-import me.zhengjie.appapi.tencent.one.access_token;
-import me.zhengjie.appapi.tencent.utils.InvertCodeGeneratorUitls;
-import me.zhengjie.appapi.tencent.utils.MyX509TrustManager;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
-import me.zhengjie.appapi.tencent.utils.Sha1Uitls;
+import me.zhengjie.base.util.tencent.one.GetSIGNTicketTest;
+import me.zhengjie.base.util.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.MyX509TrustManager;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
+
 /**
  * 
  * [人脸识别 服务端查询结果]

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/one/GetNONCETicket.java

@@ -1,11 +1,11 @@
-package me.zhengjie.appapi.tencent.one;
+package me.zhengjie.base.util.tencent.one;
 
 
 import java.util.List;
 import java.util.Map;
 
-import me.zhengjie.appapi.tencent.utils.JsonUtil;
-import me.zhengjie.appapi.tencent.utils.getUtils;
+import me.zhengjie.base.util.tencent.utils.JsonUtil;
+import me.zhengjie.base.util.tencent.utils.getUtils;
 /**
  * 
  * [获取nonceticket]

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/one/GetSIGNTicketTest.java

@@ -1,22 +1,10 @@
-package me.zhengjie.appapi.tencent.one;
+package me.zhengjie.base.util.tencent.one;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.util.List;
 import java.util.Map;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
-import me.zhengjie.appapi.tencent.utils.JsonUtil;
-import me.zhengjie.appapi.tencent.utils.MyX509TrustManager;
-import me.zhengjie.appapi.tencent.utils.getUtils;
+import me.zhengjie.base.util.tencent.utils.JsonUtil;
+import me.zhengjie.base.util.tencent.utils.getUtils;
 /**
  * 
  * [获取singleticket]

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/one/access_token.java

@@ -1,19 +1,9 @@
-package me.zhengjie.appapi.tencent.one;
+package me.zhengjie.base.util.tencent.one;
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
 import java.util.Map;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-
 import com.google.gson.Gson;
-import me.zhengjie.appapi.tencent.utils.MyX509TrustManager;
-import me.zhengjie.appapi.tencent.utils.getUtils;
+import me.zhengjie.base.util.tencent.utils.getUtils;
 /**
  * 
  * [获取token]

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/pass/BankCardOcrApp.java

@@ -1,14 +1,15 @@
-package me.zhengjie.appapi.tencent.pass;
+package me.zhengjie.base.util.tencent.pass;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
-import me.zhengjie.appapi.tencent.one.GetSIGNTicketTest;
-import me.zhengjie.appapi.tencent.one.access_token;
-import me.zhengjie.appapi.tencent.utils.*;
+import me.zhengjie.base.util.tencent.one.GetSIGNTicketTest;
+import me.zhengjie.base.util.tencent.one.access_token;
 
+import me.zhengjie.base.util.tencent.utils.HttpClientUtil;
+import me.zhengjie.base.util.tencent.utils.Img2Base64Util;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
 import net.sf.json.JSONObject;
 
 /**

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/pass/PaasIdcardOcrApp.java

@@ -1,11 +1,11 @@
-package me.zhengjie.appapi.tencent.pass;
+package me.zhengjie.base.util.tencent.pass;
 
-import me.zhengjie.appapi.tencent.one.GetSIGNTicketTest;
-import me.zhengjie.appapi.tencent.one.access_token;
-import me.zhengjie.appapi.tencent.utils.HttpClientUtil;
-import me.zhengjie.appapi.tencent.utils.Img2Base64Util;
-import me.zhengjie.appapi.tencent.utils.InvertCodeGeneratorUitls;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.one.GetSIGNTicketTest;
+import me.zhengjie.base.util.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.utils.HttpClientUtil;
+import me.zhengjie.base.util.tencent.utils.Img2Base64Util;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
 import net.sf.json.JSONObject;
 
 import java.util.ArrayList;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/pass/PassEasyCompare.java

@@ -1,11 +1,11 @@
-package me.zhengjie.appapi.tencent.pass;
+package me.zhengjie.base.util.tencent.pass;
 
-import me.zhengjie.appapi.tencent.one.GetSIGNTicketTest;
-import me.zhengjie.appapi.tencent.one.access_token;
-import me.zhengjie.appapi.tencent.utils.HttpClientUtil;
-import me.zhengjie.appapi.tencent.utils.Img2Base64Util;
-import me.zhengjie.appapi.tencent.utils.InvertCodeGeneratorUitls;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.one.GetSIGNTicketTest;
+import me.zhengjie.base.util.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.utils.HttpClientUtil;
+import me.zhengjie.base.util.tencent.utils.Img2Base64Util;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
 import net.sf.json.JSONObject;
 
 import java.util.ArrayList;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/pass/PassEasyface.java

@@ -1,11 +1,11 @@
-package me.zhengjie.appapi.tencent.pass;
+package me.zhengjie.base.util.tencent.pass;
 
-import me.zhengjie.appapi.tencent.one.GetSIGNTicketTest;
-import me.zhengjie.appapi.tencent.one.access_token;
-import me.zhengjie.appapi.tencent.utils.HttpClientUtil;
-import me.zhengjie.appapi.tencent.utils.Img2Base64Util;
-import me.zhengjie.appapi.tencent.utils.InvertCodeGeneratorUitls;
-import me.zhengjie.appapi.tencent.utils.QianMingUitls;
+import me.zhengjie.base.util.tencent.one.GetSIGNTicketTest;
+import me.zhengjie.base.util.tencent.one.access_token;
+import me.zhengjie.base.util.tencent.utils.HttpClientUtil;
+import me.zhengjie.base.util.tencent.utils.Img2Base64Util;
+import me.zhengjie.base.util.tencent.utils.InvertCodeGeneratorUitls;
+import me.zhengjie.base.util.tencent.utils.QianMingUitls;
 import net.sf.json.JSONObject;
 
 import java.util.ArrayList;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/Base64Util.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/HttpClientUtil.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.io.IOException;
 import java.security.cert.CertificateException;
@@ -24,7 +24,6 @@ import javax.net.ssl.X509TrustManager;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpGet;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/ImageUtils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/Img2Base64Util.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import org.apache.commons.codec.binary.Base64;
 

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/InvertCodeGeneratorUitls.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
   
 import java.util.ArrayList;
 import java.util.List;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/JsonUtil.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.lang.reflect.Type;  
 import com.google.gson.Gson;  

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/MyX509TrustManager.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/QianMingUitls.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.util.List;
 

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/SSLClientUtil.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 /**
  * Created by IntelliJ IDEA.

eladmin-system/src/main/java/me/zhengjie/base/util/tencent/utils/SetEvidence.java

@@ -0,0 +1,8 @@
+package me.zhengjie.base.util.tencent.utils;
+
+public class SetEvidence {
+	
+	
+	
+	
+}

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/Sha1Uitls.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.util.Collections;
 import java.util.List;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/Test64Bit.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/ValidateDictionaryUtils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.net.MalformedURLException;
 

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/ValidateSignUtils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.net.MalformedURLException;
 import java.util.ArrayList;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/ValidateSignUtils2.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.net.MalformedURLException;
 import java.util.ArrayList;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/getUtils.java

@@ -1,7 +1,6 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;

eladmin-system/src/main/java/me/zhengjie/appapi/tencent/utils/ggg.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.tencent.utils;
+package me.zhengjie.base.util.tencent.utils;
 
 import java.awt.image.BufferedImage;
 import java.io.File;

eladmin-system/src/main/java/me/zhengjie/appapi/component/AppSocketServer.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.component;
+package me.zhengjie.base.websocket;
 
 import java.io.IOException;
 import java.util.Iterator;

eladmin-system/src/main/java/me/zhengjie/controller/admin/AreaController.java

@@ -6,9 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import me.zhengjie.annotation.rest.AnonymousGetMapping;
-import me.zhengjie.appapi.dto.AreaDto;
-import me.zhengjie.appapi.service.AreaService;
+import me.zhengjie.controller.bank.vo.AreaDto;
+import me.zhengjie.service.bank.AreaService;
 
 /**
  * <p>

eladmin-system/src/main/java/me/zhengjie/controller/admin/BankController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import me.zhengjie.appapi.entity.response.BaseResponse;
+import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.controller.admin.vo.BankCreateReq;
 import me.zhengjie.controller.admin.vo.BankQueryReq;
 import me.zhengjie.controller.admin.vo.BankQueryRsp;
@@ -38,7 +38,7 @@ public class BankController {
      * @return
      */
     @RequestMapping("/query")
-    public BaseResponse<List<BankQueryRsp>> queryBank(@RequestBody BankQueryReq req) {
+    public AppBaseResponse<List<BankQueryRsp>> queryBank(@RequestBody BankQueryReq req) {
         return bankService.queryBank(req);
     }
 
@@ -48,7 +48,7 @@ public class BankController {
      * @return
      */
     @RequestMapping("/create")
-    public BaseResponse createBank(@RequestBody BankCreateReq req) {
+    public AppBaseResponse createBank(@RequestBody BankCreateReq req) {
         return bankService.createBank(req);
     }
 
@@ -58,7 +58,7 @@ public class BankController {
      * @return
      */
     @RequestMapping("/update")
-    public BaseResponse updateBank(@RequestBody BankCreateReq req) {
+    public AppBaseResponse updateBank(@RequestBody BankCreateReq req) {
         return bankService.updateBank(req);
     }
 
@@ -69,7 +69,7 @@ public class BankController {
      * @return
      */
     @RequestMapping("/delete")
-    public BaseResponse deleteBank(@RequestBody String[] ids) {
+    public AppBaseResponse deleteBank(@RequestBody String[] ids) {
         return bankService.deleteBank(ids);
     }
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/BizConfigController.java

@@ -1,6 +1,6 @@
 package me.zhengjie.controller.admin;
 
-import me.zhengjie.appapi.entity.response.BaseResponse;
+import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.controller.admin.vo.OfficeXbankReq;
 import me.zhengjie.controller.admin.vo.BankQueryRsp;
 import me.zhengjie.service.admin.OfficeXbankService;
@@ -28,7 +28,7 @@ public class BizConfigController {
      * @return
      */
     @RequestMapping("/canMappedBanks")
-    public BaseResponse<List<BankQueryRsp>> canMappedBanks(@RequestBody OfficeXbankReq req) {
+    public AppBaseResponse<List<BankQueryRsp>> canMappedBanks(@RequestBody OfficeXbankReq req) {
         return officeXbankService.queryCanMappedBank(req);
     }
 
@@ -38,7 +38,7 @@ public class BizConfigController {
      * @return
      */
     @RequestMapping("/mappedBanks")
-    public BaseResponse<List<BankQueryRsp>> mappedBanks(@RequestBody OfficeXbankReq req) {
+    public AppBaseResponse<List<BankQueryRsp>> mappedBanks(@RequestBody OfficeXbankReq req) {
         return officeXbankService.queryMappedBank(req);
     }
 
@@ -48,7 +48,7 @@ public class BizConfigController {
      * @return
      */
     @RequestMapping("/updateOfficeBankMap")
-    public BaseResponse updateOfficeBankMap(@RequestBody OfficeXbankReq req){
+    public AppBaseResponse updateOfficeBankMap(@RequestBody OfficeXbankReq req){
         return officeXbankService.updateOfficeBankMap(req);
     }
 }

eladmin-system/src/main/java/me/zhengjie/controller/admin/DeptController.java

@@ -21,7 +21,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.dao.entity.Dept;
+import me.zhengjie.dao.mybatis.entity.Dept;
 import me.zhengjie.service.admin.DeptService;
 import me.zhengjie.service.admin.dto.DeptDto;
 import me.zhengjie.service.admin.dto.DeptQueryCriteria;

eladmin-system/src/main/java/me/zhengjie/controller/admin/DictController.java

@@ -20,7 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.dao.entity.Dict;
+import me.zhengjie.dao.mybatis.entity.Dict;
 import me.zhengjie.service.admin.DictService;
 import me.zhengjie.service.admin.dto.DictQueryCriteria;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/controller/admin/DictDetailController.java

@@ -20,7 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.dao.entity.DictDetail;
+import me.zhengjie.dao.mybatis.entity.DictDetail;
 import me.zhengjie.service.admin.DictDetailService;
 import me.zhengjie.service.admin.dto.DictDetailDto;
 import me.zhengjie.service.admin.dto.DictDetailQueryCriteria;

eladmin-system/src/main/java/me/zhengjie/controller/admin/FileInfoController.java

@@ -10,12 +10,12 @@ import static me.zhengjie.base.util.Constants.*;
 import com.alibaba.fastjson.JSONObject;
 
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.appapi.service.ApiBankService;
-import me.zhengjie.appapi.service.FileInfoService;
+import me.zhengjie.service.bank.ApiBankService;
+import me.zhengjie.service.bank.FileInfoService;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
-import me.zhengjie.appapi.vo.FileUploadVo;
-import me.zhengjie.appapi.vo.FileVo;
+import me.zhengjie.controller.bank.vo.FileUploadVo;
+import me.zhengjie.controller.bank.vo.FileVo;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/JobController.java

@@ -20,7 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.dao.entity.Job;
+import me.zhengjie.dao.mybatis.entity.Job;
 import me.zhengjie.service.admin.JobService;
 import me.zhengjie.service.admin.dto.JobQueryCriteria;
 import org.springframework.data.domain.Pageable;

eladmin-system/src/main/java/me/zhengjie/controller/admin/MenuController.java

@@ -20,8 +20,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.dao.entity.Menu;
+import me.zhengjie.base.AppBaseResponse;
+import me.zhengjie.dao.mybatis.entity.Menu;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.service.admin.MenuService;
 import me.zhengjie.service.admin.dto.MenuDto;
@@ -114,21 +114,21 @@ public class MenuController {
     @ApiOperation("新增菜单")
     @PostMapping
     @PreAuthorize("@el.check('menu:add')")
-    public BaseResponse<?> createMenu(@Validated @RequestBody Menu resources){
+    public AppBaseResponse<?> createMenu(@Validated @RequestBody Menu resources){
         if (resources.getId() != null) {
             throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
         }
         menuService.create(resources);
-        return BaseResponse.success();
+        return AppBaseResponse.success();
     }
 
     @Log("修改菜单")
     @ApiOperation("修改菜单")
     @PutMapping
     @PreAuthorize("@el.check('menu:edit')")
-    public BaseResponse<?> updateMenu(@Validated(Menu.Update.class) @RequestBody Menu resources){
+    public AppBaseResponse<?> updateMenu(@Validated(Menu.Update.class) @RequestBody Menu resources){
         menuService.update(resources);
-    	return BaseResponse.success();
+    	return AppBaseResponse.success();
     }
 
     @Log("删除菜单")

eladmin-system/src/main/java/me/zhengjie/controller/admin/ModelController.java

@@ -2,7 +2,7 @@ package me.zhengjie.controller.admin;
 
 import com.alibaba.fastjson.JSONObject;
 import me.zhengjie.annotation.rest.AnonymousGetMapping;
-import me.zhengjie.appapi.entity.response.BaseResponse;
+import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.base.mq.RedisCacheConfig;
 import me.zhengjie.controller.admin.vo.ModelReq;
 import me.zhengjie.service.admin.ModelNotarizationService;
@@ -24,27 +24,27 @@ public class ModelController {
     private RedisTemplate<String, String> redisTemplate;
 
     @RequestMapping("/query")
-    public BaseResponse query(@RequestBody ModelReq modelReq) {
+    public AppBaseResponse query(@RequestBody ModelReq modelReq) {
         return modelService.query(modelReq);
     }
 
     @RequestMapping(value = "/create")
-    public BaseResponse create(@RequestBody ModelReq model){
+    public AppBaseResponse create(@RequestBody ModelReq model){
         return modelService.create(model);
     }
 
     @RequestMapping(value = "/update")
-    public BaseResponse update(@RequestBody ModelReq model){
+    public AppBaseResponse update(@RequestBody ModelReq model){
         return modelService.update(model);
     }
 
     @AnonymousGetMapping(value="/redisMessage")
-    public BaseResponse redisMessage(@RequestParam String businessNo){
+    public AppBaseResponse redisMessage(@RequestParam String businessNo){
         // 推送创建订单文档任务消息
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("businessNo", businessNo);
         redisTemplate.convertAndSend(RedisCacheConfig.CHANNEL_HTML_PDF, jsonObject.toJSONString());
-        return BaseResponse.success();
+        return AppBaseResponse.success();
     }
 
 }

eladmin-system/src/main/java/me/zhengjie/controller/admin/NotarizationNoController.java

@@ -1,6 +1,6 @@
 package me.zhengjie.controller.admin;
 
-import me.zhengjie.appapi.entity.response.BaseResponse;
+import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.controller.admin.vo.NotarizationNoReq;
 import me.zhengjie.service.admin.NotarizationNoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,22 +19,22 @@ public class NotarizationNoController {
     private NotarizationNoService notarizationNoService;
 
     @RequestMapping("/query")
-    public BaseResponse<List<NotarizationNoReq>> query(@RequestBody NotarizationNoReq notarizationNoReq) {
+    public AppBaseResponse<List<NotarizationNoReq>> query(@RequestBody NotarizationNoReq notarizationNoReq) {
         return notarizationNoService.query(notarizationNoReq);
     }
 
     @RequestMapping(value = "/create")
-    public BaseResponse create(@RequestBody NotarizationNoReq notarizationNoReq){
+    public AppBaseResponse create(@RequestBody NotarizationNoReq notarizationNoReq){
         return notarizationNoService.create(notarizationNoReq);
     }
 
     @RequestMapping(value = "/update")
-    public BaseResponse update(@RequestBody NotarizationNoReq notarizationNoReq){
+    public AppBaseResponse update(@RequestBody NotarizationNoReq notarizationNoReq){
         return notarizationNoService.update(notarizationNoReq);
     }
 
     @RequestMapping(value = "/unUsed")
-    public BaseResponse unUsed(@RequestBody NotarizationNoReq notarizationNoReq){
+    public AppBaseResponse unUsed(@RequestBody NotarizationNoReq notarizationNoReq){
         return notarizationNoService.unUsed(notarizationNoReq);
     }
 }

eladmin-system/src/main/java/me/zhengjie/controller/admin/NotaryNoteController.java

@@ -1,9 +1,9 @@
 package me.zhengjie.controller.admin;
 
 import com.alibaba.fastjson.JSONObject;
-import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.appapi.service.NotaryNoteService;
-import me.zhengjie.appapi.vo.NotaryNoteVo;
+import me.zhengjie.base.AppBaseResponse;
+import me.zhengjie.service.bank.NotaryNoteService;
+import me.zhengjie.controller.bank.vo.NotaryNoteVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,7 +34,7 @@ public class NotaryNoteController {
 	 * @return
 	 */
 	@RequestMapping("/save")
-	public BaseResponse<?> save(@Valid @RequestBody NotaryNoteVo notary) {
+	public AppBaseResponse<?> save(@Valid @RequestBody NotaryNoteVo notary) {
 		return notaryNoteService.saveNotaryNote(notary);
 	}
 }

eladmin-system/src/main/java/me/zhengjie/controller/admin/NotaryOfficeController.java

@@ -2,7 +2,7 @@ package me.zhengjie.controller.admin;
 
 
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.appapi.entity.response.BaseResponse;
+import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.controller.admin.vo.NotaryOfficeCreateReq;
 import me.zhengjie.controller.admin.vo.NotaryOfficeQueryReq;
 import me.zhengjie.controller.admin.vo.NotaryOfficeQueryRsp;
@@ -36,7 +36,7 @@ public class NotaryOfficeController {
      * @return
      */
     @AnonymousPostMapping("/detail")
-    public BaseResponse<NotaryOfficeQueryRsp> detail() {
+    public AppBaseResponse<NotaryOfficeQueryRsp> detail() {
         return notaryOfficeService.detail();
     }
 
@@ -46,7 +46,7 @@ public class NotaryOfficeController {
      * @return
      */
     @RequestMapping("/query")
-    public BaseResponse<List<NotaryOfficeQueryRsp>> query(@RequestBody NotaryOfficeQueryReq req) {
+    public AppBaseResponse<List<NotaryOfficeQueryRsp>> query(@RequestBody NotaryOfficeQueryReq req) {
         return notaryOfficeService.query(req);
     }
 
@@ -56,7 +56,7 @@ public class NotaryOfficeController {
      * @return
      */
     @RequestMapping("/create")
-    public BaseResponse<?> create(@RequestBody NotaryOfficeCreateReq req) {
+    public AppBaseResponse<?> create(@RequestBody NotaryOfficeCreateReq req) {
 
         return notaryOfficeService.create(req);
     }
@@ -67,7 +67,7 @@ public class NotaryOfficeController {
      * @return
      */
     @RequestMapping("/update")
-    public BaseResponse<?> update(@RequestBody NotaryOfficeCreateReq req) {
+    public AppBaseResponse<?> update(@RequestBody NotaryOfficeCreateReq req) {
         return notaryOfficeService.update(req);
     }
 
@@ -77,7 +77,7 @@ public class NotaryOfficeController {
      * @return
      */
     @RequestMapping("/delete")
-    public BaseResponse<?> delete(@RequestBody String[] ids) {
+    public AppBaseResponse<?> delete(@RequestBody String[] ids) {
         return notaryOfficeService.delete(ids);
     }
 
@@ -87,14 +87,14 @@ public class NotaryOfficeController {
      * @return
      */
     @RequestMapping("/sendAuthMessage")
-    public BaseResponse<?> sendAuthMessage(@RequestParam String userId){
+    public AppBaseResponse<?> sendAuthMessage(@RequestParam String userId){
         return notaryOfficeService.sendAuthMessage(userId);
     }
     /**
      * 确认授权验证码，完成签名授权
      */
     @RequestMapping("/verifyAuthMessage")
-    public BaseResponse<?> verifyAuthMessage(@RequestBody NotaryOfficeCreateReq req){
+    public AppBaseResponse<?> verifyAuthMessage(@RequestBody NotaryOfficeCreateReq req){
         return notaryOfficeService.verifyAuthMessage(req);
     }
 
@@ -104,7 +104,7 @@ public class NotaryOfficeController {
      * @return
      */
     @AnonymousPostMapping("/modifyAutoGenerate")
-    public BaseResponse<?> modifyAutoGenerate(@RequestBody NotaryOfficeCreateReq req){
+    public AppBaseResponse<?> modifyAutoGenerate(@RequestBody NotaryOfficeCreateReq req){
         return notaryOfficeService.modifyAutoGenerate(req);
     }
 
@@ -114,7 +114,7 @@ public class NotaryOfficeController {
      * @return
      */
     @AnonymousPostMapping("/uploadSeal")
-    public BaseResponse<?> uploadSeal(@RequestBody NotaryOfficeCreateReq req){
+    public AppBaseResponse<?> uploadSeal(@RequestBody NotaryOfficeCreateReq req){
         return notaryOfficeService.uploadSeal(req);
     }
 
@@ -124,7 +124,7 @@ public class NotaryOfficeController {
      * @return
      */
     @AnonymousPostMapping("/modifyAutoGenerateInfo")
-    public BaseResponse<?> modifyAutoGenerateInfo(@RequestBody NotaryOfficeCreateReq req){
+    public AppBaseResponse<?> modifyAutoGenerateInfo(@RequestBody NotaryOfficeCreateReq req){
         return notaryOfficeService.modifyAutoGenerateInfo(req);
     }
 
@@ -134,7 +134,7 @@ public class NotaryOfficeController {
      * @return
      */
     @AnonymousPostMapping("/queryCertificate")
-    public BaseResponse<?> queryCertificate(@RequestBody NotaryOfficeCreateReq req){
+    public AppBaseResponse<?> queryCertificate(@RequestBody NotaryOfficeCreateReq req){
         return notaryOfficeService.queryCertificate(req);
     }
 
@@ -144,7 +144,7 @@ public class NotaryOfficeController {
      * @return
      */
     @AnonymousPostMapping("/getAuthStatus")
-    public BaseResponse<?> getAuthStatus(@RequestBody NotaryOfficeCreateReq req){
+    public AppBaseResponse<?> getAuthStatus(@RequestBody NotaryOfficeCreateReq req){
         return notaryOfficeService.getAuthStatus(req);
     }
 }

eladmin-system/src/main/java/me/zhengjie/controller/admin/NotaryOrderController.java

@@ -5,13 +5,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.appapi.dto.OrderDetailDto;
-import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.appapi.service.BorrowerService;
-import me.zhengjie.appapi.service.GuaranteeService;
-import me.zhengjie.appapi.service.MortgageService;
+import me.zhengjie.controller.bank.vo.OrderDetailDto;
+import me.zhengjie.base.AppBaseResponse;
+import me.zhengjie.service.bank.BorrowerService;
+import me.zhengjie.service.bank.GuaranteeService;
+import me.zhengjie.service.bank.MortgageService;
 import me.zhengjie.base.util.TencentUtil;
-import me.zhengjie.appapi.vo.FileVo;
+import me.zhengjie.controller.bank.vo.FileVo;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.controller.admin.vo.PartyEntity;
 import me.zhengjie.controller.admin.vo.NotaryOrderQueryReq;
@@ -56,7 +56,7 @@ public class NotaryOrderController {
      * @return
      */
     @RequestMapping("/query")
-    public BaseResponse<List<NotaryOrderQueryRsp>> query(@RequestBody NotaryOrderQueryReq req) {
+    public AppBaseResponse<List<NotaryOrderQueryRsp>> query(@RequestBody NotaryOrderQueryReq req) {
         return notaryOrderService.query(req);
     }
 
@@ -67,7 +67,7 @@ public class NotaryOrderController {
      * @return
      */
     @RequestMapping("/customerInfo")
-    public BaseResponse<NotaryOrderQueryRsp> getCustomerInfo(@RequestBody HashMap<String,String> map) {
+    public AppBaseResponse<NotaryOrderQueryRsp> getCustomerInfo(@RequestBody HashMap<String,String> map) {
         return notaryOrderService.getCustomerInfo(map);
     }
 
@@ -77,7 +77,7 @@ public class NotaryOrderController {
      * @return
      */
     @RequestMapping("/borrowerInfo")
-    public BaseResponse<OrderDetailDto> borrowerInfo(@RequestBody HashMap<String,String> map) {
+    public AppBaseResponse<OrderDetailDto> borrowerInfo(@RequestBody HashMap<String,String> map) {
         return borrowerService.borrowerInfo(map);
     }
 
@@ -87,7 +87,7 @@ public class NotaryOrderController {
      * @return
      */
     @RequestMapping("/mortgageInfo")
-    public BaseResponse<OrderDetailDto> mortgageInfo(@RequestBody HashMap<String,String> map) {
+    public AppBaseResponse<OrderDetailDto> mortgageInfo(@RequestBody HashMap<String,String> map) {
         return mortgageService.mortgageInfo(map);
     }
 
@@ -97,7 +97,7 @@ public class NotaryOrderController {
      * @return
      */
     @RequestMapping("/guaranteeInfo")
-    public BaseResponse<OrderDetailDto> guaranteeInfo(@RequestBody HashMap<String,String> map) {
+    public AppBaseResponse<OrderDetailDto> guaranteeInfo(@RequestBody HashMap<String,String> map) {
         return guaranteeService.guaranteeInfo(map);
     }
 
@@ -108,7 +108,7 @@ public class NotaryOrderController {
      * @return
      */
     @RequestMapping("/partys")
-    public BaseResponse<List<PartyEntity>> partys(@RequestBody HashMap<String,String> map) {
+    public AppBaseResponse<List<PartyEntity>> partys(@RequestBody HashMap<String,String> map) {
         return notaryOrderService.partys(map);
     }
 
@@ -118,7 +118,7 @@ public class NotaryOrderController {
      * @return
      */
     @RequestMapping("/orderReturn")
-    public BaseResponse orderReturn(@RequestBody NotaryOrderQueryReq req) {
+    public AppBaseResponse orderReturn(@RequestBody NotaryOrderQueryReq req) {
         return notaryOrderService.orderReturn(req);
     }
 
@@ -128,7 +128,7 @@ public class NotaryOrderController {
      * @return
      */
     @AnonymousPostMapping("/orderReject")
-    public BaseResponse orderReject(@RequestBody NotaryOrderQueryReq req) {
+    public AppBaseResponse orderReject(@RequestBody NotaryOrderQueryReq req) {
         return notaryOrderService.orderReject(req);
     }
 
@@ -138,7 +138,7 @@ public class NotaryOrderController {
      * @return
      */
     @RequestMapping("/partyPass")
-    public BaseResponse partyPass(@RequestBody NotaryOrderQueryReq req) {
+    public AppBaseResponse partyPass(@RequestBody NotaryOrderQueryReq req) {
         return notaryOrderService.partyPass(req);
     }
 
@@ -148,7 +148,7 @@ public class NotaryOrderController {
      * @return
      */
     @AnonymousPostMapping("/checkInfoPass")
-    public BaseResponse checkInfoPass(@RequestBody NotaryOrderQueryReq req) {
+    public AppBaseResponse checkInfoPass(@RequestBody NotaryOrderQueryReq req) {
         return notaryOrderService.checkInfoPass(req);
     }
 
@@ -186,22 +186,22 @@ public class NotaryOrderController {
         return response;
     }
     @RequestMapping("/preview")
-    public BaseResponse previewNotarization(@RequestBody NotaryOrderQueryReq req){
+    public AppBaseResponse previewNotarization(@RequestBody NotaryOrderQueryReq req){
         return notaryOrderService.previewNotarization(req);
     }
 
     @AnonymousPostMapping("/bankCustomer")
-    public BaseResponse bankCustomer(@RequestBody NotaryOrderQueryReq req){
+    public AppBaseResponse bankCustomer(@RequestBody NotaryOrderQueryReq req){
         return notaryOrderService.bankCustomer(req);
     }
 
     @AnonymousPostMapping("/uploadNotarization")
-    public BaseResponse uploadNotarization(@RequestBody FileVo file) {
+    public AppBaseResponse uploadNotarization(@RequestBody FileVo file) {
         return notaryOrderService.uploadNotarization(file);
     }
 
     @AnonymousPostMapping("/getDocList")
-    public BaseResponse getDocList(@RequestBody NotaryOrderQueryReq req){
+    public AppBaseResponse getDocList(@RequestBody NotaryOrderQueryReq req){
         return notaryOrderService.getDocList(req);
     }
 }

eladmin-system/src/main/java/me/zhengjie/controller/admin/OrderRoomIdController.java

@@ -14,9 +14,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.appapi.entity.OrderRoomIdEntity;
-import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.appapi.service.OrderRoomIdService;
+import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
+import me.zhengjie.base.AppBaseResponse;
+import me.zhengjie.service.bank.OrderRoomIdService;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.util.WebSocketMap;
@@ -36,8 +36,8 @@ public class OrderRoomIdController {
 	 * @return
 	 */
 	@RequestMapping("/getVideo")
-	public BaseResponse<?> getVideo(@RequestBody String json) {
-		BaseResponse<JSONObject> rep = new BaseResponse<>();
+	public AppBaseResponse<?> getVideo(@RequestBody String json) {
+		AppBaseResponse<JSONObject> rep = new AppBaseResponse<>();
 		JSONObject jsonObj = JSONObject.parseObject(json);
 		QueryWrapper<OrderRoomIdEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("orderId", jsonObj.getString("orderId"));
@@ -70,7 +70,7 @@ public class OrderRoomIdController {
 	 */
 //	@RequestMapping
 	@AnonymousPostMapping("/getRooId")
-	public BaseResponse<?> getRooId(@RequestBody String json) {
+	public AppBaseResponse<?> getRooId(@RequestBody String json) {
 		log.info("得到房间号：" + json);
 		JSONObject jsonObj = JSONObject.parseObject(json);
 		String socketId = jsonObj.getString("socketId");
@@ -78,16 +78,16 @@ public class OrderRoomIdController {
 		// try
 		String userName = SecurityUtils.getCurrentUsername();
 
-		BaseResponse<?> result = null;
+		AppBaseResponse<?> result = null;
 		if (data != null && data.size() > 0) {
 			for (JSONObject socketObj : data) {
 				if (socketObj.getString("accountId").equalsIgnoreCase(userName)) {
-					result = BaseResponse.succ(socketObj);
+					result = AppBaseResponse.succ(socketObj);
 					break;
 				}
 			}
 		} else {
-			result = BaseResponse.error(ResultCode.NOT_EXISTS);
+			result = AppBaseResponse.error(ResultCode.NOT_EXISTS);
 		}
 		log.info("返回结果的值：" + result);
 		return result;

eladmin-system/src/main/java/me/zhengjie/controller/admin/RoleController.java

@@ -20,7 +20,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.dao.entity.Role;
+import me.zhengjie.dao.mybatis.entity.Role;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.service.admin.RoleService;
 import me.zhengjie.service.admin.dto.RoleDto;

eladmin-system/src/main/java/me/zhengjie/controller/admin/SystemController.java

@@ -1,6 +1,6 @@
 package me.zhengjie.controller.admin;
 
-import me.zhengjie.appapi.entity.response.BaseResponse;
+import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.controller.admin.vo.OrgQueryRsp;
 import me.zhengjie.service.admin.SystemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +29,7 @@ public class SystemController {
      * @return
      */
     @PostMapping("/org/query")
-    public BaseResponse<List<OrgQueryRsp>> orgQuery() {
+    public AppBaseResponse<List<OrgQueryRsp>> orgQuery() {
         return systemService.orgQuery();
     }
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/TencentPushController.java

@@ -15,10 +15,10 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.appapi.entity.OrderRoomIdEntity;
-import me.zhengjie.appapi.entity.PushDataEntity;
-import me.zhengjie.appapi.service.OrderRoomIdService;
-import me.zhengjie.appapi.service.TencentPushService;
+import me.zhengjie.dao.mybatis.entity.OrderRoomIdEntity;
+import me.zhengjie.dao.mybatis.entity.PushDataEntity;
+import me.zhengjie.service.bank.OrderRoomIdService;
+import me.zhengjie.service.bank.TencentPushService;
 import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
 import me.zhengjie.base.util.DownloadUtils;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/UserController.java

@@ -21,12 +21,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.appapi.entity.response.BaseResponse;
+import me.zhengjie.base.AppBaseResponse;
 import me.zhengjie.config.RsaProperties;
-import me.zhengjie.dao.entity.Dept;
+import me.zhengjie.dao.mybatis.entity.Dept;
 import me.zhengjie.controller.admin.vo.UserReq;
 import me.zhengjie.service.admin.DataService;
-import me.zhengjie.dao.entity.User;
+import me.zhengjie.dao.mybatis.entity.User;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.controller.admin.vo.UserPassVo;
 import me.zhengjie.service.admin.DeptService;
@@ -109,7 +109,7 @@ public class UserController {
     @ApiOperation("新增用户")
     @PostMapping
     @PreAuthorize("@el.check('user:add')")
-    public BaseResponse createUser(@Validated @RequestBody User resources){
+    public AppBaseResponse createUser(@Validated @RequestBody User resources){
         checkLevel(resources);
         // 默认密码 123456
         resources.setPassword(passwordEncoder.encode("123456"));
@@ -211,9 +211,9 @@ public class UserController {
     @Log("验证授权验证信息")
     @ApiOperation("验证授权验证信息")
     @PostMapping(value = "/verifyAuthMessage")
-    public BaseResponse verifyAuthMessage(@RequestBody User user){
+    public AppBaseResponse verifyAuthMessage(@RequestBody User user){
         userService.verifyAuthMessage(user);
-        return BaseResponse.success();
+        return AppBaseResponse.success();
     }
 
     /**
@@ -235,7 +235,7 @@ public class UserController {
      */
 
     @PostMapping(value = "/uploadSeal")
-    public BaseResponse uploadSeal(@RequestBody User user){
+    public AppBaseResponse uploadSeal(@RequestBody User user){
         return userService.uploadSeal(user);
     }
 
@@ -244,7 +244,7 @@ public class UserController {
      * @return
      */
     @AnonymousPostMapping("/getAuthStatus")
-    public BaseResponse getAuthStatus(){
+    public AppBaseResponse getAuthStatus(){
         return userService.getAuthStatus();
     }
 }

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/BankCreateReq.java

@@ -3,7 +3,7 @@ package me.zhengjie.controller.admin.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import me.zhengjie.appapi.entity.request.BaseRequest;
+import me.zhengjie.base.BaseRequest;
 
 import java.time.LocalDateTime;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/BankQueryReq.java

@@ -2,7 +2,7 @@ package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import me.zhengjie.appapi.entity.request.BaseRequest;
+import me.zhengjie.base.BaseRequest;
 
 import java.time.LocalDateTime;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/CertificateReq.java

@@ -1,11 +1,8 @@
 package me.zhengjie.controller.admin.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import me.zhengjie.appapi.entity.request.BaseRequest;
-
-import java.time.LocalDateTime;
+import me.zhengjie.base.BaseRequest;
 
 /**
  *

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/ModelReq.java

@@ -2,7 +2,7 @@ package me.zhengjie.controller.admin.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import me.zhengjie.appapi.entity.request.BaseRequest;
+import me.zhengjie.base.BaseRequest;
 
 import java.util.Date;
 import java.util.List;

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/NotarizationNoReq.java

@@ -2,7 +2,7 @@ package me.zhengjie.controller.admin.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import me.zhengjie.appapi.entity.request.BaseRequest;
+import me.zhengjie.base.BaseRequest;
 
 import java.util.Date;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/NotaryNoteReq.java

@@ -2,10 +2,7 @@ package me.zhengjie.controller.admin.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import me.zhengjie.appapi.entity.request.BaseRequest;
-
-import java.time.LocalDateTime;
-import java.util.Date;
+import me.zhengjie.base.BaseRequest;
 
 @Data
 @EqualsAndHashCode(callSuper = false)

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/NotaryOfficeCreateReq.java

@@ -3,7 +3,7 @@ package me.zhengjie.controller.admin.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import me.zhengjie.appapi.entity.request.BaseRequest;
+import me.zhengjie.base.BaseRequest;
 
 import java.time.LocalDateTime;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/NotaryOfficeQueryReq.java

@@ -2,7 +2,7 @@ package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import me.zhengjie.appapi.entity.request.BaseRequest;
+import me.zhengjie.base.BaseRequest;
 
 import java.time.LocalDateTime;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/NotaryOrderInfoQueryRsp.java

@@ -4,9 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import me.zhengjie.dao.entity.BorrowerEntity;
-import me.zhengjie.dao.entity.GuaranteeEntity;
-import me.zhengjie.dao.entity.MortgageEntity;
+import me.zhengjie.dao.mybatis.entity.BorrowerEntity;
+import me.zhengjie.dao.mybatis.entity.GuaranteeEntity;
+import me.zhengjie.dao.mybatis.entity.MortgageEntity;
 
 import java.util.List;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/NotaryOrderQueryReq.java

@@ -2,7 +2,7 @@ package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import me.zhengjie.appapi.entity.request.BaseRequest;
+import me.zhengjie.base.BaseRequest;
 
 import java.time.LocalDateTime;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/OfficeXbankReq.java

@@ -2,7 +2,7 @@ package me.zhengjie.controller.admin.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import me.zhengjie.appapi.entity.request.BaseRequest;
+import me.zhengjie.base.BaseRequest;
 
 import java.util.List;
 

eladmin-system/src/main/java/me/zhengjie/controller/admin/vo/UserReq.java

@@ -1,12 +1,9 @@
 package me.zhengjie.controller.admin.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import me.zhengjie.annotation.Query;
-import me.zhengjie.appapi.entity.request.BaseRequest;
+import me.zhengjie.base.BaseRequest;
 
 import java.sql.Timestamp;
-import java.time.LocalDateTime;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

eladmin-system/src/main/java/me/zhengjie/controller/bank/AppBankController.java

@@ -5,25 +5,25 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.appapi.config.TencentHumanFaceVerify;
-import me.zhengjie.appapi.dto.FileInfoDto;
-import me.zhengjie.appapi.dto.OrderDetailDto;
-import me.zhengjie.appapi.dto.OrderDto;
-import me.zhengjie.appapi.entity.OrderEntity;
-import me.zhengjie.appapi.entity.SysUserEntity;
-import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.appapi.service.*;
-import me.zhengjie.appapi.tencent.h5face.SdkTest;
+import me.zhengjie.base.config.TencentHumanFaceVerify;
+import me.zhengjie.controller.bank.vo.FileInfoDto;
+import me.zhengjie.controller.bank.vo.OrderDetailDto;
+import me.zhengjie.controller.bank.vo.OrderDto;
+import me.zhengjie.controller.bank.vo.*;
+import me.zhengjie.dao.mybatis.entity.OrderEntity;
+import me.zhengjie.dao.mybatis.entity.SysUserEntity;
+import me.zhengjie.base.AppBaseResponse;
+import me.zhengjie.base.util.tencent.h5face.SdkTest;
 import me.zhengjie.base.util.DateUtils;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
-import me.zhengjie.appapi.vo.*;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.BaseController;
-import me.zhengjie.dao.OrderFileRepository;
-import me.zhengjie.dao.entity.OrderFileEntity;
+import me.zhengjie.dao.mybatis.OrderFileRepository;
+import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
 import me.zhengjie.modules.security.security.TokenProvider;
+import me.zhengjie.service.bank.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
@@ -90,7 +90,7 @@ public class AppBankController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping("/saveBorrower")
-	public BaseResponse saveBorrower(@Valid @RequestBody BorrowerVo vo) {
+	public AppBaseResponse saveBorrower(@Valid @RequestBody BorrowerVo vo) {
 		log.info("借款人保存请求的参数：" + vo);
 		String auth = getAuthorization();
 		String sysUser = (String) tokenProvider.getAppToken(auth);
@@ -150,7 +150,7 @@ public class AppBankController extends BaseController {
 		}
 		Map<String, String> map = new HashMap<String, String>();
 		map.put("id", id);
-		BaseResponse response = mortgageService.mortgageInfo(map);
+		AppBaseResponse response = mortgageService.mortgageInfo(map);
 		OrderDetailDto detailDto = (OrderDetailDto) response.getData().getResult();
 		return ResponseDTO.success(detailDto);
 	}
@@ -169,7 +169,7 @@ public class AppBankController extends BaseController {
 		}
 		Map<String, String> map = new HashMap<String, String>();
 		map.put("id", id);
-		BaseResponse response = guaranteeService.guaranteeInfo(map);
+		AppBaseResponse response = guaranteeService.guaranteeInfo(map);
 		OrderDetailDto detailDto = (OrderDetailDto) response.getData().getResult();
 		return ResponseDTO.success(detailDto);
 	}
@@ -181,7 +181,7 @@ public class AppBankController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping("/submit")
-	public BaseResponse submit(@RequestBody String json) {
+	public AppBaseResponse submit(@RequestBody String json) {
 		JSONObject jsonObj = JSONObject.parseObject(json);
 		String businessNo = jsonObj.getString("businessNo");
 		return orderService.submitOrder(businessNo, getCurrentUser());
@@ -239,7 +239,7 @@ public class AppBankController extends BaseController {
 		}
 		Map<String, String> map = new HashMap<String, String>();
 		map.put("id", id);
-		BaseResponse response = borrowerService.borrowerInfo(map);
+		AppBaseResponse response = borrowerService.borrowerInfo(map);
 		OrderDetailDto detailDto = (OrderDetailDto) response.getData().getResult();
 		return ResponseDTO.success(detailDto);
 	}

eladmin-system/src/main/java/me/zhengjie/appapi/entity/Account.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.entity;
+package me.zhengjie.controller.bank.vo;
 import java.util.Date;
 
 public class Account {