Merge branch 'feature-temp-20230608' into 'master'

Feature temp 20230608

See merge request !113

src/main/java/cn/quantgroup/xyqb/config/swagger/SwaggerConfig.java

-package cn.quantgroup.xyqb.config.swagger;
-
-
-/**
- * Swagger文档框架
- * 这个第三方新版本竟然不兼容旧的服气啊 没有再用了直接干掉
- *
- */
-@Deprecated
-//@EnableSwagger2
-//@Configuration
-public class SwaggerConfig {
-
-//    @Value("${openapi.swagger.on:false}")
-////    private Boolean swaggerOn;
-////
-////    @Bean
-////    public Docket createRestApi() {
-////        return new Docket(DocumentationType.SWAGGER_2)
-////                .useDefaultResponseMessages(false)
-////                .enable(swaggerOn)
-////                .apiInfo(apiInfo())
-////                .select()
-////                .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-////                .paths(PathSelectors.any())
-////                .paths(Predicates.not(PathSelectors.regex("/error.*")))
-////                .build();
-////    }
-////
-////    private ApiInfo apiInfo() {
-////        return new ApiInfoBuilder()
-////                .title("xyqb-user api")
-////                .description("用户中心接口文档")
-////                .contact(new Contact("wenchao.ren", "", "wenchao.ren@quantgroup.cn"))
-////                .license("Apache License Version 2.0")
-////                .licenseUrl("https://github.com/springfox/springfox/blob/master/LICENSE")
-////                .version("2.0")
-////                .build();
-////    }
-
-}
-

src/main/java/cn/quantgroup/user/enums/BizType.java → src/main/java/cn/quantgroup/xyqb/constant/enums/BizType.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 import lombok.Getter;
 

src/main/java/cn/quantgroup/user/enums/EducationEnum.java → src/main/java/cn/quantgroup/xyqb/constant/enums/EducationEnum.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by 11 on 2016/12/30.

src/main/java/cn/quantgroup/user/enums/ErrorCodeEnum.java → src/main/java/cn/quantgroup/xyqb/constant/enums/ErrorCodeEnum.java

-package cn.quantgroup.customer.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 public enum ErrorCodeEnum {
 

src/main/java/cn/quantgroup/user/enums/Gender.java → src/main/java/cn/quantgroup/xyqb/constant/enums/Gender.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by Miraculous on 15/7/10.

src/main/java/cn/quantgroup/user/enums/IdType.java → src/main/java/cn/quantgroup/xyqb/constant/enums/IdType.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by FrankChow on 15/7/15.

src/main/java/cn/quantgroup/user/enums/IncomeEnum.java → src/main/java/cn/quantgroup/xyqb/constant/enums/IncomeEnum.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by 11 on 2016/12/30.

src/main/java/cn/quantgroup/user/enums/IncomeRangeEnum.java → src/main/java/cn/quantgroup/xyqb/constant/enums/IncomeRangeEnum.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by 11 on 2016/12/30.

src/main/java/cn/quantgroup/user/enums/LoginType.java → src/main/java/cn/quantgroup/xyqb/constant/enums/LoginType.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by FrankChow on 15/7/15.

src/main/java/cn/quantgroup/user/enums/MaritalStatus.java → src/main/java/cn/quantgroup/xyqb/constant/enums/MaritalStatus.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by sunnan on 2016-11-24.

src/main/java/cn/quantgroup/user/enums/OccupationEnum.java → src/main/java/cn/quantgroup/xyqb/constant/enums/OccupationEnum.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by 11 on 2016/12/30.

src/main/java/cn/quantgroup/user/enums/RecordType.java → src/main/java/cn/quantgroup/xyqb/constant/enums/RecordType.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by FrankChow on 15/7/15.

src/main/java/cn/quantgroup/user/enums/Relation.java → src/main/java/cn/quantgroup/xyqb/constant/enums/Relation.java

-package cn.quantgroup.user.enums;
+package cn.quantgroup.xyqb.constant.enums;
 
 /**
  * Created by Miraculous on 2017/1/3.

src/main/java/cn/quantgroup/xyqb/controller/dust/wechatverify/WechatVerifyController.java

-package cn.quantgroup.xyqb.controller.dust.wechatverify;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.PrintWriter;
-
-/**
- * Created by 11 on 2017/2/8.
- */
-@RestController
-@RequestMapping("/")
-public class WechatVerifyController {
-
-    /**
-     * @Deprecated 20210317
-     */
-    @Deprecated
-    @RequestMapping("/MP_verify_AWiagUn4kZiwmTt0.txt")
-    public void verifyWechat(HttpServletResponse response) throws Exception {
-        response.setContentType("plain/text");
-        PrintWriter writer = response.getWriter();
-        writer.print("AWiagUn4kZiwmTt0");
-        writer.close();
-    }
-}

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

 package cn.quantgroup.xyqb.controller.external;
 
-import cn.quantgroup.user.enums.LoginType;
+import cn.quantgroup.xyqb.constant.enums.LoginType;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
 import cn.quantgroup.xyqb.aspect.captcha.CaptchaFiniteValidator;

src/main/java/cn/quantgroup/xyqb/controller/external/WeChatController.java

 package cn.quantgroup.xyqb.controller.external;
 
-import cn.quantgroup.user.enums.LoginType;
+import cn.quantgroup.xyqb.constant.enums.LoginType;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Merchant;

src/main/java/cn/quantgroup/xyqb/controller/internal/user/AppController.java

 package cn.quantgroup.xyqb.controller.internal.user;
 
-import cn.quantgroup.user.enums.LoginType;
+import cn.quantgroup.xyqb.constant.enums.LoginType;
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.Merchant;

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

 package cn.quantgroup.xyqb.controller.internal.user;
 
-import cn.quantgroup.user.enums.*;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.accessable.IpValidator;
 import cn.quantgroup.xyqb.aspect.forbidden.AccessForbiddenValidator;
+import cn.quantgroup.xyqb.constant.enums.*;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.controller.internal.user.resp.UserFullResp;
 import cn.quantgroup.xyqb.entity.*;
@@ -567,11 +567,11 @@ public class InnerController implements IBaseController {
       info.setUserId(userId);
     }
     if (incomeEnum != null) {
-      info.setIncomeEnum(cn.quantgroup.user.enums.IncomeEnum.valueOf(incomeEnum.name()));
+      info.setIncomeEnum(IncomeEnum.valueOf(incomeEnum.name()));
     }
     if (incomeRangeEnum != null) {
       info.setIncomeRangeEnum(
-          cn.quantgroup.user.enums.IncomeRangeEnum.valueOf(incomeRangeEnum.name()));
+          IncomeRangeEnum.valueOf(incomeRangeEnum.name()));
     }
     if (occupationEnum != null) {
       if (occupationEnum == OccupationEnum.STUDENT) {//如果是学生那么转成其他
@@ -579,10 +579,10 @@ public class InnerController implements IBaseController {
       }
       //不明白为啥这么写 为啥不直接用还要valueof
       info.setOccupationEnum(
-          cn.quantgroup.user.enums.OccupationEnum.valueOf(occupationEnum.name()));
+          OccupationEnum.valueOf(occupationEnum.name()));
     }
     if (educationEnum != null) {
-      info.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.valueOf(educationEnum.name()));
+      info.setEducationEnum(EducationEnum.valueOf(educationEnum.name()));
     }
     if (hasCar != null) {
       info.setHasCar(hasCar);
@@ -599,7 +599,7 @@ public class InnerController implements IBaseController {
       info.setHasHouse(hasHouse);
     }
     if (maritalStatus != null) {
-      info.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(maritalStatus.name()));
+      info.setMarryStatus(MaritalStatus.valueOf(maritalStatus.name()));
     }
     info = userExtInfoService.save(info);
 
@@ -759,19 +759,19 @@ public class InnerController implements IBaseController {
     if (Objects.nonNull(extInfo)) {
       // 婚姻状态
       bean.setMarryStatus(Optional.ofNullable(extInfo.getMarryStatus())
-          .orElse(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN).getDesc());
+          .orElse(MaritalStatus.UNKNOWN).getDesc());
       // 受教育程度
       bean.setEducationEnum(Optional.ofNullable(extInfo.getEducationEnum())
-          .orElse(cn.quantgroup.user.enums.EducationEnum.UNKNOWN).getName());
+          .orElse(EducationEnum.UNKNOWN).getName());
       // 职业
       bean.setOccupationEnum(Optional.ofNullable(extInfo.getOccupationEnum())
-          .orElse(cn.quantgroup.user.enums.OccupationEnum.UNKNOWN).getName());
+          .orElse(OccupationEnum.UNKNOWN).getName());
       // 收入水平范围
       bean.setIncomeRangeEnum(Optional.ofNullable(extInfo.getIncomeRangeEnum())
-          .orElse(cn.quantgroup.user.enums.IncomeRangeEnum.UNKNOWN).getDesc());
+          .orElse(IncomeRangeEnum.UNKNOWN).getDesc());
       // 收入方式
       bean.setIncomeEnum(Optional.ofNullable(extInfo.getIncomeEnum())
-          .orElse(cn.quantgroup.user.enums.IncomeEnum.UNKNOWN).getDesc());
+          .orElse(IncomeEnum.UNKNOWN).getDesc());
       // 是否有车
       bean.setHasCar(Optional.ofNullable(extInfo.getHasCar()).orElse(false));
       // 是否有社保
@@ -846,17 +846,17 @@ public class InnerController implements IBaseController {
       bean.setGender(Optional.ofNullable(userDetail.getGender()).orElse(Gender.UNKNOWN).getName());
       if (null != extInfo) {
         if (null == extInfo.getEducationEnum()) {
-          bean.setEducationEnum(cn.quantgroup.user.enums.EducationEnum.UNKNOWN.getName());
+          bean.setEducationEnum(EducationEnum.UNKNOWN.getName());
         } else {
           bean.setEducationEnum(extInfo.getEducationEnum().getName());
         }
         if (null == extInfo.getOccupationEnum()) {
-          bean.setOccupationEnum(cn.quantgroup.user.enums.OccupationEnum.UNKNOWN.getName());
+          bean.setOccupationEnum(OccupationEnum.UNKNOWN.getName());
         } else {
           bean.setOccupationEnum(extInfo.getOccupationEnum().getName());
         }
         if (null == extInfo.getMarryStatus()) {
-          bean.setMarryStatus(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN.getDesc());
+          bean.setMarryStatus(MaritalStatus.UNKNOWN.getDesc());
         } else {
           bean.setMarryStatus(extInfo.getMarryStatus().getDesc());
         }
@@ -930,7 +930,7 @@ public class InnerController implements IBaseController {
     }
     userSpouse.setSpouseName(status == MaritalStatus.MARRIED ? spouseName : "");
     userSpouse.setSpousePhone(status == MaritalStatus.MARRIED ? spousePhone : "");
-    userSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.valueOf(status.name()));
+    userSpouse.setStatus(MaritalStatus.valueOf(status.name()));
     userSpouse = userSpouseService.save(userSpouse);
     return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
   }
@@ -943,7 +943,7 @@ public class InnerController implements IBaseController {
     UserSpouse userSpouse = userSpouseService.findByUserId(userId);
     if (userSpouse == null || !userSpouse.valid()) {
       userSpouse = new UserSpouse(userId);
-      userSpouse.setStatus(cn.quantgroup.user.enums.MaritalStatus.UNKNOWN);
+      userSpouse.setStatus(MaritalStatus.UNKNOWN);
     }
     return JsonResult.buildSuccessResult(null, UserSpouseRet.getUserSpouseRet(userSpouse));
   }

src/main/java/cn/quantgroup/xyqb/controller/internal/user/center/UserCenterController.java

 package cn.quantgroup.xyqb.controller.internal.user.center;
 
-import cn.quantgroup.user.enums.EducationEnum;
-import cn.quantgroup.user.enums.IncomeRangeEnum;
-import cn.quantgroup.user.enums.MaritalStatus;
-import cn.quantgroup.user.enums.OccupationEnum;
+import cn.quantgroup.xyqb.constant.enums.EducationEnum;
+import cn.quantgroup.xyqb.constant.enums.IncomeRangeEnum;
+import cn.quantgroup.xyqb.constant.enums.MaritalStatus;
+import cn.quantgroup.xyqb.constant.enums.OccupationEnum;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.forbidden.AccessForbiddenValidator;
 import cn.quantgroup.xyqb.aspect.limit.PasswordFreeAccessValidator;

src/main/java/cn/quantgroup/xyqb/controller/internal/user/resp/UserFullResp.java

 package cn.quantgroup.xyqb.controller.internal.user.resp;
 
-import cn.quantgroup.user.enums.BizType;
+import cn.quantgroup.xyqb.constant.enums.BizType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/contact/dto/ContactSaveDto.java

 package cn.quantgroup.xyqb.controller.middleoffice.contact.dto;
 
-import cn.quantgroup.user.enums.BizType;
+import cn.quantgroup.xyqb.constant.enums.BizType;
 import lombok.Data;
 import org.springframework.validation.annotation.Validated;
 

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/contact/dto/ContactUpdateDto.java

 package cn.quantgroup.xyqb.controller.middleoffice.contact.dto;
 
-import cn.quantgroup.user.enums.Relation;
+import cn.quantgroup.xyqb.constant.enums.Relation;
 import lombok.Data;
 
 @Data

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/login/LoginModule.java

 package cn.quantgroup.xyqb.controller.middleoffice.login;
 
-import cn.quantgroup.user.enums.LoginType;
+import cn.quantgroup.xyqb.constant.enums.LoginType;
 import cn.quantgroup.xyqb.controller.middleoffice.common.VerifyStrategyFactory;
 import cn.quantgroup.xyqb.controller.middleoffice.common.VerifyTypeEnum;
 import cn.quantgroup.xyqb.entity.User;

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/userext/UserExtController.java

 package cn.quantgroup.xyqb.controller.middleoffice.userext;
 
-import cn.quantgroup.user.enums.OccupationEnum;
+import cn.quantgroup.xyqb.constant.enums.OccupationEnum;
 import cn.quantgroup.xyqb.controller.middleoffice.userext.req.UserExtReq;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserExtInfo;

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

 package cn.quantgroup.xyqb.entity;
 
 import cn.quantgroup.motan.retbean.XUserExtInfo;
-import cn.quantgroup.user.enums.*;
+import cn.quantgroup.xyqb.constant.enums.*;
 import lombok.Data;
 
 import javax.persistence.Column;

src/main/java/cn/quantgroup/xyqb/entity/UserSpouse.java

 package cn.quantgroup.xyqb.entity;
 
 
-import cn.quantgroup.user.enums.MaritalStatus;
+import cn.quantgroup.xyqb.constant.enums.MaritalStatus;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import lombok.*;
 

src/main/java/cn/quantgroup/xyqb/function/NonArgFunction.java

-package cn.quantgroup.xyqb.function;
-
-/**
- * Created by Miraculous on 2016/12/29.
- */
-public interface NonArgFunction {
-    void apply();
-}

src/main/java/cn/quantgroup/xyqb/function/OneArgFunction.java

-package cn.quantgroup.xyqb.function;
-
-/**
- * Created by Miraculous on 2016/12/29.
- */
-public interface OneArgFunction<S> {
-
-    void apply(S t);
-
-}

src/main/java/cn/quantgroup/xyqb/model/UserExtInfoRet.java

 package cn.quantgroup.xyqb.model;
 
-import cn.quantgroup.user.enums.*;
+import cn.quantgroup.xyqb.constant.enums.*;
 import cn.quantgroup.xyqb.entity.UserExtInfo;
 import lombok.Data;
 

src/main/java/cn/quantgroup/xyqb/model/UserSpouseRet.java

 package cn.quantgroup.xyqb.model;
 
-import cn.quantgroup.user.enums.MaritalStatus;
+import cn.quantgroup.xyqb.constant.enums.MaritalStatus;
 import cn.quantgroup.xyqb.entity.UserSpouse;
 import lombok.Data;
 

src/main/java/cn/quantgroup/xyqb/repository/IUserExtInfoRepository.java

 package cn.quantgroup.xyqb.repository;
 
-import cn.quantgroup.user.enums.OccupationEnum;
+import cn.quantgroup.xyqb.constant.enums.OccupationEnum;
 import cn.quantgroup.xyqb.entity.UserExtInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/cn/quantgroup/xyqb/service/register/impl/UserRegisterServiceImpl.java

 package cn.quantgroup.xyqb.service.register.impl;
 
-import cn.quantgroup.user.enums.RecordType;
+import cn.quantgroup.xyqb.constant.enums.RecordType;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserDeregisterRecord;

src/main/java/cn/quantgroup/xyqb/service/session/impl/SessionServiceImpl.java

 package cn.quantgroup.xyqb.service.session.impl;
 
-import cn.quantgroup.user.enums.RecordType;
+import cn.quantgroup.xyqb.constant.enums.RecordType;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.model.AuthBean;

src/main/java/cn/quantgroup/xyqb/service/user/impl/CleanDataServiceImp.java

 package cn.quantgroup.xyqb.service.user.impl;
 
-import cn.quantgroup.user.enums.OccupationEnum;
+import cn.quantgroup.xyqb.constant.enums.OccupationEnum;
 import cn.quantgroup.xyqb.entity.UserExtInfo;
 import cn.quantgroup.xyqb.repository.IUserExtInfoRepository;
 import cn.quantgroup.xyqb.service.user.CleanDataService;

src/main/java/cn/quantgroup/xyqb/service/user/impl/LoginRecordServiceImpl.java

 package cn.quantgroup.xyqb.service.user.impl;
 
-import cn.quantgroup.user.enums.RecordType;
+import cn.quantgroup.xyqb.constant.enums.RecordType;
 import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.LoginRecord;
 import cn.quantgroup.xyqb.repository.ILoginRecordRepository;

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserExtInfoServiceImpl.java

 package cn.quantgroup.xyqb.service.user.impl;
 
-import cn.quantgroup.user.enums.OccupationEnum;
+import cn.quantgroup.xyqb.constant.enums.OccupationEnum;
 import cn.quantgroup.xyqb.entity.UserExtInfo;
 import cn.quantgroup.xyqb.repository.IUserExtInfoRepository;
 import cn.quantgroup.xyqb.service.user.IUserExtInfoService;

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

 package cn.quantgroup.xyqb.service.user.impl;
 
-import cn.quantgroup.user.enums.IncomeRangeEnum;
-import cn.quantgroup.user.enums.LoginType;
+import cn.quantgroup.xyqb.constant.enums.IncomeRangeEnum;
+import cn.quantgroup.xyqb.constant.enums.LoginType;
 import cn.quantgroup.xyqb.Constants;
 import cn.quantgroup.xyqb.aspect.lock.RedisLock;
 import cn.quantgroup.xyqb.controller.IBaseController;