代码结构调整

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

@@ -5,7 +5,7 @@ import me.zhengjie.appapi.dto.OrderDto;
 import me.zhengjie.appapi.entity.*;
 import me.zhengjie.appapi.entity.response.BaseResponse;
 import me.zhengjie.base.ResponseDTO;
-import me.zhengjie.modules.system.entity.NotaryOrderEntity;
+import me.zhengjie.dao.entity.NotaryOrderEntity;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;

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

@@ -19,10 +19,10 @@ import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.dao.OrderFileRepository;
 import me.zhengjie.dao.entity.OrderFileEntity;
-import me.zhengjie.modules.mq.RedisCacheConfig;
+import me.zhengjie.base.mq.RedisCacheConfig;
 import me.zhengjie.modules.security.security.TokenProvider;
-import me.zhengjie.modules.system.entity.NotaryOrderEntity;
-import me.zhengjie.modules.system.repository.NotaryOrderMapper;
+import me.zhengjie.dao.entity.NotaryOrderEntity;
+import me.zhengjie.dao.mapper.NotaryOrderMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

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

@@ -19,7 +19,7 @@ import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.appapi.vo.BorrowerVo;
 import me.zhengjie.dao.OrderFileRepository;
 import me.zhengjie.dao.entity.OrderFileEntity;
-import me.zhengjie.modules.system.entity.NotaryOrderEntity;
+import me.zhengjie.dao.entity.NotaryOrderEntity;
 import me.zhengjie.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -14,13 +14,11 @@ import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.appapi.vo.NotaryNoteVo;
 import me.zhengjie.dao.ModelRepository;
-import me.zhengjie.dao.entity.OrderFileEntity;
-import me.zhengjie.dao.mapper.OrderFileMapper;
+import me.zhengjie.dao.entity.*;
+import me.zhengjie.dao.mapper.*;
 import me.zhengjie.domain.order.OrderBizCodeMessage;
 import me.zhengjie.modules.security.service.dto.JwtUserDto;
-import me.zhengjie.modules.system.entity.*;
-import me.zhengjie.modules.system.repository.*;
-import me.zhengjie.modules.system.service.dto.UserDto;
+import me.zhengjie.service.admin.dto.UserDto;
 import me.zhengjie.base.util.TextTempletUtil;
 import me.zhengjie.utils.SecurityUtils;
 import org.apache.commons.io.IOUtils;
@@ -47,11 +45,11 @@ public class NotaryNoteServiceImpl extends ServiceImpl<INotaryNoteDao, NotaryNot
 	@Autowired
 	NotaryOrderMapper notaryOrderMapper;
 	@Autowired
-	BorrowerMapper borrowerMapper;
+    BorrowerMapper borrowerMapper;
 	@Autowired
 	MortgageMapper mortgageMapper;
 	@Autowired
-	GuaranteeMapper guaranteeMapper;
+    GuaranteeMapper guaranteeMapper;
 	@Autowired
 	NotaryOfficeMapper notaryOfficeMapper;
 	@Autowired
@@ -228,26 +226,26 @@ public class NotaryNoteServiceImpl extends ServiceImpl<INotaryNoteDao, NotaryNot
 	 */
 	private void saveNotaryUserId(String businessNo){
 		Integer currentUserId = SecurityUtils.getCurrentUserId().intValue();
-		QueryWrapper<me.zhengjie.modules.system.entity.BorrowerEntity> borrowerQw = new QueryWrapper<>();
+		QueryWrapper<BorrowerEntity> borrowerQw = new QueryWrapper<>();
 		borrowerQw.eq("business_no",businessNo);
-		me.zhengjie.modules.system.entity.BorrowerEntity borrowerEntity = borrowerMapper.selectOne(borrowerQw);
-		me.zhengjie.modules.system.entity.BorrowerEntity saveBorrower = new me.zhengjie.modules.system.entity.BorrowerEntity();
+		BorrowerEntity borrowerEntity = borrowerMapper.selectOne(borrowerQw);
+		BorrowerEntity saveBorrower = new BorrowerEntity();
 		saveBorrower.setId(borrowerEntity.getId());
 		saveBorrower.setUpdateTime(LocalDateTime.now());
 		saveBorrower.setNotaryUserId(currentUserId);
 		borrowerMapper.updateById(saveBorrower);
-		QueryWrapper<me.zhengjie.modules.system.entity.GuaranteeEntity> guaranteeQw = new QueryWrapper<>();
+		QueryWrapper<GuaranteeEntity> guaranteeQw = new QueryWrapper<>();
 		guaranteeQw.eq("business_no", businessNo);
-		me.zhengjie.modules.system.entity.GuaranteeEntity guaranteeEntity = guaranteeMapper.selectOne(guaranteeQw);
-		me.zhengjie.modules.system.entity.GuaranteeEntity saveGuarantee = new me.zhengjie.modules.system.entity.GuaranteeEntity();
+		GuaranteeEntity guaranteeEntity = guaranteeMapper.selectOne(guaranteeQw);
+		GuaranteeEntity saveGuarantee = new GuaranteeEntity();
 		saveGuarantee.setId(guaranteeEntity.getId());
 		saveGuarantee.setUpdateTime(LocalDateTime.now());
 		saveGuarantee.setNotaryUserId(currentUserId);
 		guaranteeMapper.updateById(saveGuarantee);
-		QueryWrapper<me.zhengjie.modules.system.entity.MortgageEntity> mortgageQw = new QueryWrapper<>();
+		QueryWrapper<MortgageEntity> mortgageQw = new QueryWrapper<>();
 		mortgageQw.eq("business_no", businessNo);
-		me.zhengjie.modules.system.entity.MortgageEntity mortgageEntity = mortgageMapper.selectOne(mortgageQw);
-		me.zhengjie.modules.system.entity.MortgageEntity saveMortgage = new me.zhengjie.modules.system.entity.MortgageEntity();
+		MortgageEntity mortgageEntity = mortgageMapper.selectOne(mortgageQw);
+		MortgageEntity saveMortgage = new MortgageEntity();
 		saveMortgage.setId(mortgageEntity.getId());
 		saveMortgage.setUpdateTime(LocalDateTime.now());
 		saveMortgage.setNotaryUserId(currentUserId);

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

@@ -24,18 +24,18 @@ import me.zhengjie.dao.ModelRepository;
 import me.zhengjie.dao.OrderRepository;
 import me.zhengjie.domain.order.OrderConstant;
 import me.zhengjie.domain.order.parser.OrderOCRParser;
-import me.zhengjie.modules.mq.RedisCacheConfig;
+import me.zhengjie.base.mq.RedisCacheConfig;
 import me.zhengjie.domain.order.parser.OrderOCRParserFactory;
-import me.zhengjie.modules.system.entity.BankEntity;
-import me.zhengjie.modules.system.entity.NotaryOfficeEntity;
-import me.zhengjie.modules.system.entity.NotaryOrderEntity;
-import me.zhengjie.modules.system.entity.OfficeXbankEntity;
-import me.zhengjie.modules.system.repository.BankMapper;
-import me.zhengjie.modules.system.repository.NotaryOfficeMapper;
-import me.zhengjie.modules.system.repository.NotaryOrderMapper;
-import me.zhengjie.modules.system.repository.OfficeXbankMapper;
-import me.zhengjie.modules.system.service.BankService;
-import me.zhengjie.modules.system.service.NotaryOrderService;
+import me.zhengjie.dao.entity.BankEntity;
+import me.zhengjie.dao.entity.NotaryOfficeEntity;
+import me.zhengjie.dao.entity.NotaryOrderEntity;
+import me.zhengjie.dao.entity.OfficeXbankEntity;
+import me.zhengjie.dao.mapper.BankMapper;
+import me.zhengjie.dao.mapper.NotaryOfficeMapper;
+import me.zhengjie.dao.mapper.NotaryOrderMapper;
+import me.zhengjie.dao.mapper.OfficeXbankMapper;
+import me.zhengjie.service.admin.BankService;
+import me.zhengjie.service.admin.NotaryOrderService;
 import me.zhengjie.base.util.TencentServiceUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;

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

@@ -1,7 +1,6 @@
-package me.zhengjie.modules.system.entity.response;
+package me.zhengjie.base;
 
 import lombok.Data;
-import me.zhengjie.base.ResultCode;
 
 import java.io.Serializable;
 

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.response;
+package me.zhengjie.base;
 
 
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/executor/config/XxlJobConfig.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.executor.config;
+package me.zhengjie.base.config;
 
 import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import org.slf4j.Logger;

eladmin-system/src/main/java/me/zhengjie/modules/file/AbstractFileHandle.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.file;
+package me.zhengjie.base.file;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeansException;

eladmin-system/src/main/java/me/zhengjie/modules/file/FileHandle.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.file;
+package me.zhengjie.base.file;
 
 import java.io.InputStream;
 

eladmin-system/src/main/java/me/zhengjie/modules/file/FileHandleVo.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.file;
+package me.zhengjie.base.file;
 
 import java.io.InputStream;
 

eladmin-system/src/main/java/me/zhengjie/modules/file/LocalFileHandle.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.file;
+package me.zhengjie.base.file;
 
 import java.io.InputStream;
 

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.file;
+package me.zhengjie.base.file;
 
 import java.io.FileInputStream;
 import java.io.InputStream;

eladmin-system/src/main/java/me/zhengjie/modules/mq/ClientCache.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.mq;
+package me.zhengjie.base.mq;
 
 import com.corundumstudio.socketio.SocketIOClient;
 import org.springframework.stereotype.Component;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.mq;
+package me.zhengjie.base.mq;
 
 import com.corundumstudio.socketio.Configuration;
 import com.corundumstudio.socketio.SocketConfig;

eladmin-system/src/main/java/me/zhengjie/modules/mq/RedisCacheConfig.java

@@ -1,5 +1,7 @@
-package me.zhengjie.modules.mq;
+package me.zhengjie.base.mq;
 
+import me.zhengjie.job.mq.RedisReceiver;
+import me.zhengjie.job.mq.WebSocketReceiver;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -23,8 +23,8 @@ 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.modules.file.FileHandle;
-import me.zhengjie.modules.file.FileHandleVo;
+import me.zhengjie.base.file.FileHandle;
+import me.zhengjie.base.file.FileHandleVo;
 
 /**
  * 将图片转换为Base64<br>

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

@@ -10,10 +10,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.modules.system.entity.request.bank.BankCreateReq;
-import me.zhengjie.modules.system.entity.request.bank.BankQueryReq;
-import me.zhengjie.modules.system.entity.response.bank.BankQueryRsp;
-import me.zhengjie.modules.system.service.BankService;
+import me.zhengjie.controller.admin.vo.BankCreateReq;
+import me.zhengjie.controller.admin.vo.BankQueryReq;
+import me.zhengjie.controller.admin.vo.BankQueryRsp;
+import me.zhengjie.service.admin.BankService;
 
 /**
  * <p>

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

@@ -1,10 +1,9 @@
 package me.zhengjie.controller.admin;
 
-import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.modules.system.entity.request.notaryoffice.OfficeXbankReq;
-import me.zhengjie.modules.system.entity.response.bank.BankQueryRsp;
-import me.zhengjie.modules.system.service.OfficeXbankService;
+import me.zhengjie.controller.admin.vo.OfficeXbankReq;
+import me.zhengjie.controller.admin.vo.BankQueryRsp;
+import me.zhengjie.service.admin.OfficeXbankService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -5,8 +5,8 @@ import me.zhengjie.annotation.AnonymousAccess;
 import me.zhengjie.modules.mnt.websocket.MsgType;
 import me.zhengjie.modules.mnt.websocket.SocketMsg;
 import me.zhengjie.modules.mnt.websocket.WebSocketServer;
-import me.zhengjie.modules.system.entity.response.BaseResponse;
-import me.zhengjie.modules.system.entity.response.ResultData;
+import me.zhengjie.base.BaseResponse;
+import me.zhengjie.base.ResultData;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -21,10 +21,10 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.system.domain.Dept;
-import me.zhengjie.modules.system.service.DeptService;
-import me.zhengjie.modules.system.service.dto.DeptDto;
-import me.zhengjie.modules.system.service.dto.DeptQueryCriteria;
+import me.zhengjie.dao.entity.Dept;
+import me.zhengjie.service.admin.DeptService;
+import me.zhengjie.service.admin.dto.DeptDto;
+import me.zhengjie.service.admin.dto.DeptQueryCriteria;
 import me.zhengjie.utils.PageUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

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

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

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

@@ -20,10 +20,10 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.system.domain.DictDetail;
-import me.zhengjie.modules.system.service.DictDetailService;
-import me.zhengjie.modules.system.service.dto.DictDetailDto;
-import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria;
+import me.zhengjie.dao.entity.DictDetail;
+import me.zhengjie.service.admin.DictDetailService;
+import me.zhengjie.service.admin.dto.DictDetailDto;
+import me.zhengjie.service.admin.dto.DictDetailQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.web.PageableDefault;

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

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

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

@@ -21,12 +21,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.modules.system.domain.Menu;
+import me.zhengjie.dao.entity.Menu;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.system.service.MenuService;
-import me.zhengjie.modules.system.service.dto.MenuDto;
-import me.zhengjie.modules.system.service.dto.MenuQueryCriteria;
-import me.zhengjie.modules.system.service.mapstruct.MenuMapper;
+import me.zhengjie.service.admin.MenuService;
+import me.zhengjie.service.admin.dto.MenuDto;
+import me.zhengjie.service.admin.dto.MenuQueryCriteria;
+import me.zhengjie.service.admin.mapstruct.MenuMapper;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.SecurityUtils;
 import org.springframework.http.HttpStatus;

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

@@ -3,9 +3,9 @@ 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.modules.mq.RedisCacheConfig;
-import me.zhengjie.modules.system.entity.request.notaryoffice.ModelReq;
-import me.zhengjie.modules.system.service.ModelNotarizationService;
+import me.zhengjie.base.mq.RedisCacheConfig;
+import me.zhengjie.controller.admin.vo.ModelReq;
+import me.zhengjie.service.admin.ModelNotarizationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.validation.annotation.Validated;

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

@@ -18,7 +18,7 @@ package me.zhengjie.controller.admin;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.system.service.MonitorService;
+import me.zhengjie.service.admin.MonitorService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;

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

@@ -1,9 +1,8 @@
 package me.zhengjie.controller.admin;
 
-import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.modules.system.entity.request.notaryoffice.NotarizationNoReq;
-import me.zhengjie.modules.system.service.NotarizationNoService;
+import me.zhengjie.controller.admin.vo.NotarizationNoReq;
+import me.zhengjie.service.admin.NotarizationNoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -1,13 +1,12 @@
 package me.zhengjie.controller.admin;
 
 
-import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.modules.system.entity.request.notaryoffice.NotaryOfficeCreateReq;
-import me.zhengjie.modules.system.entity.request.notaryoffice.NotaryOfficeQueryReq;
-import me.zhengjie.modules.system.entity.response.notaryoffice.NotaryOfficeQueryRsp;
-import me.zhengjie.modules.system.service.NotaryOfficeService;
+import me.zhengjie.controller.admin.vo.NotaryOfficeCreateReq;
+import me.zhengjie.controller.admin.vo.NotaryOfficeQueryReq;
+import me.zhengjie.controller.admin.vo.NotaryOfficeQueryRsp;
+import me.zhengjie.service.admin.NotaryOfficeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

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

@@ -13,10 +13,10 @@ import me.zhengjie.appapi.service.MortgageService;
 import me.zhengjie.base.util.TencentUtil;
 import me.zhengjie.appapi.vo.FileVo;
 import me.zhengjie.base.ResultCode;
-import me.zhengjie.modules.system.entity.PartyEntity;
-import me.zhengjie.modules.system.entity.request.order.NotaryOrderQueryReq;
-import me.zhengjie.modules.system.entity.response.order.NotaryOrderQueryRsp;
-import me.zhengjie.modules.system.service.NotaryOrderService;
+import me.zhengjie.controller.admin.vo.PartyEntity;
+import me.zhengjie.controller.admin.vo.NotaryOrderQueryReq;
+import me.zhengjie.controller.admin.vo.NotaryOrderQueryRsp;
+import me.zhengjie.service.admin.NotaryOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -163,8 +163,8 @@ public class NotaryOrderController {
      */
     @ResponseBody
     @RequestMapping("/auth")
-    public me.zhengjie.modules.system.entity.response.BaseResponse auth(@RequestParam MultipartFile file, @RequestParam String idCard, @RequestParam String name){
-        me.zhengjie.modules.system.entity.response.BaseResponse response = new me.zhengjie.modules.system.entity.response.BaseResponse();
+    public me.zhengjie.base.BaseResponse auth(@RequestParam MultipartFile file, @RequestParam String idCard, @RequestParam String name){
+        me.zhengjie.base.BaseResponse response = new me.zhengjie.base.BaseResponse();
         byte[] fileByte = null;
         try {
             fileByte = file.getBytes();

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

@@ -20,12 +20,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
-import me.zhengjie.modules.system.domain.Role;
+import me.zhengjie.dao.entity.Role;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.system.service.RoleService;
-import me.zhengjie.modules.system.service.dto.RoleDto;
-import me.zhengjie.modules.system.service.dto.RoleQueryCriteria;
-import me.zhengjie.modules.system.service.dto.RoleSmallDto;
+import me.zhengjie.service.admin.RoleService;
+import me.zhengjie.service.admin.dto.RoleDto;
+import me.zhengjie.service.admin.dto.RoleQueryCriteria;
+import me.zhengjie.service.admin.dto.RoleSmallDto;
 import me.zhengjie.utils.SecurityUtils;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

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

@@ -1,14 +1,10 @@
 package me.zhengjie.controller.admin;
 
-import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.modules.system.entity.request.bank.BankQueryReq;
-import me.zhengjie.modules.system.entity.response.bank.BankQueryRsp;
-import me.zhengjie.modules.system.entity.response.system.OrgQueryRsp;
-import me.zhengjie.modules.system.service.SystemService;
+import me.zhengjie.controller.admin.vo.OrgQueryRsp;
+import me.zhengjie.service.admin.SystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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

@@ -21,27 +21,23 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.annotation.Log;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.appapi.entity.request.Page;
 import me.zhengjie.appapi.entity.response.BaseResponse;
-import me.zhengjie.appapi.entity.response.ResultData;
 import me.zhengjie.config.RsaProperties;
-import me.zhengjie.modules.system.domain.Dept;
-import me.zhengjie.modules.system.entity.request.notaryoffice.NotaryOfficeCreateReq;
-import me.zhengjie.modules.system.entity.request.user.UserReq;
-import me.zhengjie.modules.system.service.DataService;
-import me.zhengjie.modules.system.domain.User;
+import me.zhengjie.dao.entity.Dept;
+import me.zhengjie.controller.admin.vo.UserReq;
+import me.zhengjie.service.admin.DataService;
+import me.zhengjie.dao.entity.User;
 import me.zhengjie.exception.BadRequestException;
-import me.zhengjie.modules.system.domain.vo.UserPassVo;
-import me.zhengjie.modules.system.service.DeptService;
-import me.zhengjie.modules.system.service.RoleService;
-import me.zhengjie.modules.system.service.dto.RoleSmallDto;
-import me.zhengjie.modules.system.service.dto.UserDto;
-import me.zhengjie.modules.system.service.dto.UserQueryCriteria;
-import me.zhengjie.modules.system.service.VerifyService;
+import me.zhengjie.controller.admin.vo.UserPassVo;
+import me.zhengjie.service.admin.DeptService;
+import me.zhengjie.service.admin.RoleService;
+import me.zhengjie.service.admin.dto.RoleSmallDto;
+import me.zhengjie.service.admin.dto.UserDto;
+import me.zhengjie.service.admin.dto.UserQueryCriteria;
+import me.zhengjie.service.admin.VerifyService;
 import me.zhengjie.utils.*;
-import me.zhengjie.modules.system.service.UserService;
+import me.zhengjie.service.admin.UserService;
 import me.zhengjie.utils.enums.CodeEnum;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;

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

@@ -20,7 +20,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.domain.vo.EmailVo;
 import me.zhengjie.service.EmailService;
-import me.zhengjie.modules.system.service.VerifyService;
+import me.zhengjie.service.admin.VerifyService;
 import me.zhengjie.utils.enums.CodeBiEnum;
 import me.zhengjie.utils.enums.CodeEnum;
 import org.springframework.http.HttpStatus;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/bank/BankCreateReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.bank;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/bank/BankQueryReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.bank;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/response/bank/BankQueryRsp.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.response.bank;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/notaryoffice/CertificateReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.notaryoffice;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuMetaVo.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain.vo;
+package me.zhengjie.controller.admin.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain.vo;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/notaryoffice/ModelReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.notaryoffice;
+package me.zhengjie.controller.admin.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/notaryoffice/NotarizationNoReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.notaryoffice;
+package me.zhengjie.controller.admin.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/notaryoffice/NotaryNoteReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.notaryoffice;
+package me.zhengjie.controller.admin.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/notaryoffice/NotaryOfficeCreateReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.notaryoffice;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/notaryoffice/NotaryOfficeQueryReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.notaryoffice;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/response/notaryoffice/NotaryOfficeQueryRsp.java

@@ -1,14 +1,12 @@
-package me.zhengjie.modules.system.entity.response.notaryoffice;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import me.zhengjie.modules.system.entity.PartyEntity;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * @author SONG

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/response/order/NotaryOrderInfoQueryRsp.java

@@ -1,15 +1,13 @@
-package me.zhengjie.modules.system.entity.response.order;
+package me.zhengjie.controller.admin.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import me.zhengjie.modules.system.entity.BorrowerEntity;
-import me.zhengjie.modules.system.entity.GuaranteeEntity;
-import me.zhengjie.modules.system.entity.MortgageEntity;
+import me.zhengjie.dao.entity.BorrowerEntity;
+import me.zhengjie.dao.entity.GuaranteeEntity;
+import me.zhengjie.dao.entity.MortgageEntity;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/order/NotaryOrderQueryReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.order;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/response/order/NotaryOrderQueryRsp.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.response.order;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/notaryoffice/OfficeXbankReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.notaryoffice;
+package me.zhengjie.controller.admin.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/response/system/OrgQueryRsp.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.response.system;
+package me.zhengjie.controller.admin.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/PartyEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.controller.admin.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/UserPassVo.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain.vo;
+package me.zhengjie.controller.admin.vo;
 
 import lombok.Data;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/request/user/UserReq.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity.request.user;
+package me.zhengjie.controller.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

eladmin-system/src/main/java/me/zhengjie/controller/user/app/AppUserController.java

@@ -13,7 +13,7 @@ import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.dao.OrderFileRepository;
 import me.zhengjie.dao.entity.OrderFileEntity;
-import me.zhengjie.modules.mq.RedisCacheConfig;
+import me.zhengjie.base.mq.RedisCacheConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

eladmin-system/src/main/java/me/zhengjie/controller/user/mini/MiniUserController.java

@@ -12,7 +12,7 @@ import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.dao.OrderFileRepository;
 import me.zhengjie.dao.entity.OrderFileEntity;
-import me.zhengjie.modules.mq.RedisCacheConfig;
+import me.zhengjie.base.mq.RedisCacheConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;

eladmin-system/src/main/java/me/zhengjie/dao/ModelRepository.java

@@ -2,8 +2,8 @@ package me.zhengjie.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.system.entity.ModelEntity;
-import me.zhengjie.modules.system.repository.ModelMapper;
+import me.zhengjie.dao.entity.ModelEntity;
+import me.zhengjie.dao.mapper.ModelMapper;
 import org.springframework.stereotype.Component;
 
 @RequiredArgsConstructor

eladmin-system/src/main/java/me/zhengjie/dao/OrderRepository.java

@@ -2,8 +2,8 @@ package me.zhengjie.dao;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.system.entity.NotaryOrderEntity;
-import me.zhengjie.modules.system.repository.NotaryOrderMapper;
+import me.zhengjie.dao.entity.NotaryOrderEntity;
+import me.zhengjie.dao.mapper.NotaryOrderMapper;
 import org.springframework.stereotype.Component;
 
 @RequiredArgsConstructor

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/BankEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/BorrowerEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain;
+package me.zhengjie.dao.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Dict.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain;
+package me.zhengjie.dao.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/DictDetail.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain;
+package me.zhengjie.dao.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/GuaranteeEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.AllArgsConstructor;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Job.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain;
+package me.zhengjie.dao.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Menu.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain;
+package me.zhengjie.dao.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/ModelEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/MortgageEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/NotarizationNoEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/NotaryOfficeEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/NotaryOrderEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;

eladmin-system/src/main/java/me/zhengjie/modules/system/entity/OfficeXbankEntity.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.entity;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/Role.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain;
+package me.zhengjie.dao.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;

eladmin-system/src/main/java/me/zhengjie/modules/system/domain/User.java

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.domain;
+package me.zhengjie.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/BankMapper.java

@@ -1,6 +1,6 @@
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
-import me.zhengjie.modules.system.entity.BankEntity;
+import me.zhengjie.dao.entity.BankEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/BorrowerMapper.java

@@ -1,8 +1,7 @@
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import me.zhengjie.modules.system.entity.BorrowerEntity;
-import me.zhengjie.modules.system.entity.NotaryOrderEntity;
+import me.zhengjie.dao.entity.BorrowerEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DeptRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
-import me.zhengjie.modules.system.domain.Dept;
+import me.zhengjie.dao.entity.Dept;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictDetailRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
-import me.zhengjie.modules.system.domain.DictDetail;
+import me.zhengjie.dao.entity.DictDetail;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/DictRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
-import me.zhengjie.modules.system.domain.Dict;
+import me.zhengjie.dao.entity.Dict;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/GuaranteeMapper.java

@@ -1,8 +1,7 @@
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import me.zhengjie.modules.system.entity.BorrowerEntity;
-import me.zhengjie.modules.system.entity.GuaranteeEntity;
+import me.zhengjie.dao.entity.GuaranteeEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/JobRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
-import me.zhengjie.modules.system.domain.Job;
+import me.zhengjie.dao.entity.Job;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MenuRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
-import me.zhengjie.modules.system.domain.Menu;
+import me.zhengjie.dao.entity.Menu;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/ModelMapper.java

@@ -1,7 +1,7 @@
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import me.zhengjie.modules.system.entity.ModelEntity;
+import me.zhengjie.dao.entity.ModelEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/MortgageMapper.java

@@ -1,8 +1,7 @@
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import me.zhengjie.modules.system.entity.BorrowerEntity;
-import me.zhengjie.modules.system.entity.MortgageEntity;
+import me.zhengjie.dao.entity.MortgageEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/NotarizationNoMapper.java

@@ -1,7 +1,7 @@
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import me.zhengjie.modules.system.entity.NotarizationNoEntity;
+import me.zhengjie.dao.entity.NotarizationNoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/NotaryOfficeMapper.java

@@ -1,7 +1,7 @@
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import me.zhengjie.modules.system.entity.NotaryOfficeEntity;
+import me.zhengjie.dao.entity.NotaryOfficeEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/NotaryOrderMapper.java

@@ -1,7 +1,7 @@
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import me.zhengjie.modules.system.entity.NotaryOrderEntity;
+import me.zhengjie.dao.entity.NotaryOrderEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/OfficeXbankMapper.java

@@ -1,7 +1,7 @@
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import me.zhengjie.modules.system.entity.OfficeXbankEntity;
+import me.zhengjie.dao.entity.OfficeXbankEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/RoleRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
-import me.zhengjie.modules.system.domain.Role;
+import me.zhengjie.dao.entity.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java

@@ -13,9 +13,9 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.repository;
+package me.zhengjie.dao.mapper;
 
-import me.zhengjie.modules.system.domain.User;
+import me.zhengjie.dao.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

eladmin-system/src/main/java/me/zhengjie/modules/system/constants/NotaryOfficeConstant.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.constants;
+package me.zhengjie.domain.office;
 
 public class NotaryOfficeConstant {
     // 公证书自动生成

eladmin-system/src/main/java/me/zhengjie/domain/order/parser/impl/YZBankOrderOCRParserImpl.java

@@ -89,7 +89,7 @@ public class YZBankOrderOCRParserImpl implements OrderOCRParser {
                     SimpleDateFormat dayDestFormatter = new SimpleDateFormat("yyyy/MM/dd");
                     String idCard = json.getString("Value");
                     String birth = dayDestFormatter.format(daySrcFormatter.parse(idCard.substring(6, 14)));
-                    map.put("sex", String.valueOf(Integer.parseInt(idCard.substring(16, 17)) / 2));
+                    map.put("sex", String.valueOf(Integer.parseInt(idCard.substring(16, 17)) % 2));
                     map.put("birth", birth);
                     map.put("idCard", idCard);
                 } else if ("住所(地址)".equals(key) && currentIndex > borrowerStartIndex) {
@@ -142,7 +142,7 @@ public class YZBankOrderOCRParserImpl implements OrderOCRParser {
                     SimpleDateFormat dayDestFormatter = new SimpleDateFormat("yyyy/MM/dd");
                     String idCard = json.getString("Value");
                     String birth = dayDestFormatter.format(daySrcFormatter.parse(idCard.substring(6, 14)));
-                    map.put("sex", String.valueOf(Integer.parseInt(idCard.substring(16, 17)) / 2));
+                    map.put("sex", String.valueOf(Integer.parseInt(idCard.substring(16, 17)) % 2));
                     map.put("birth", birth);
                     map.put("idCard", idCard);
                 } else if ("住所(地址)".equals(key) && currentIndex > guaranteeStartIndex) {

eladmin-system/src/main/java/me/zhengjie/modules/system/constants/UserConstant.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.constants;
+package me.zhengjie.domain.user;
 
 public class UserConstant {
     public static final String USER_TYPE_NOTARY = "notary";

eladmin-system/src/main/java/me/zhengjie/domain/user/impl/UserDomainImpl.java

@@ -5,7 +5,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import me.zhengjie.domain.user.UserDomain;
 import me.zhengjie.modules.security.service.dto.JwtUserDto;
-import me.zhengjie.modules.system.service.dto.RoleSmallDto;
+import me.zhengjie.service.admin.dto.RoleSmallDto;
 import me.zhengjie.utils.SecurityUtils;
 import org.springframework.stereotype.Component;
 

eladmin-system/src/main/java/me/zhengjie/modules/mq/RedisReceiver.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.mq;
+package me.zhengjie.job.mq;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,10 +12,10 @@ import me.zhengjie.base.util.DateUtils;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.StatusEnum.SexStatusEnum;
 import me.zhengjie.appapi.vo.OrderVo;
-import me.zhengjie.modules.system.entity.NotaryOfficeEntity;
-import me.zhengjie.modules.system.entity.NotaryOrderEntity;
-import me.zhengjie.modules.system.repository.NotaryOfficeMapper;
-import me.zhengjie.modules.system.repository.NotaryOrderMapper;
+import me.zhengjie.dao.entity.NotaryOfficeEntity;
+import me.zhengjie.dao.entity.NotaryOrderEntity;
+import me.zhengjie.dao.mapper.NotaryOfficeMapper;
+import me.zhengjie.dao.mapper.NotaryOrderMapper;
 import me.zhengjie.dao.entity.OrderFileEntity;
 import me.zhengjie.dao.mapper.OrderFileMapper;
 import me.zhengjie.base.util.TextTempletUtil;

eladmin-system/src/main/java/me/zhengjie/modules/mq/WebSocketReceiver.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.mq;
+package me.zhengjie.job.mq;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,9 +9,9 @@ import me.zhengjie.appapi.entity.SysUserEntity;
 import me.zhengjie.appapi.service.SysUserService;
 import me.zhengjie.modules.security.service.OnlineUserService;
 import me.zhengjie.modules.security.service.dto.OnlineUserDto;
-import me.zhengjie.modules.system.entity.NotaryOrderEntity;
-import me.zhengjie.modules.system.service.NotaryOrderService;
-import me.zhengjie.modules.system.service.dto.RoleSmallDto;
+import me.zhengjie.dao.entity.NotaryOrderEntity;
+import me.zhengjie.service.admin.NotaryOrderService;
+import me.zhengjie.service.admin.dto.RoleSmallDto;
 import me.zhengjie.base.util.WebSocketMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.connection.Message;

eladmin-system/src/main/java/me/zhengjie/modules/system/executor/jobhandler/GenerateNotarizationJob.java

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.executor.jobhandler;
+package me.zhengjie.job.timer;
 
 import cfca.trustsign.common.vo.cs.UploadSignInfoVO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,10 +12,8 @@ import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
 import me.zhengjie.base.util.CFCACertUtil;
 import me.zhengjie.dao.OrderFileRepository;
-import me.zhengjie.dao.entity.OrderFileEntity;
-import me.zhengjie.dao.mapper.OrderFileMapper;
-import me.zhengjie.modules.system.entity.*;
-import me.zhengjie.modules.system.repository.*;
+import me.zhengjie.dao.entity.*;
+import me.zhengjie.dao.mapper.*;
 import me.zhengjie.utils.StringUtils;
 import org.springframework.stereotype.Component;
 

eladmin-system/src/main/java/me/zhengjie/modules/mnt/websocket/WebSocketEventListenner.java

@@ -6,11 +6,8 @@ import com.corundumstudio.socketio.SocketIOClient;
 import com.corundumstudio.socketio.annotation.OnConnect;
 import com.corundumstudio.socketio.annotation.OnDisconnect;
 import com.corundumstudio.socketio.annotation.OnEvent;
-import com.corundumstudio.socketio.transport.NamespaceClient;
-import com.corundumstudio.socketio.handler.ClientHead;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.modules.mq.ClientCache;
-import com.corundumstudio.socketio.namespace.Namespace;
+import me.zhengjie.base.mq.ClientCache;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -18,7 +15,6 @@ import javax.annotation.Resource;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java

@@ -33,8 +33,8 @@ import me.zhengjie.modules.security.config.bean.SecurityProperties;
 import me.zhengjie.modules.security.security.TokenProvider;
 import me.zhengjie.modules.security.service.dto.AuthUserDto;
 import me.zhengjie.modules.security.service.dto.JwtUserDto;
-import me.zhengjie.modules.system.service.UserService;
-import me.zhengjie.modules.system.service.dto.UserDto;
+import me.zhengjie.service.admin.UserService;
+import me.zhengjie.service.admin.dto.UserDto;
 import me.zhengjie.modules.security.service.OnlineUserService;
 import me.zhengjie.utils.RsaUtils;
 import me.zhengjie.utils.RedisUtils;