项目结构调整

eladmin-system/src/main/java/me/zhengjie/appapi/authorization/annotation/Authorization.java

@@ -1,18 +0,0 @@
-package me.zhengjie.appapi.authorization.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 授权忽略认证注解
- * 在Controller的方法上使用此注解，该方法在映射时会检查用户是否登录，未登录返回401错误
- * @author Karl
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Authorization {
-    //只得到用户不验证空
-    boolean onlyGetCustomer() default false;
-}

eladmin-system/src/main/java/me/zhengjie/appapi/authorization/annotation/CurrentUser.java

@@ -1,15 +0,0 @@
-package me.zhengjie.appapi.authorization.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 在Controller的方法参数中使用此注解，该方法在映射时会注入当前登录的User对象
- * @author Karl
- */
-@Target(ElementType.PARAMETER)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface CurrentUser {
-}

eladmin-system/src/main/java/me/zhengjie/appapi/authorization/interceptor/AuthorizationInterceptor.java

@@ -1,61 +0,0 @@
-package me.zhengjie.appapi.authorization.interceptor;
-
-
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import me.zhengjie.appapi.authorization.annotation.Authorization;
-import me.zhengjie.appapi.authorization.constatns.CommonConstants;
-
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.Method;
-
-/**
- * 自定义拦截器，判断此次请求是否有权限
- *
- * @author karl
- */
-//@Component
-public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
-
-	@Override
-	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
-			throws Exception {
-		// 如果不是映射到方法直接通过
-		if (!(handler instanceof HandlerMethod)) {
-			return true;
-		}
-
-		HandlerMethod handlerMethod = (HandlerMethod) handler;
-		Method method = handlerMethod.getMethod();
-
-		String authorization = request.getHeader(CommonConstants.AUTHORIZATION);
-
-		// String platform = request.getHeader(Constants.PLATFORM);
-		// BaseContextHandler.setPlatform(platform);
-
-		// 并且方法注明了Authorization，
-		if (method.getAnnotation(Authorization.class) != null) {
-			if (method.getAnnotation(Authorization.class).onlyGetCustomer()) {
-				return super.preHandle(request, response, handler);
-			}
-		}
-		// 验证token
-		if (!CommonConstants.PUBLIC_KEY.equals(authorization)) {
-		//	throw new ApiException(ResultCode.TOKEN_ILLEGAL);
-			return false;
-		} else {
-			return super.preHandle(request, response, handler);
-		}
-
-	}
-
-	@Override
-	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex)
-			throws Exception {
-
-		super.afterCompletion(request, response, handler, ex);
-	}
-}

eladmin-system/src/main/java/me/zhengjie/appapi/authorization/model/TokenModel.java

@@ -1,26 +0,0 @@
-package me.zhengjie.appapi.authorization.model;
-
-import lombok.Data;
-
-/**
- * Token的Model类，可以增加字段提高安全性，例如时间戳、url签名
- * @author karl
- */
-@Data
-public class TokenModel {
-
-    /**
-     * 用户id
-     */
-    private int userId;
-
-    /**
-     * 随机生成的uuid
-     */
-    private String token;
-
-    public TokenModel(int userId, String token) {
-        this.userId = userId;
-        this.token = token;
-    }
-}

eladmin-system/src/main/java/me/zhengjie/appapi/dao/impl/OrderDaoImpl.java

@@ -22,7 +22,7 @@ import me.zhengjie.appapi.entity.Sms;
 import me.zhengjie.appapi.entity.request.order.SaOrderQueryPageReq;
 import me.zhengjie.appapi.entity.response.order.SaOrderQueryDetailRes;
 import me.zhengjie.appapi.entity.response.order.SaOrderQueryPageRes;
-import me.zhengjie.appapi.util.StatusEnum;
+import me.zhengjie.base.util.StatusEnum;
 
 @Repository
 @Transactional

eladmin-system/src/main/java/me/zhengjie/appapi/dao/impl/SmsLogDaoImpl.java

@@ -1,8 +1,6 @@
 package me.zhengjie.appapi.dao.impl;
 
-import com.google.gson.JsonObject;
-
-import me.zhengjie.appapi.authorization.constatns.CommonConstants;
+import me.zhengjie.domain.sms.CommonConstants;
 import me.zhengjie.appapi.dao.SmsLogDao;
 import me.zhengjie.appapi.entity.Sms;
 import me.zhengjie.appapi.entity.SmsLog;

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

@@ -15,7 +15,7 @@ import me.zhengjie.appapi.entity.SysUserEntity;
 import me.zhengjie.appapi.service.ApiBankService;
 import me.zhengjie.appapi.service.OrderService;
 import me.zhengjie.appapi.service.SysUserService;
-import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.appapi.vo.BankLoginVo;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;

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

@@ -9,9 +9,9 @@ import me.zhengjie.appapi.dto.OrderDto;
 import me.zhengjie.appapi.entity.*;
 import me.zhengjie.appapi.plus.QueryWrapperUtil;
 import me.zhengjie.appapi.service.*;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.IpAddressUtil;
-import me.zhengjie.appapi.util.StatusEnum;
+import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.IpAddressUtil;
+import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.appapi.vo.OrderVo;
 import me.zhengjie.appapi.vo.SmsVo;
 import me.zhengjie.appapi.vo.UserVo;

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

@@ -16,7 +16,7 @@ import me.zhengjie.appapi.mapper.IAreaDao;
 import me.zhengjie.appapi.service.AreaService;
 import me.zhengjie.appapi.service.CityService;
 import me.zhengjie.appapi.service.ProvinceService;
-import me.zhengjie.appapi.util.TreeUtil;
+import me.zhengjie.base.util.TreeUtil;
 
 /**
  * <p>

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

@@ -12,10 +12,10 @@ import me.zhengjie.appapi.mapper.ISysUserDao;
 import me.zhengjie.appapi.plus.AbstractServiceImpl;
 import me.zhengjie.appapi.plus.QueryWrapperUtil;
 import me.zhengjie.appapi.service.*;
-import me.zhengjie.appapi.util.BeanCopyUtils;
-import me.zhengjie.appapi.util.DateFormatUtils;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.StatusEnum;
+import me.zhengjie.base.util.BeanCopyUtils;
+import me.zhengjie.base.util.DateFormatUtils;
+import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.appapi.vo.BorrowerVo;
 import me.zhengjie.dao.OrderFileRepository;
 import me.zhengjie.dao.entity.OrderFileEntity;

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

@@ -16,8 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import me.zhengjie.appapi.entity.FileInfoEntity;
 import me.zhengjie.appapi.mapper.IFileInfoDao;
 import me.zhengjie.appapi.service.FileInfoService;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.SysUtil;
+import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.SysUtil;
 import me.zhengjie.appapi.vo.FileUploadVo;
 import me.zhengjie.appapi.vo.ImageUploadVo;
 

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

@@ -12,10 +12,10 @@ import me.zhengjie.appapi.mapper.ISysUserDao;
 import me.zhengjie.appapi.plus.AbstractServiceImpl;
 import me.zhengjie.appapi.service.GuaranteeService;
 import me.zhengjie.appapi.service.OrderService;
-import me.zhengjie.appapi.util.BeanCopyUtils;
-import me.zhengjie.appapi.util.DateFormatUtils;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.StatusEnum;
+import me.zhengjie.base.util.BeanCopyUtils;
+import me.zhengjie.base.util.DateFormatUtils;
+import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.appapi.vo.GuaranteeVo;
 import me.zhengjie.dao.OrderFileRepository;
 import me.zhengjie.dao.entity.OrderFileEntity;

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

@@ -23,8 +23,8 @@ import me.zhengjie.appapi.entity.FileInfo;
 import me.zhengjie.appapi.entity.Order;
 import me.zhengjie.appapi.service.IdentityValidationService;
 import me.zhengjie.appapi.service.OssService;
-import me.zhengjie.appapi.util.StatusEnum.FileCodeEnum;
-import me.zhengjie.appapi.util.TencentUtil;
+import me.zhengjie.base.util.StatusEnum.FileCodeEnum;
+import me.zhengjie.base.util.TencentUtil;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 

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

@@ -11,10 +11,10 @@ import me.zhengjie.appapi.mapper.ISysUserDao;
 import me.zhengjie.appapi.plus.AbstractServiceImpl;
 import me.zhengjie.appapi.service.MortgageService;
 import me.zhengjie.appapi.service.OrderService;
-import me.zhengjie.appapi.util.BeanCopyUtils;
-import me.zhengjie.appapi.util.DateFormatUtils;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.StatusEnum;
+import me.zhengjie.base.util.BeanCopyUtils;
+import me.zhengjie.base.util.DateFormatUtils;
+import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.StatusEnum;
 import me.zhengjie.appapi.vo.MortgageVo;
 import me.zhengjie.dao.OrderFileRepository;
 import me.zhengjie.dao.entity.OrderFileEntity;

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

@@ -9,9 +9,9 @@ import me.zhengjie.appapi.entity.response.BaseResponse;
 import me.zhengjie.appapi.mapper.INotaryNoteDao;
 import me.zhengjie.appapi.service.NotaryNoteService;
 import me.zhengjie.appapi.service.OrderService;
-import me.zhengjie.appapi.util.DateUtils;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.StatusEnum;
+import me.zhengjie.base.util.DateUtils;
+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;

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

@@ -14,10 +14,10 @@ import me.zhengjie.appapi.entity.*;
 import me.zhengjie.appapi.entity.response.BaseResponse;
 import me.zhengjie.appapi.plus.QueryWrapperUtil;
 import me.zhengjie.appapi.service.*;
-import me.zhengjie.appapi.util.DateFormatUtils;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.StatusEnum;
-import me.zhengjie.appapi.util.StatusEnum.NotaryStatusEnum;
+import me.zhengjie.base.util.DateFormatUtils;
+import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.StatusEnum;
+import me.zhengjie.base.util.StatusEnum.NotaryStatusEnum;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.dao.ModelRepository;
@@ -48,7 +48,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static me.zhengjie.appapi.util.DateFormatUtils.format;
+import static me.zhengjie.base.util.DateFormatUtils.format;
 
 /**
  * <p>

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.appapi.dao.FileInfoDao;
 import me.zhengjie.appapi.entity.FileInfo;
 import me.zhengjie.appapi.service.OssService;
-import me.zhengjie.appapi.util.OssUtil;
+import me.zhengjie.base.util.OssUtil;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 

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

@@ -1,13 +1,13 @@
 package me.zhengjie.appapi.service.impl;
 
-import static me.zhengjie.appapi.util.StatusEnum.PdfEnum.APPLY;
-import static me.zhengjie.appapi.util.StatusEnum.PdfEnum.BORROWERNOTE;
-import static me.zhengjie.appapi.util.StatusEnum.PdfEnum.CONFIRMATION;
-import static me.zhengjie.appapi.util.StatusEnum.PdfEnum.ENTRUST;
-import static me.zhengjie.appapi.util.StatusEnum.PdfEnum.NOTARYBOOK;
-import static me.zhengjie.appapi.util.StatusEnum.PdfEnum.NOTIFICATION;
-import static me.zhengjie.appapi.util.StatusEnum.PdfEnum.PROMISE;
-import static me.zhengjie.appapi.util.StatusEnum.PdfEnum.RECEIPT;
+import static me.zhengjie.base.util.StatusEnum.PdfEnum.APPLY;
+import static me.zhengjie.base.util.StatusEnum.PdfEnum.BORROWERNOTE;
+import static me.zhengjie.base.util.StatusEnum.PdfEnum.CONFIRMATION;
+import static me.zhengjie.base.util.StatusEnum.PdfEnum.ENTRUST;
+import static me.zhengjie.base.util.StatusEnum.PdfEnum.NOTARYBOOK;
+import static me.zhengjie.base.util.StatusEnum.PdfEnum.NOTIFICATION;
+import static me.zhengjie.base.util.StatusEnum.PdfEnum.PROMISE;
+import static me.zhengjie.base.util.StatusEnum.PdfEnum.RECEIPT;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
@@ -35,10 +35,10 @@ import me.zhengjie.appapi.entity.Order;
 import me.zhengjie.appapi.entity.OrgInfo;
 import me.zhengjie.appapi.service.OssService;
 import me.zhengjie.appapi.service.PdfService;
-import me.zhengjie.appapi.util.HtmlConvertPdf;
-import me.zhengjie.appapi.util.PdfModel;
-import me.zhengjie.appapi.util.StatusEnum;
-import me.zhengjie.appapi.util.SysUtil;
+import me.zhengjie.base.util.HtmlConvertPdf;
+import me.zhengjie.base.util.PdfModel;
+import me.zhengjie.base.util.StatusEnum;
+import me.zhengjie.base.util.SysUtil;
 
 
 @Slf4j

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

@@ -22,9 +22,9 @@ import me.zhengjie.appapi.entity.FileInfo;
 import me.zhengjie.appapi.entity.Order;
 import me.zhengjie.appapi.service.OssService;
 import me.zhengjie.appapi.service.SignService;
-import me.zhengjie.appapi.util.StatusEnum;
-import me.zhengjie.appapi.util.SysUtil;
-import me.zhengjie.appapi.util.UinidUtils;
+import me.zhengjie.base.util.StatusEnum;
+import me.zhengjie.base.util.SysUtil;
+import me.zhengjie.base.util.UinidUtils;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 

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

@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.google.gson.JsonObject;
 
-import me.zhengjie.appapi.authorization.constatns.CommonConstants;
+import me.zhengjie.domain.sms.CommonConstants;
 import me.zhengjie.appapi.dao.AccountDao;
 import me.zhengjie.appapi.dao.ConfinfoDao;
 import me.zhengjie.appapi.dao.OrderDao;
@@ -20,9 +20,9 @@ import me.zhengjie.appapi.entity.Sms;
 import me.zhengjie.appapi.entity.SmsLog;
 import me.zhengjie.appapi.service.OrderService;
 import me.zhengjie.appapi.service.SmsService;
-import me.zhengjie.appapi.util.DateUtils;
+import me.zhengjie.base.util.DateUtils;
 
-import me.zhengjie.appapi.util.TencentSendSms;
+import me.zhengjie.base.util.TencentSendSms;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 

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

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import me.zhengjie.appapi.entity.UserAXQInfoEntity;
 import me.zhengjie.appapi.mapper.IUserAXQInfoDao;
 import me.zhengjie.appapi.service.UserAXQInfoService;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.StatusEnum.StepStatusEnum;
+import me.zhengjie.base.util.FileUploadUtil;
+import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
 import me.zhengjie.base.ResponseDTO;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.dao.OrderFileRepository;

eladmin-system/src/main/java/me/zhengjie/appapi/controller/BaseController.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.controller;
+package me.zhengjie.base;
 
 import javax.servlet.http.HttpServletRequest;
 

eladmin-system/src/main/java/me/zhengjie/base/config/ConfigurerAdapter.java

@@ -19,14 +19,10 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 
-import me.zhengjie.appapi.util.SysUtil;
+import me.zhengjie.base.util.SysUtil;
 
 import me.zhengjie.config.FileProperties;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.web.ConditionalOnEnabledResourceChain;
 import org.springframework.boot.autoconfigure.web.ResourceProperties;
-import org.springframework.boot.autoconfigure.web.ResourceProperties.Strategy;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -37,14 +33,9 @@ import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.ResourceChainRegistration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.resource.AppCacheManifestTransformer;
-import org.springframework.web.servlet.resource.EncodedResourceResolver;
-import org.springframework.web.servlet.resource.ResourceResolver;
-import org.springframework.web.servlet.resource.VersionResourceResolver;
 
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import com.aliyuncs.CommonRequest;
 import com.aliyuncs.CommonResponse;

eladmin-system/src/main/java/me/zhengjie/appapi/util/ApiResult.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 
 import com.alibaba.fastjson.JSONObject;

eladmin-system/src/main/java/me/zhengjie/appapi/util/BeanCopyUtils.java

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

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

@@ -13,15 +13,12 @@ import cfca.trustsign.util.PdfUtil;
 import cfca.trustsign.util.SecurityUtil;
 import cfca.trustsign.util.TimeUtil;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.appapi.util.FileUploadUtil;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.File;
 import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+
 @Slf4j
 public class CFCACertUtil {
     private static final int PROXY_SIGN_ON = 1;

eladmin-system/src/main/java/me/zhengjie/appapi/util/Constants.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 public class Constants {
 	// 文件类型

eladmin-system/src/main/java/me/zhengjie/appapi/util/DateFormatUtils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import java.math.BigDecimal;
 import java.text.ParseException;

eladmin-system/src/main/java/me/zhengjie/appapi/util/DateUtils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import java.text.ParseException;
 import java.text.ParsePosition;

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

@@ -1,17 +1,10 @@
 package me.zhengjie.base.util;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.HashMap;
 
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.http.HttpUtil;
-import me.zhengjie.appapi.util.FileUploadUtil;
 
 /**
  * 使用java中的文件流下载网上的图片，保存到本地

eladmin-system/src/main/java/me/zhengjie/appapi/util/FileTool.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -19,8 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import cn.hutool.core.io.IoUtil;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.appapi.config.AppConfigInfo;
-import me.zhengjie.appapi.util.StatusEnum.StepStatusEnum;
+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;

eladmin-system/src/main/java/me/zhengjie/appapi/util/Function.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

eladmin-system/src/main/java/me/zhengjie/appapi/util/HtmlConvertPdf.java

@@ -1,7 +1,6 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.AppRun;
 
 import org.apache.commons.io.FileUtils;
 import org.zefer.pd4ml.PD4Constants;
@@ -9,8 +8,6 @@ import org.zefer.pd4ml.PD4ML;
 
 import java.awt.*;
 import java.io.*;
-import java.nio.charset.Charset;
-import java.util.UUID;
 
 /**
  * https://pd4ml.com/api/org/zefer/pd4ml/PD4ML.html api文档

eladmin-system/src/main/java/me/zhengjie/appapi/util/HttpUtils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

eladmin-system/src/main/java/me/zhengjie/appapi/util/IpAddressUtil.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import javax.servlet.http.HttpServletRequest;
 

eladmin-system/src/main/java/me/zhengjie/appapi/util/MD5Utils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;

eladmin-system/src/main/java/me/zhengjie/appapi/util/OssUtil.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClient;

eladmin-system/src/main/java/me/zhengjie/appapi/util/PdfModel.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

eladmin-system/src/main/java/me/zhengjie/appapi/util/PdfUtils.java

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

eladmin-system/src/main/java/me/zhengjie/appapi/util/PullSmsSendStatus.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;

eladmin-system/src/main/java/me/zhengjie/appapi/util/Redis.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;

eladmin-system/src/main/java/me/zhengjie/appapi/util/StatusEnum.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 public class StatusEnum {
 	

eladmin-system/src/main/java/me/zhengjie/appapi/util/SysUtil.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

eladmin-system/src/main/java/me/zhengjie/appapi/util/TencentSendSms.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import com.tencentcloudapi.common.Credential;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;

eladmin-system/src/main/java/me/zhengjie/appapi/util/TencentUtil.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.tencentcloudapi.common.Credential;

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

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

eladmin-system/src/main/java/me/zhengjie/appapi/util/UUIDGenerator.java

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

eladmin-system/src/main/java/me/zhengjie/appapi/util/UinidUtils.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.util;
+package me.zhengjie.base.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uinid.util.FileUtil;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.appapi.entity.response.BaseResponse;

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

@@ -1,28 +1,16 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.tencentyun.TLSSigAPIv2;
 import me.zhengjie.annotation.AnonymousAccess;
-import me.zhengjie.annotation.rest.AnonymousGetMapping;
-import me.zhengjie.annotation.rest.AnonymousPostMapping;
-import me.zhengjie.appapi.util.TencentUtil;
-import me.zhengjie.base.ResultCode;
 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.modules.system.entity.response.system.OrgQueryRsp;
-import org.apache.ibatis.annotations.Results;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import java.io.IOException;
-import java.util.Base64;
-import java.util.List;
 import java.util.Map;
 
 /**

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,22 +1,19 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import static me.zhengjie.appapi.util.Constants.*;
+import static me.zhengjie.base.util.Constants.*;
 import com.alibaba.fastjson.JSONObject;
 
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.appapi.config.AppConfigInfo;
-import me.zhengjie.appapi.entity.FileInfoEntity;
 import me.zhengjie.appapi.service.ApiBankService;
 import me.zhengjie.appapi.service.FileInfoService;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.StatusEnum.StepStatusEnum;
+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.base.ResponseDTO;

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import com.alibaba.fastjson.JSONObject;
 import me.zhengjie.annotation.rest.AnonymousGetMapping;

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.appapi.entity.response.BaseResponse;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import com.alibaba.fastjson.JSONObject;
 import me.zhengjie.appapi.entity.response.BaseResponse;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 
 import me.zhengjie.annotation.rest.AnonymousGetMapping;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 
 import com.alibaba.fastjson.JSON;
@@ -10,7 +10,7 @@ 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.appapi.util.TencentUtil;
+import me.zhengjie.base.util.TencentUtil;
 import me.zhengjie.appapi.vo.FileVo;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.modules.system.entity.PartyEntity;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ 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.appapi.util.FileUploadUtil;
+import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.base.util.WebSocketMap;
 import me.zhengjie.utils.SecurityUtils;

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import cn.hutool.core.lang.Dict;
 import io.swagger.annotations.Api;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.appapi.entity.response.BaseResponse;

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

@@ -1,4 +1,4 @@
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import java.util.HashMap;
 import java.util.List;
@@ -15,12 +15,11 @@ 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.config.AppConfigInfo;
 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.appapi.util.StatusEnum.StepStatusEnum;
+import me.zhengjie.base.util.StatusEnum.StepStatusEnum;
 import me.zhengjie.base.util.DownloadUtils;
 
 @Controller

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import cn.hutool.core.collection.CollectionUtil;
 import io.swagger.annotations.Api;

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

@@ -13,7 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package me.zhengjie.modules.system.rest;
+package me.zhengjie.controller.admin;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

eladmin-system/src/main/java/me/zhengjie/appapi/controller/ApiBankController.java

@@ -1,29 +1,31 @@
-package me.zhengjie.appapi.controller;
+package me.zhengjie.controller.bank;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.annotation.rest.AnonymousGetMapping;
 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.*;
+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.appapi.util.*;
-import me.zhengjie.appapi.util.StatusEnum.StepStatusEnum;
+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.modules.security.security.TokenProvider;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,7 +33,10 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 银行端的登录接口
@@ -43,28 +48,18 @@ import java.util.*;
 @RestController
 @RequestMapping("/app/bank")
 @Slf4j
-public class ApiBankController extends BaseController {
-	@Autowired
-	ApiBankService apiBankService;
-	@Autowired
-	FileInfoService fileInfoService;
-	@Autowired
-	BorrowerService borrowerService;
-	@Autowired
-	MortgageService mortgageService;
-	@Autowired
-	GuaranteeService guaranteeService;
-	@Autowired
-	TokenProvider tokenProvider;
-	@Autowired
-	OrderService orderService;
-	@Autowired
-	OrderFileRepository orderFileRepository;
-
-	@Autowired
-	TencentHumanFaceVerify faceVerify;
-	@Autowired
-	UserAXQInfoService userAXQInfoService;
+@RequiredArgsConstructor
+public class AppBankController extends BaseController {
+	private final ApiBankService apiBankService;
+	private final FileInfoService fileInfoService;
+	private final BorrowerService borrowerService;
+	private final MortgageService mortgageService;
+	private final GuaranteeService guaranteeService;
+	private final TokenProvider tokenProvider;
+	private final OrderService orderService;
+	private final OrderFileRepository orderFileRepository;
+	private final TencentHumanFaceVerify faceVerify;
+	private final UserAXQInfoService userAXQInfoService;
 	/**
 	 * 登录接口
 	 * 

eladmin-system/src/main/java/me/zhengjie/appapi/controller/ApiController.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.controller;
+package me.zhengjie.controller.user.app;
 
 import com.alibaba.fastjson.JSONObject;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
@@ -6,7 +6,7 @@ import me.zhengjie.appapi.config.TencentHumanFaceVerify;
 import me.zhengjie.appapi.dto.OrderDto;
 import me.zhengjie.appapi.service.*;
 import me.zhengjie.appapi.tencent.h5face.SdkTest;
-import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.appapi.vo.SmsVo;
 import me.zhengjie.appapi.vo.UserVo;
 import me.zhengjie.base.ResponseDTO;
@@ -28,7 +28,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/app")
-public class ApiController {
+public class AppUserController {
 
 	@Autowired
 	private ApiService apiService;

eladmin-system/src/main/java/me/zhengjie/appapi/controller/MiniProgramController.java

@@ -1,11 +1,10 @@
-package me.zhengjie.appapi.controller;
+package me.zhengjie.controller.user.mini;
 
 import com.alibaba.fastjson.JSONObject;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.appapi.dto.OrderDto;
 import me.zhengjie.appapi.service.*;
-import me.zhengjie.appapi.tencent.h5face.SdkTest;
-import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.appapi.vo.OrderVo;
 import me.zhengjie.appapi.vo.SmsVo;
 import me.zhengjie.appapi.vo.UserVo;
@@ -28,7 +27,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/minipro")
-public class MiniProgramController {
+public class MiniUserController {
 
 
 	@Autowired

eladmin-system/src/main/java/me/zhengjie/appapi/authorization/constatns/CommonConstants.java

@@ -1,4 +1,4 @@
-package me.zhengjie.appapi.authorization.constatns;
+package me.zhengjie.domain.sms;
 
 /**
  * 常量 key值

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

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
-import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.base.util.FileUploadUtil;
 
 public abstract class AbstractFileHandle implements FileHandle, ApplicationContextAware {
 

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

@@ -2,16 +2,15 @@ package me.zhengjie.modules.mq;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import me.zhengjie.appapi.config.AppConfigInfo;
 import me.zhengjie.appapi.dto.OrderDto;
 import me.zhengjie.appapi.entity.*;
 import me.zhengjie.appapi.mapper.ICityDao;
 import me.zhengjie.appapi.mapper.IProvinceDao;
 import me.zhengjie.appapi.service.*;
 import me.zhengjie.appapi.service.impl.NotaryNoteServiceImpl;
-import me.zhengjie.appapi.util.DateUtils;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.StatusEnum.SexStatusEnum;
+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;
@@ -121,11 +120,17 @@ public class RedisReceiver implements MessageListener {
 		String[] areas = office.getAreaCodesStr().split(",");
 		QueryWrapper<ProvinceEntity> provinceQW = new QueryWrapper<>();
 		provinceQW.eq("code", areas[0]);
+
 		ProvinceEntity provinceEntity = provinceDao.selectOne(provinceQW);
-		QueryWrapper<CityEntity> cityQW = new QueryWrapper<>();
-		cityQW.eq("code", areas[1]);
-		CityEntity cityEntity = cityDao.selectOne(cityQW);
-		String usedLocation = provinceEntity.getProvinceName().concat(cityEntity.getCityName());
+		String cityCodeZX = "110000,120000,310000,500000";
+		String cityName = "";
+		if (cityCodeZX.indexOf(provinceEntity.getCode()) <= -1) {
+			QueryWrapper<CityEntity> cityQW = new QueryWrapper<>();
+			cityQW.eq("code", areas[1]);
+			CityEntity cityEntity = cityDao.selectOne(cityQW);
+			cityName = cityEntity.getCityName();
+		}
+		String usedLocation = provinceEntity.getProvinceName().concat(cityName);
 		map.put("$NotaryOffice$", office.getName());
 		map.put("$UsedLocation$", usedLocation);
 

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

@@ -20,15 +20,13 @@ import com.wf.captcha.base.Captcha;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.annotation.rest.AnonymousDeleteMapping;
 import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.appapi.entity.FileInfoEntity;
 import me.zhengjie.appapi.service.FileInfoService;
-import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.config.RsaProperties;
-import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.security.config.bean.LoginCodeEnum;
 import me.zhengjie.modules.security.config.bean.LoginProperties;
 import me.zhengjie.modules.security.config.bean.SecurityProperties;
@@ -41,7 +39,6 @@ import me.zhengjie.modules.security.service.OnlineUserService;
 import me.zhengjie.utils.RsaUtils;
 import me.zhengjie.utils.RedisUtils;
 import me.zhengjie.utils.SecurityUtils;
-import me.zhengjie.utils.StringUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -57,7 +54,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import org.springframework.security.core.userdetails.UserDetails;
 
 /**
  * @author Zheng Jie

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

@@ -8,8 +8,8 @@ import lombok.RequiredArgsConstructor;
 import me.zhengjie.appapi.config.AppConfigInfo;
 import me.zhengjie.appapi.entity.SysUserEntity;
 import me.zhengjie.appapi.mapper.ISysUserDao;
-import me.zhengjie.appapi.util.FileUploadUtil;
-import me.zhengjie.appapi.util.StatusEnum.StepStatusEnum;
+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;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BankServiceImpl.java

@@ -17,8 +17,7 @@ import me.zhengjie.appapi.service.FileInfoService;
 import me.zhengjie.modules.system.repository.BankMapper;
 import me.zhengjie.modules.system.entity.request.bank.BankQueryReq;
 import me.zhengjie.modules.system.entity.response.bank.BankQueryRsp;
-import me.zhengjie.appapi.util.BeanCopyUtils;
-import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.modules.system.repository.OfficeXbankMapper;
 import me.zhengjie.modules.system.service.BankService;
 

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/ModelNotarizationServiceImpl.java

@@ -8,7 +8,7 @@ import me.zhengjie.appapi.entity.NotaryNoteEntity;
 import me.zhengjie.appapi.entity.response.BaseResponse;
 import me.zhengjie.appapi.entity.response.ResultData;
 import me.zhengjie.appapi.mapper.INotaryNoteDao;
-import me.zhengjie.appapi.util.BeanCopyUtils;
+import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.modules.security.service.dto.JwtUserDto;
 import me.zhengjie.domain.user.UserDomain;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/NotarizationNoServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.appapi.entity.response.BaseResponse;
 import me.zhengjie.appapi.entity.response.ResultData;
-import me.zhengjie.appapi.util.BeanCopyUtils;
+import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.modules.system.entity.NotarizationNoEntity;
 import me.zhengjie.modules.system.entity.request.notaryoffice.NotarizationNoReq;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/NotaryOfficeServiceImpl.java

@@ -15,8 +15,8 @@ import me.zhengjie.appapi.entity.response.BaseResponse;
 import me.zhengjie.appapi.entity.response.ResultData;
 import me.zhengjie.appapi.mapper.ISysUserDao;
 import me.zhengjie.appapi.service.FileInfoService;
-import me.zhengjie.appapi.util.BeanCopyUtils;
-import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.base.util.BeanCopyUtils;
+import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.modules.system.constants.NotaryOfficeConstant;
 import me.zhengjie.modules.system.entity.BankEntity;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/NotaryOrderServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import me.zhengjie.appapi.config.AppConfigInfo;
 import me.zhengjie.appapi.entity.CityEntity;
 import me.zhengjie.appapi.entity.FileInfoEntity;
 import me.zhengjie.appapi.entity.ProvinceEntity;
@@ -17,9 +16,9 @@ import me.zhengjie.appapi.mapper.ISysUserDao;
 import me.zhengjie.appapi.service.FileInfoService;
 import me.zhengjie.appapi.service.OrderService;
 import me.zhengjie.appapi.service.impl.NotaryNoteServiceImpl;
-import me.zhengjie.appapi.util.*;
 import me.zhengjie.appapi.vo.FileVo;
 import me.zhengjie.base.ResultCode;
+import me.zhengjie.base.util.*;
 import me.zhengjie.dao.ModelRepository;
 import me.zhengjie.dao.OrderFileRepository;
 import me.zhengjie.dao.entity.OrderFileEntity;
@@ -33,7 +32,6 @@ import me.zhengjie.modules.system.entity.response.order.NotaryOrderInfoQueryRsp;
 import me.zhengjie.modules.system.entity.response.order.NotaryOrderQueryRsp;
 import me.zhengjie.modules.system.repository.*;
 import me.zhengjie.modules.system.service.NotaryOrderService;
-import me.zhengjie.base.util.TextTempletUtil;
 import me.zhengjie.utils.SecurityUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,9 +41,6 @@ import org.springframework.util.StringUtils;
 
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -394,10 +389,15 @@ public class NotaryOrderServiceImpl extends ServiceImpl<NotaryOrderMapper, Notar
 		QueryWrapper<ProvinceEntity> provinceQW = new QueryWrapper<>();
 		provinceQW.eq("code", areas[0]);
 		ProvinceEntity provinceEntity = provinceDao.selectOne(provinceQW);
-		QueryWrapper<CityEntity> cityQW = new QueryWrapper<>();
-		cityQW.eq("code", areas[1]);
-		CityEntity cityEntity = cityDao.selectOne(cityQW);
-		String usedLocation = provinceEntity.getProvinceName().concat(cityEntity.getCityName());
+		String cityCodeZX = "110000,120000,310000,500000";
+		String cityName = "";
+		if (cityCodeZX.indexOf(provinceEntity.getCode()) <= -1) {
+			QueryWrapper<CityEntity> cityQW = new QueryWrapper<>();
+			cityQW.eq("code", areas[1]);
+			CityEntity cityEntity = cityDao.selectOne(cityQW);
+			cityName = cityEntity.getCityName();
+		}
+		String usedLocation = provinceEntity.getProvinceName().concat(cityName);
 		map.put("$Site$", usedLocation);
 		map.put("$NotaryOffice$", notaryOffice.getName());
 		// 借款人信息

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/OfficeXbankServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.appapi.entity.response.BaseResponse;
 import me.zhengjie.appapi.entity.response.ResultData;
-import me.zhengjie.appapi.util.BeanCopyUtils;
+import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.modules.system.entity.BankEntity;
 import me.zhengjie.modules.system.entity.NotaryOrderEntity;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/SystemServiceImpl.java

@@ -1,34 +1,18 @@
 package me.zhengjie.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import me.zhengjie.appapi.entity.response.BaseResponse;
 import me.zhengjie.appapi.entity.response.ResultData;
-import me.zhengjie.appapi.util.BeanCopyUtils;
-import me.zhengjie.base.ResultCode;
 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.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.entity.response.system.OrgQueryRsp;
 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.service.BankService;
-import me.zhengjie.modules.system.service.NotaryOrderService;
 import me.zhengjie.modules.system.service.SystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
-import javax.transaction.Transactional;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -24,8 +24,8 @@ import me.zhengjie.appapi.entity.*;
 import me.zhengjie.appapi.entity.response.BaseResponse;
 import me.zhengjie.appapi.entity.response.ResultData;
 import me.zhengjie.appapi.mapper.*;
-import me.zhengjie.appapi.util.BeanCopyUtils;
-import me.zhengjie.appapi.util.FileUploadUtil;
+import me.zhengjie.base.util.BeanCopyUtils;
+import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.ResultCode;
 import me.zhengjie.config.FileProperties;
 import me.zhengjie.exception.BadRequestException;
@@ -53,7 +53,6 @@ import me.zhengjie.utils.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;