فهرست منبع

1、更改模块,移除app-admin,统一更改为app模块
2、更改公司搜索查询条件

rayson 1 سال پیش
والد
کامیت
93514b124c
100فایلهای تغییر یافته به همراه161 افزوده شده و 575 حذف شده
  1. 1 1
      citu-framework/citu-common/src/main/java/com/citu/framework/common/enums/UserTypeEnum.java
  2. 13 44
      citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/i18n/config/LocaleInterceptor.java
  3. 0 1
      citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/config/CituWebAutoConfiguration.java
  4. 0 3
      citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/config/WebProperties.java
  5. 1 1
      citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/core/filter/ApiRequestFilter.java
  6. 1 3
      citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/core/util/WebFrameworkUtils.java
  7. 0 66
      citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/appadmin/AppAdminPayOrderController.java
  8. 0 2
      citu-module-system/citu-module-system-biz/src/main/java/com/citu/module/system/service/oauth2/OAuth2TokenServiceImpl.java
  9. 1 3
      menduner/menduner-common/src/main/java/com/citu/module/menduner/common/util/LoginUserContext.java
  10. 0 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/package-info.java
  11. 0 40
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionAutoConfiguration.java
  12. 0 197
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionRule.java
  13. 0 18
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionRuleCustomizer.java
  14. 0 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/package-info.java
  15. 5 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/AppAreaController.java
  16. 1 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/vo/AppAreaChildrenRespVO.java
  17. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/vo/AppAreaHotRespVO.java
  18. 1 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/vo/AppAreaListReqVO.java
  19. 1 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/vo/AppAreaSimpleRespVO.java
  20. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/AppMdeAuthController.java
  21. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/enterprise/AppEnterpriseAuthLoginReqVO.java
  22. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/enterprise/AppEnterpriseAuthSmsLoginReqVO.java
  23. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/enterprise/AppEnterpriseAuthSwitchLoginReqVO.java
  24. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthCheckCodeReqVO.java
  25. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthLoginReqVO.java
  26. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthLoginRespVO.java
  27. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthSmsLoginReqVO.java
  28. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthSmsSendReqVO.java
  29. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthSmsValidateReqVO.java
  30. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthSocialLoginReqVO.java
  31. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthWeixinMiniAppLoginReqVO.java
  32. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeWeixinJsapiSignatureRespVO.java
  33. 5 13
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseController.java
  34. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterprisePostController.java
  35. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseRegisterController.java
  36. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseUserApplyController.java
  37. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseUserBindController.java
  38. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseUserLookController.java
  39. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseAddressRespVO.java
  40. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseBusinessRespVO.java
  41. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseClickReqVO.java
  42. 1 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseDetailRespVO.java
  43. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterprisePostRespVO.java
  44. 1 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseRespVO.java
  45. 1 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseSearchPageReqVO.java
  46. 1 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseUserBindRespVO.java
  47. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/apply/AppEnterpriseUserApplyReqVO.java
  48. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/apply/AppEnterpriseUserApplyRespVO.java
  49. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/auth/AppEnterpriseAuthRespVO.java
  50. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/look/AppEnterpriseUserLookPageReqVO.java
  51. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/look/AppEnterpriseUserLookRespVO.java
  52. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/register/AppEnterpriseRegisterReqVO.java
  53. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/register/AppEnterpriseRegisterRespVO.java
  54. 4 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/industry/AppIndustryController.java
  55. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/industry/vo/AppIndustryChildrenRespVO.java
  56. 1 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/industry/vo/AppIndustryListReqVO.java
  57. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/industry/vo/AppIndustrySimpleRespVO.java
  58. 5 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/interview/AppInterviewInviteController.java
  59. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/interview/vo/AppInterviewInvitePageReqVO.java
  60. 1 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/interview/vo/AppInterviewInviteRespVO.java
  61. 2 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/AppJobAdvertisedController.java
  62. 7 7
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/AppJobCvRelController.java
  63. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/hire/AppHireJobCvRelQueryReqVO.java
  64. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/hire/AppHireJobCvRelReqVO.java
  65. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/hire/AppHireJobCvRelRespVO.java
  66. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppEnterpriseJobHomeRespVO.java
  67. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedDetailRespVO.java
  68. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedHomeRespVO.java
  69. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedPageReqVO.java
  70. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedRespVO.java
  71. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedSearchPageReqVO.java
  72. 1 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedSimpleRespVO.java
  73. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobCvLookRespVO.java
  74. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobCvRelReqVO.java
  75. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/major/AppMajorController.java
  76. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/major/vo/AppMajorRespVO.java
  77. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/order/AppTradeOrderController.java
  78. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/order/vo/AppTradeOrderPageReqVO.java
  79. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/order/vo/AppTradeOrderRespVO.java
  80. 5 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/AppPersonController.java
  81. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/AppPersonRecordController.java
  82. 18 18
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/AppPersonResumeController.java
  83. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/cvattachment/AppCvAttachmentRespVO.java
  84. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/cvattachment/AppCvAttachmentSaveReqVO.java
  85. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/eduexp/AppEduExpRespVO.java
  86. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/eduexp/AppEduExpSaveReqVO.java
  87. 1 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/enterprise/PersonEnterpriseSubscribeReqVO.java
  88. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/job/AppJobInterestedRespVO.java
  89. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/job/AppJobInterestedSaveReqVO.java
  90. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/job/AppPersonJobFavoriteReqVO.java
  91. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/projectexp/AppProjectExpRespVO.java
  92. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/projectexp/AppProjectExpSaveReqVO.java
  93. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/record/AppPersonBrowseRecordPageReqVO.java
  94. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/record/AppPersonBrowseRecordPageRespVO.java
  95. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/resume/AppPersonAdvantageSaveReqVO.java
  96. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/resume/AppPersonInfoSaveReqVO.java
  97. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/resume/AppPersonInfoSaveSimpleReqVO.java
  98. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/skill/AppPersonSkillRespVO.java
  99. 1 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/skill/AppPersonSkillSaveReqVO.java
  100. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/trainexp/AppTrainExpRespVO.java

+ 1 - 1
citu-framework/citu-common/src/main/java/com/citu/framework/common/enums/UserTypeEnum.java

@@ -16,7 +16,7 @@ public enum UserTypeEnum implements IntArrayValuable {
 
     MEMBER(1, "会员"), // 面向 c 端,普通用户
     ADMIN(2, "管理员"), // 面向 b 端,管理后台
-    MEMBER_ADMIN(3,"会员管理员"); // 面向 c 端, 管理后台
+    ;
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(UserTypeEnum::getValue).toArray();
 
     /**

+ 13 - 44
citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/i18n/config/LocaleInterceptor.java

@@ -6,8 +6,6 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.http.HttpHeaders;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.support.RequestContextUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -21,45 +19,21 @@ import java.util.Locale;
 @Slf4j
 public class LocaleInterceptor implements HandlerInterceptor {
 
-//    @Override
-//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-//        String language = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
-//        Locale locale =  Locale.getDefault();
-//
-//        if (StringUtils.hasText(language)
-//                && !language.trim().equals(Locale.SIMPLIFIED_CHINESE.toString())
-//        ) {
-//            String[] langParts = language.split("_");
-//            if (langParts.length == 2) {
-//                locale = new Locale(langParts[0], langParts[1]);
-//            }
-//        }
-//
-//        LocaleContextHolder.setLocale(locale);
-//
-//        return true;
-//    }
-//
-//    @Override
-//    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) {
-//        LocaleContextHolder.resetLocaleContext();
-//    }
-
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-        if(WebFrameworkUtils.isRpcRequest(request)) {
+        if (WebFrameworkUtils.isRpcRequest(request)) {
             return true;
         }
-        LocaleResolver localeResolver = RequestContextUtils.getLocaleResolver(request);
-        if (localeResolver == null) {
-            throw new IllegalStateException("No LocaleResolver found: not in a DispatcherServlet request?");
-        }
+        //        LocaleResolver localeResolver = RequestContextUtils.getLocaleResolver(request);
+        //        if (localeResolver == null) {
+        //            throw new IllegalStateException("No LocaleResolver found: not in a DispatcherServlet request?");
+        //        }
 
         String language = request.getHeader(HttpHeaders.ACCEPT_LANGUAGE);
         Locale locale = null;
 
         if (StringUtils.hasText(language)) {
-            locale = parseAcceptLanguageHeader(language);
+            locale = parseAcceptLanguageHeader(language.replace("-", "_"));
             log.warn("解析请求国际化语言[{}]", locale);
         }
 
@@ -69,8 +43,8 @@ public class LocaleInterceptor implements HandlerInterceptor {
             log.warn("获取默认国际化语言[{}]", locale);
 
         }
-
-        localeResolver.setLocale(request, response, locale);
+        LocaleContextHolder.setLocale(locale, true);
+        //        localeResolver.setLocale(request, response, locale);
 
         return true;
     }
@@ -78,18 +52,13 @@ public class LocaleInterceptor implements HandlerInterceptor {
     private Locale parseAcceptLanguageHeader(String languageHeader) {
         String[] langParts = languageHeader.split(",");
         Locale locale = null;
-        double highestQuality = Double.MIN_VALUE;
 
-        for (String lang : langParts) {
-            String[] languagePriority = lang.trim().split(";q=");
-            String langTag = languagePriority[0];
-            double quality = (languagePriority.length > 1) ? Double.parseDouble(languagePriority[1]) : 1.0;
+        String[] languagePriority = langParts[0].trim().split(";q=");
+        String langTag = languagePriority[0];
 
-            Locale candidateLocale = parseLocale(langTag);
-            if (candidateLocale != null && quality > highestQuality) {
-                locale = candidateLocale;
-                highestQuality = quality;
-            }
+        Locale candidateLocale = parseLocale(langTag);
+        if (null != candidateLocale) {
+            locale = candidateLocale;
         }
         return locale;
     }

+ 0 - 1
citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/config/CituWebAutoConfiguration.java

@@ -58,7 +58,6 @@ public class CituWebAutoConfiguration implements WebMvcConfigurer {
     public void configurePathMatch(PathMatchConfigurer configurer) {
         configurePathMatch(configurer, webProperties.getAdminApi());
         configurePathMatch(configurer, webProperties.getAppApi());
-        configurePathMatch(configurer, webProperties.getAppAdminApi());
     }
 
     /**

+ 0 - 3
citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/config/WebProperties.java

@@ -20,9 +20,6 @@ public class WebProperties {
     private Api appApi = new Api("/app-api", "**.controller.app.**");
     @NotNull(message = "Admin API 不能为空")
     private Api adminApi = new Api("/admin-api", "**.controller.admin.**");
-    @NotNull(message = "APP Admin API 不能为空")
-    private Api appAdminApi = new Api("/app-admin-api", "**.controller.appadmin.**");
-
     @NotNull(message = "Admin UI 不能为空")
     private Ui adminUi;
 

+ 1 - 1
citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/core/filter/ApiRequestFilter.java

@@ -21,7 +21,7 @@ public abstract class ApiRequestFilter extends OncePerRequestFilter {
     protected boolean shouldNotFilter(HttpServletRequest request) {
         // 只过滤 API 请求的地址
         return !StrUtil.startWithAny(request.getRequestURI(), webProperties.getAdminApi().getPrefix(),
-                webProperties.getAppApi().getPrefix(), webProperties.getAppAdminApi().getPrefix());
+                webProperties.getAppApi().getPrefix());
     }
 
 }

+ 1 - 3
citu-framework/citu-spring-boot-starter-web/src/main/java/com/citu/framework/web/core/util/WebFrameworkUtils.java

@@ -105,9 +105,7 @@ public class WebFrameworkUtils {
         if (request.getServletPath().startsWith(properties.getAppApi().getPrefix())) {
             return UserTypeEnum.MEMBER.getValue();
         }
-        if (request.getServletPath().startsWith(properties.getAppAdminApi().getPrefix())) {
-            return UserTypeEnum.MEMBER_ADMIN.getValue();
-        }
+
         return null;
     }
 

+ 0 - 66
citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/appadmin/AppAdminPayOrderController.java

@@ -1,66 +0,0 @@
-package com.citu.module.pay.controller.appadmin;
-
-import com.citu.framework.common.pojo.CommonResult;
-import com.citu.framework.pay.core.enums.channel.PayChannelEnum;
-import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.pay.controller.admin.order.vo.PayOrderRespVO;
-import com.citu.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
-import com.citu.module.pay.controller.app.order.vo.AppPayOrderSubmitReqVO;
-import com.citu.module.pay.controller.app.order.vo.AppPayOrderSubmitRespVO;
-import com.citu.module.pay.convert.order.PayOrderConvert;
-import com.citu.module.pay.framework.pay.core.WalletPayClient;
-import com.citu.module.pay.service.order.PayOrderService;
-import com.google.common.collect.Maps;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Map;
-import java.util.Objects;
-
-import static com.citu.framework.common.pojo.CommonResult.success;
-import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
-import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
-import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
-
-@Tag(name = "App 管理端 - 支付订单")
-@RestController
-@RequestMapping("/pay/order")
-@Validated
-@Slf4j
-public class AppAdminPayOrderController {
-
-    @Resource
-    private PayOrderService payOrderService;
-
-    @GetMapping("/get")
-    @Operation(summary = "获得支付订单")
-    @PreAuthenticated
-    @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id) {
-        return success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrder(id)));
-    }
-
-    @PostMapping("/submit")
-    @PreAuthenticated
-    @Operation(summary = "提交支付订单")
-    public CommonResult<AppPayOrderSubmitRespVO> submitPayOrder(@RequestBody AppPayOrderSubmitReqVO reqVO) {
-        // 1. 钱包支付事,需要额外传 user_id 和 user_type
-        if (Objects.equals(reqVO.getChannelCode(), PayChannelEnum.WALLET.getCode())) {
-            Map<String, String> channelExtras = reqVO.getChannelExtras() == null ?
-                    Maps.newHashMapWithExpectedSize(2) : reqVO.getChannelExtras();
-            channelExtras.put(WalletPayClient.USER_ID_KEY, String.valueOf(getLoginUserId()));
-            channelExtras.put(WalletPayClient.USER_TYPE_KEY, String.valueOf(getLoginUserType()));
-            reqVO.setChannelExtras(channelExtras);
-        }
-
-        // 2. 提交支付
-        PayOrderSubmitRespVO respVO = payOrderService.submitOrder(reqVO, getClientIP());
-        return success(PayOrderConvert.INSTANCE.convert3(respVO));
-    }
-
-}

+ 0 - 2
citu-module-system/citu-module-system-biz/src/main/java/com/citu/module/system/service/oauth2/OAuth2TokenServiceImpl.java

@@ -250,8 +250,6 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
                     .put(LoginUser.INFO_KEY_DEPT_ID, StrUtil.toStringOrNull(user.getDeptId())).build();
         } else if (userType.equals(UserTypeEnum.MEMBER.getValue())) {
             // 注意:目前 Member 暂时不读取,可以按需实现
-            return Collections.emptyMap();
-        } else if (userType.equals(UserTypeEnum.MEMBER_ADMIN.getValue())) {
             if (MapUtil.isNotEmpty(userInfo)) {
                 return MapUtil.builder(userInfo).build();
             } else {

+ 1 - 3
menduner/menduner-common/src/main/java/com/citu/module/menduner/common/util/LoginUserContext.java

@@ -111,10 +111,8 @@ public class LoginUserContext {
      **/
     public static LoginUser checkUserTypeIsAdmin() {
         LoginUser loginUser = LoginUserContext.get();
-
         // 判断操作者是否有权限操作
-        if (!UserTypeEnum.MEMBER_ADMIN.getValue()
-                .equals(loginUser.getUserType())) {
+        if (!checkEnterprise(loginUser)) {
             throw exception(FORBIDDEN);
         }
         return loginUser;

+ 0 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/package-info.java

@@ -1,4 +0,0 @@
-/**
- * @author Rayson
- */
-package com.citu.module.menduner.system.config;

+ 0 - 40
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionAutoConfiguration.java

@@ -1,40 +0,0 @@
-package com.citu.module.menduner.system.config.permission;
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.citu.module.menduner.system.api.permission.MendunerPermissionApi;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.List;
-
-/**
- * 自定义的数据权限 AutoConfiguration
- *
- * @author Rayson
- */
-@Configuration
-//@ConditionalOnClass(LoginUser.class)
-//@ConditionalOnBean(value = CustomDataPermissionRuleCustomizer.class)
-public class CustomDataPermissionAutoConfiguration {
-
-    @Bean
-    public CustomDataPermissionRule customDataPermissionRule(MendunerPermissionApi permissionApi,
-                                                             List<CustomDataPermissionRuleCustomizer> customizers) {
-        // Cloud 专属逻辑:优先使用本地的 MendunerPermissionApi 实现类,而不是 Feign 调用
-        // 原因:在创建租户时,租户还没创建好,导致 Feign 调用获取数据权限时,报“租户不存在”的错误
-        try {
-            MendunerPermissionApi permissionApiImpl = SpringUtil.getBean("mendunerPermissionApi", MendunerPermissionApi.class);
-            if (permissionApiImpl != null) {
-                permissionApi = permissionApiImpl;
-            }
-        } catch (Exception ignored) {
-        }
-
-        // 创建 CustomDataPermissionRule 对象
-        CustomDataPermissionRule rule = new CustomDataPermissionRule(permissionApi);
-        // 补全表配置
-        customizers.forEach(customizer -> customizer.customize(rule));
-        return rule;
-    }
-
-}

+ 0 - 197
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionRule.java

@@ -1,197 +0,0 @@
-package com.citu.module.menduner.system.config.permission;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.citu.framework.common.enums.UserTypeEnum;
-import com.citu.framework.common.util.collection.CollectionUtils;
-import com.citu.framework.common.util.json.JsonUtils;
-import com.citu.framework.datapermission.core.rule.DataPermissionRule;
-import com.citu.framework.mybatis.core.dataobject.BaseDO;
-import com.citu.framework.mybatis.core.util.MyBatisUtils;
-import com.citu.framework.security.core.LoginUser;
-import com.citu.framework.security.core.util.SecurityFrameworkUtils;
-import com.citu.module.menduner.system.api.permission.MendunerPermissionApi;
-import com.citu.module.menduner.common.util.LoginUserContext;
-import com.citu.module.system.api.permission.dto.DataPermissionRespDTO;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import net.sf.jsqlparser.expression.*;
-import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
-import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
-import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
-import net.sf.jsqlparser.expression.operators.relational.InExpression;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import static com.citu.module.menduner.common.util.LoginUserContext.checkEnterprise;
-
-/**
- * @author Rayson
- * @description CustomDataPermissionRule
- * 基于自定义的 {@link DataPermissionRule} 数据权限规则实现
- * @create 2024/5/8 下午7:41
- **/
-@AllArgsConstructor
-@Slf4j
-public class CustomDataPermissionRule implements DataPermissionRule {
-
-    /**
-     * LoginUser 的 Context 缓存 Key
-     */
-    protected static final String CONTEXT_KEY = CustomDataPermissionRule.class.getSimpleName();
-
-    static final Expression EXPRESSION_NULL = new NullValue();
-    /**
-     * 基于数据的表字段配置 TODO 目前只支持一个数据权限字段,xx_id 和 user_id 不能同时配置。
-     * 如基于部门的数据编号字段是 自定义xx_id,基于店铺的数据编号字段是 shop_id,通过该配置自定义,如 group_id。
-     * <p>
-     * key:表名
-     * value:字段名
-     */
-    private final static Map<String, String> DATA_COLUMNS = new HashMap<>();
-    /**
-     * 基于用户的表字段配置
-     * 一般情况下,每个表的数据编号字段是 user_id,通过该配置自定义,如 admin_user_id。
-     * <p>
-     * key:表名
-     * value:字段名
-     */
-    private final static Map<String, String> USER_COLUMNS = new HashMap<>();
-    /**
-     * 所有表名,是 {@link #DATA_COLUMNS} 和 {@link #USER_COLUMNS} 的合集
-     */
-    private final static Set<String> TABLE_NAMES = new HashSet<>();
-
-    private final MendunerPermissionApi permissionApi;
-
-    @Override
-    public Set<String> getTableNames() {
-        return TABLE_NAMES;
-    }
-
-    @Override
-    public Expression getExpression(String tableName, Alias tableAlias) {
-        // 只有登陆用户的情况下,才进行数据权限的处理
-        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-        if (loginUser == null) {
-            return null;
-        }
-        // 只有MEMBER_ADMIN类型的用户,才进行数据权限的处理
-        if (ObjectUtil.notEqual(loginUser.getUserType(), UserTypeEnum.MEMBER_ADMIN.getValue())) {
-            return null;
-        }
-
-        if (!checkEnterprise(loginUser)) {
-            // 没有企业id
-            return null;
-        }
-        // 获得数据权限
-        DataPermissionRespDTO dataPermission = loginUser.getContext(CONTEXT_KEY, DataPermissionRespDTO.class);
-        // 从上下文中拿不到,则调用逻辑进行获取
-        if (dataPermission == null) {
-            Long enterpriseId = LoginUserContext.getEnterpriseId(loginUser);
-            dataPermission = permissionApi.getDataPermission(loginUser.getId(), enterpriseId).getCheckedData();
-            if (dataPermission == null) {
-                log.error("[getExpression][LoginUser({}) 获取数据权限为 null]", JsonUtils.toJsonString(loginUser));
-                throw new NullPointerException(String.format("LoginUser(%d) Table(%s/%s) 未返回数据权限",
-                        loginUser.getId(), tableName, tableAlias.getName()));
-            }
-            // 添加到上下文中,避免重复计算
-            loginUser.setContext(CONTEXT_KEY, dataPermission);
-        }
-
-        // 情况一,如果是 ALL 可查看全部,则无需拼接条件
-        if (dataPermission.getAll()) {
-            return null;
-        }
-
-        // 情况二,即不能查看部门,又不能查看自己,则说明 100% 无权限
-        if (CollUtil.isEmpty(dataPermission.getDataIds())
-                && Boolean.FALSE.equals(dataPermission.getSelf())) {
-            return new EqualsTo(null, null); // WHERE null = null,可以保证返回的数据为空
-        }
-
-        // 情况三,拼接 Dept 和 User 的条件,最后组合
-        Expression dataExpression = buildDeptExpression(tableName, tableAlias, dataPermission.getDataIds());
-        Expression userExpression = buildUserExpression(tableName, tableAlias, dataPermission.getSelf(), loginUser.getId());
-        if (dataExpression == null && userExpression == null) {
-            // TODO 芋艿:获得不到条件的时候,暂时不抛出异常,而是不返回数据
-            log.warn("[getExpression][LoginUser({}) Table({}/{}) DeptDataPermission({}) 构建的条件为空]",
-                    JsonUtils.toJsonString(loginUser), tableName, tableAlias, JsonUtils.toJsonString(dataPermission));
-            return EXPRESSION_NULL; // AND NULL
-        }
-
-        if (dataExpression == null) {
-            return userExpression;
-        }
-        if (userExpression == null) {
-            return dataExpression;
-        }
-        // // 目前,如果有指定数据 + 可查看自己,采用 OR 条件。即,WHERE (xx_id IN ? OR user_id = ?)
-        // return new Parenthesis(new OrExpression(dataExpression, userExpression));
-        // 改为 AND 条件。即,WHERE (xx_id IN ? and user_id = ?)
-        return new Parenthesis(new AndExpression(dataExpression, userExpression));
-    }
-
-    private Expression buildDeptExpression(String tableName, Alias tableAlias, Set<Long> dataIds) {
-        // 如果不存在配置,则无需作为条件
-        String columnName = DATA_COLUMNS.get(tableName);
-        if (StrUtil.isEmpty(columnName)) {
-            return null;
-        }
-        // 如果为空,则无条件
-        if (CollUtil.isEmpty(dataIds)) {
-            return null;
-        }
-        // 拼接条件
-        return new InExpression(MyBatisUtils.buildColumn(tableName, tableAlias, columnName),
-                new ExpressionList(CollectionUtils.convertList(dataIds, LongValue::new)));
-    }
-
-    private Expression buildUserExpression(String tableName, Alias tableAlias, Boolean self, Long userId) {
-        // 如果不查看自己,则无需作为条件
-        if (Boolean.FALSE.equals(self)) {
-            return null;
-        }
-        String columnName = USER_COLUMNS.get(tableName);
-        if (StrUtil.isEmpty(columnName)) {
-            return null;
-        }
-        // 拼接条件
-        return new EqualsTo(MyBatisUtils.buildColumn(tableName, tableAlias, columnName), new LongValue(userId));
-    }
-
-    // ==================== 添加配置 ====================
-    public void addDataColumn(Class<? extends BaseDO> entityClass, String columnName) {
-        String tableName = TableInfoHelper.getTableInfo(entityClass).getTableName();
-        addDataColumn(tableName, columnName);
-    }
-
-
-    public void addDataColumn(String tableName, String columnName) {
-        if (CharSequenceUtil.isEmpty(tableName)) {
-            return;
-        }
-        DATA_COLUMNS.put(tableName, columnName);
-        TABLE_NAMES.add(tableName);
-    }
-
-    public void addUserColumn(Class<? extends BaseDO> entityClass, String columnName) {
-        String tableName = TableInfoHelper.getTableInfo(entityClass).getTableName();
-        addUserColumn(tableName, columnName);
-    }
-
-    public void addUserColumn(String tableName, String columnName) {
-        if (CharSequenceUtil.isEmpty(tableName)) {
-            return;
-        }
-        USER_COLUMNS.put(tableName, columnName);
-        TABLE_NAMES.add(tableName);
-    }
-}

+ 0 - 18
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionRuleCustomizer.java

@@ -1,18 +0,0 @@
-package com.citu.module.menduner.system.config.permission;
-
-/**
- * @author Rayson
- * @description CustomDataPermissionRuleCustomizer {@link CustomDataPermissionRule} 的自定义配置接口
- **/
-@FunctionalInterface
-public interface CustomDataPermissionRuleCustomizer {
-
-    /**
-     * 自定义该权限规则
-     * 1. 调用 {@link CustomDataPermissionRule#addDataColumn(Class, String)} 方法,配置基于数据编号的过滤规则
-     * 2. 调用 {@link CustomDataPermissionRule#addUserColumn(Class, String)} 方法,配置基于用户编号的过滤规则
-     *
-     * @param rule 权限规则
-     */
-    void customize(CustomDataPermissionRule rule);
-}

+ 0 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/package-info.java

@@ -1,6 +0,0 @@
-/**
- * 基于企业的数据权限规则
- *
- * @author Rayson
- */
-package com.citu.module.menduner.system.config.permission;

+ 5 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/AppAreaController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/AppAreaController.java

@@ -1,11 +1,10 @@
-package com.citu.module.menduner.system.controller.app.area;
+package com.citu.module.menduner.system.controller.app.jobhunt.area;
 
 import com.citu.framework.common.pojo.CommonResult;
-import com.citu.module.menduner.system.controller.base.area.AreaListReqVO;
-import com.citu.module.menduner.system.controller.app.area.vo.AppAreaChildrenRespVO;
-import com.citu.module.menduner.system.controller.app.area.vo.AppAreaListReqVO;
-import com.citu.module.menduner.system.controller.app.area.vo.AppAreaSimpleRespVO;
-import com.citu.module.menduner.system.controller.app.area.vo.AppAreaHotRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.area.vo.AppAreaChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.area.vo.AppAreaHotRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.area.vo.AppAreaListReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.area.vo.AppAreaSimpleRespVO;
 import com.citu.module.menduner.system.service.area.AreaService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 1 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaChildrenRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/vo/AppAreaChildrenRespVO.java

@@ -1,6 +1,5 @@
-package com.citu.module.menduner.system.controller.app.area.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.area.vo;
 
-import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryChildrenRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaHotRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/vo/AppAreaHotRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.area.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.area.vo;
 
 import com.citu.module.menduner.system.controller.base.area.AreaHotRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaListReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/vo/AppAreaListReqVO.java

@@ -1,13 +1,8 @@
-package com.citu.module.menduner.system.controller.app.area.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.area.vo;
 
 import com.citu.module.menduner.system.controller.base.area.AreaListReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "menduner -  地区列表 Request VO")
 @Data

+ 1 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/area/vo/AppAreaSimpleRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/area/vo/AppAreaSimpleRespVO.java

@@ -1,12 +1,7 @@
-package com.citu.module.menduner.system.controller.app.area.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.area.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "menduner -  地区列表 Response VO")
 @Data

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/AppMdeAuthController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/AppMdeAuthController.java

@@ -1,14 +1,14 @@
-package com.citu.module.menduner.system.controller.app.auth;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth;
 
 import cn.hutool.core.util.StrUtil;
 import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.config.SecurityProperties;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
-import com.citu.module.menduner.system.controller.app.auth.vo.*;
+import com.citu.module.menduner.common.util.LoginUserContext;
+import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.*;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.service.auth.MdeAuthService;
-import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.system.api.social.SocialClientApi;
 import com.citu.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO;
 import io.swagger.v3.oas.annotations.Operation;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/appadmin/auth/vo/AppEnterpriseAuthLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/enterprise/AppEnterpriseAuthLoginReqVO.java

@@ -1,6 +1,6 @@
-package com.citu.module.menduner.system.controller.appadmin.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise;
 
-import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthLoginReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.AppMdeAuthLoginReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/enterprise/AppEnterpriseAuthSmsLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/enterprise/AppEnterpriseAuthSmsLoginReqVO.java

@@ -1,6 +1,6 @@
-package com.citu.module.menduner.system.controller.app.auth.enterprise;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise;
 
-import com.citu.module.menduner.system.controller.app.auth.vo.AppMdeAuthSmsLoginReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.AppMdeAuthSmsLoginReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/enterprise/AppEnterpriseAuthSwitchLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/enterprise/AppEnterpriseAuthSwitchLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.enterprise;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthCheckCodeReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthCheckCodeReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
 
 import com.citu.framework.common.validation.InEnum;
 import com.citu.framework.common.validation.Mobile;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
 
 import cn.hutool.core.util.StrUtil;
 import com.citu.framework.common.validation.InEnum;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthLoginRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthLoginRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthSmsLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthSmsLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
 
 import cn.hutool.core.util.StrUtil;
 import com.citu.framework.common.validation.InEnum;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthSmsSendReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthSmsSendReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
 
 import com.citu.framework.common.validation.InEnum;
 import com.citu.framework.common.validation.Mobile;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthSmsValidateReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthSmsValidateReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
 
 import com.citu.framework.common.validation.InEnum;
 import com.citu.framework.common.validation.Mobile;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthSocialLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthSocialLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
 
 import com.citu.framework.common.validation.InEnum;
 import com.citu.module.system.enums.social.SocialTypeEnum;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthWeixinMiniAppLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeAuthWeixinMiniAppLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeWeixinJsapiSignatureRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/auth/vo/AppMdeWeixinJsapiSignatureRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.auth.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 5 - 13
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseController.java

@@ -1,14 +1,12 @@
-package com.citu.module.menduner.system.controller.app.enterprise;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.auth.AppEnterpriseAuthRespVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.auth.AppAdminEnterpriseAuthRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.auth.AppEnterpriseAuthRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseClickReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseDetailRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseClickReqVO;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseDetailRespVO;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
 import com.citu.module.menduner.system.service.enterprise.auth.EnterpriseAuthService;
@@ -70,10 +68,4 @@ public class AppEnterpriseController {
     }
 
 
-    @GetMapping("/test")
-    @Operation(summary = "test")
-    public CommonResult<Boolean> test() {
-        return success(true);
-    }
-
 }

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterprisePostController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterprisePostController.java

@@ -1,7 +1,7 @@
-package com.citu.module.menduner.system.controller.app.enterprise;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterprisePostRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterprisePostRespVO;
 import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseRegisterController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseRegisterController.java

@@ -1,9 +1,9 @@
-package com.citu.module.menduner.system.controller.app.enterprise;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterReqVO;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.register.AppEnterpriseRegisterRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.register.AppEnterpriseRegisterReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.register.AppEnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.service.enterprise.register.EnterpriseRegisterService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseUserApplyController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseUserApplyController.java

@@ -1,9 +1,9 @@
-package com.citu.module.menduner.system.controller.app.enterprise;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyReqVO;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.apply.AppEnterpriseUserApplyRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.apply.AppEnterpriseUserApplyReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.apply.AppEnterpriseUserApplyRespVO;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseUserApplyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseUserBindController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseUserBindController.java

@@ -1,8 +1,8 @@
-package com.citu.module.menduner.system.controller.app.enterprise;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.AppEnterpriseUserBindRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseUserBindRespVO;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/AppEnterpriseUserLookController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/AppEnterpriseUserLookController.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseAddressRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseAddressRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo;
 
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseBusinessRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseBusinessRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo;
 
 import com.citu.module.menduner.system.controller.base.enterprise.business.EnterpriseBusinessRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseClickReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseClickReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseDetailRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseDetailRespVO.java

@@ -1,10 +1,7 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.List;
 

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterprisePostRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterprisePostRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo;
 
 import com.citu.module.menduner.system.controller.base.enterprise.post.EnterprisePostRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseRespVO.java

@@ -1,11 +1,10 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo;
 
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 @Schema(description = "企业信息 Response VO")
 @Data

+ 1 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseSearchPageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseSearchPageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo;
 
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,7 +20,6 @@ public class AppEnterpriseSearchPageReqVO extends PageParam {
     @Schema(description = "企业地点", example = "[]")
     private List<Long> areaIds;
 
-    @Deprecated
     @Schema(description = "企业类型(menduner_enterprise_type)", example = "[]")
     private String enterpriseType;
 

+ 1 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/AppEnterpriseUserBindRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/AppEnterpriseUserBindRespVO.java

@@ -1,11 +1,9 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo;
 
 import com.citu.module.menduner.system.controller.base.enterprise.bind.EnterpriseUserBindSimpleRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @Schema(description = "menduner - 企业用户 Response VO")
 @Data
 public class AppEnterpriseUserBindRespVO extends EnterpriseUserBindSimpleRespVO {

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/apply/AppEnterpriseUserApplyReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/apply/AppEnterpriseUserApplyReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo.apply;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.apply;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/apply/AppEnterpriseUserApplyRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/apply/AppEnterpriseUserApplyRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo.apply;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.apply;
 
 import com.citu.module.menduner.system.controller.base.enterprise.apply.EnterpriseUserApplyRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/auth/AppEnterpriseAuthRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/auth/AppEnterpriseAuthRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo.auth;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.auth;
 
 import com.citu.module.menduner.system.controller.base.enterprise.auth.EnterpriseAuthRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/look/AppEnterpriseUserLookPageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/look/AppEnterpriseUserLookPageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo.look;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.look;
 
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/look/AppEnterpriseUserLookRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/look/AppEnterpriseUserLookRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo.look;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.look;
 
 import com.citu.module.menduner.system.controller.base.enterprise.look.EnterpriseUserLookRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/register/AppEnterpriseRegisterReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/register/AppEnterpriseRegisterReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo.register;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.register;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/enterprise/vo/register/AppEnterpriseRegisterRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/register/AppEnterpriseRegisterRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.enterprise.vo.register;
+package com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.register;
 
 
 import com.citu.module.menduner.system.controller.base.enterprise.register.EnterpriseRegisterRespVO;

+ 4 - 5
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/AppIndustryController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/industry/AppIndustryController.java

@@ -1,10 +1,9 @@
-package com.citu.module.menduner.system.controller.app.industry;
+package com.citu.module.menduner.system.controller.app.jobhunt.industry;
 
 import com.citu.framework.common.pojo.CommonResult;
-import com.citu.module.menduner.system.controller.base.industry.IndustryListReqVO;
-import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryChildrenRespVO;
-import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustryListReqVO;
-import com.citu.module.menduner.system.controller.app.industry.vo.AppIndustrySimpleRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.industry.vo.AppIndustryChildrenRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.industry.vo.AppIndustryListReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.industry.vo.AppIndustrySimpleRespVO;
 import com.citu.module.menduner.system.service.industry.IndustryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/vo/AppIndustryChildrenRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/industry/vo/AppIndustryChildrenRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.industry.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.industry.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

+ 1 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/vo/AppIndustryListReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/industry/vo/AppIndustryListReqVO.java

@@ -1,13 +1,8 @@
-package com.citu.module.menduner.system.controller.app.industry.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.industry.vo;
 
 import com.citu.module.menduner.system.controller.base.industry.IndustryListReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "menduner -  行业信息 Request VO")
 @Data

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/industry/vo/AppIndustrySimpleRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/industry/vo/AppIndustrySimpleRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.industry.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.industry.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 5 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/interview/AppInterviewInviteController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/interview/AppInterviewInviteController.java

@@ -1,12 +1,11 @@
-package com.citu.module.menduner.system.controller.app.interview;
+package com.citu.module.menduner.system.controller.app.jobhunt.interview;
 
 import com.citu.framework.common.pojo.CommonResult;
-import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.app.interview.vo.AppInterviewInvitePageReqVO;
-import com.citu.module.menduner.system.controller.app.interview.vo.AppInterviewInviteRespVO;
-import com.citu.module.menduner.system.controller.appadmin.interview.vo.AppAdminInterviewInviteReqConsentVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInvitePageReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.interview.vo.AppInterviewInviteRespVO;
+import com.citu.module.menduner.system.controller.app.recruit.interview.vo.AppRecruitInterviewInviteReqConsentVO;
 import com.citu.module.menduner.system.service.interview.InterviewInviteService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -33,7 +32,7 @@ public class AppInterviewInviteController {
     @PostMapping("/consent")
     @Operation(summary = "同意邀约面试")
     public CommonResult<Boolean> cancellation
-            (@RequestBody @Valid AppAdminInterviewInviteReqConsentVO reqVO) {
+            (@RequestBody @Valid AppRecruitInterviewInviteReqConsentVO reqVO) {
         service.consent(reqVO);
         return success(true);
     }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/interview/vo/AppInterviewInvitePageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/interview/vo/AppInterviewInvitePageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.interview.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.interview.vo;
 
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/interview/vo/AppInterviewInviteRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/interview/vo/AppInterviewInviteRespVO.java

@@ -1,6 +1,5 @@
-package com.citu.module.menduner.system.controller.app.interview.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.interview.vo;
 
-import com.citu.module.menduner.system.controller.appadmin.person.vo.AppAdminPersonSimpleRespVO;
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.controller.base.interview.InterviewInviteRespVO;

+ 2 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/AppJobAdvertisedController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/AppJobAdvertisedController.java

@@ -1,10 +1,10 @@
-package com.citu.module.menduner.system.controller.app.job;
+package com.citu.module.menduner.system.controller.app.jobhunt.job;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.*;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
-import com.citu.module.menduner.system.controller.app.job.vo.*;
 import com.citu.module.menduner.system.service.job.JobAdvertisedService;
 import com.citu.module.menduner.system.service.job.JobIntegrationService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
 import java.util.List;
 
 import static com.citu.framework.common.pojo.CommonResult.success;

+ 7 - 7
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/AppJobCvRelController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/AppJobCvRelController.java

@@ -1,15 +1,15 @@
-package com.citu.module.menduner.system.controller.app.job;
+package com.citu.module.menduner.system.controller.app.jobhunt.job;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.app.job.hire.AppHireJobCvRelQueryReqVO;
-import com.citu.module.menduner.system.controller.app.job.hire.AppHireJobCvRelReqVO;
-import com.citu.module.menduner.system.controller.app.job.hire.AppHireJobCvRelRespVO;
-import com.citu.module.menduner.system.controller.app.job.vo.AppJobAdvertisedRespVO;
-import com.citu.module.menduner.system.controller.app.job.vo.AppJobCvLookRespVO;
-import com.citu.module.menduner.system.controller.app.job.vo.AppJobCvRelReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.job.hire.AppHireJobCvRelQueryReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.job.hire.AppHireJobCvRelReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.job.hire.AppHireJobCvRelRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobCvLookRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobCvRelReqVO;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.service.job.JobCvRelService;
 import com.citu.module.menduner.system.service.job.JobIntegrationService;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/hire/AppHireJobCvRelQueryReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/hire/AppHireJobCvRelQueryReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.hire;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.hire;
 
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/hire/AppHireJobCvRelReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/hire/AppHireJobCvRelReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.hire;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.hire;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/hire/AppHireJobCvRelRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/hire/AppHireJobCvRelRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.hire;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.hire;
 
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseSimpleRespVO;
 import com.citu.module.menduner.system.controller.base.job.HireJobCvRelRespVO;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppEnterpriseJobHomeRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppEnterpriseJobHomeRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.vo;
 
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedDetailRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedDetailRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.vo;
 
 
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedHomeRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedHomeRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedPageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedPageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.vo;
 
 
 import com.citu.framework.common.pojo.PageParam;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.vo;
 
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserContactRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedSearchPageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedSearchPageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.vo;
 
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 5
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobAdvertisedSimpleRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobAdvertisedSimpleRespVO.java

@@ -1,13 +1,9 @@
-package com.citu.module.menduner.system.controller.app.job.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.vo;
 
 import com.citu.module.menduner.system.controller.base.job.JobAdvertisedSimpleRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
 @Schema(description = "menduner - 首页-职位简易 Response VO")
 @Data
 public class AppJobAdvertisedSimpleRespVO extends JobAdvertisedSimpleRespVO {

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobCvLookRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobCvLookRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.vo;
 
 import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserSummaryRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/job/vo/AppJobCvRelReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/job/vo/AppJobCvRelReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.job.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.job.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 2 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/major/AppMajorController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/major/AppMajorController.java

@@ -1,7 +1,7 @@
-package com.citu.module.menduner.system.controller.app.major;
+package com.citu.module.menduner.system.controller.app.jobhunt.major;
 
 import com.citu.framework.common.pojo.CommonResult;
-import com.citu.module.menduner.system.controller.app.major.vo.AppMajorRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.major.vo.AppMajorRespVO;
 import com.citu.module.menduner.system.service.major.MajorService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/major/vo/AppMajorRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/major/vo/AppMajorRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.major.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.major.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/order/AppTradeOrderController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/order/AppTradeOrderController.java

@@ -1,10 +1,10 @@
-package com.citu.module.menduner.system.controller.app.order;
+package com.citu.module.menduner.system.controller.app.jobhunt.order;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.app.order.vo.AppTradeOrderPageReqVO;
-import com.citu.module.menduner.system.controller.app.order.vo.AppTradeOrderRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.order.vo.AppTradeOrderPageReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.order.vo.AppTradeOrderRespVO;
 import com.citu.module.menduner.system.service.order.TradeOrderService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/order/vo/AppTradeOrderPageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/order/vo/AppTradeOrderPageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.order.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.order.vo;
 
 import com.citu.module.menduner.system.controller.base.order.TradeOrderSimplePageReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/order/vo/AppTradeOrderRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/order/vo/AppTradeOrderRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.order.vo;
+package com.citu.module.menduner.system.controller.app.jobhunt.order.vo;
 
 import com.citu.module.menduner.system.controller.base.order.TradeSimpleRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 5 - 5
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/AppPersonController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/AppPersonController.java

@@ -1,14 +1,14 @@
-package com.citu.module.menduner.system.controller.app.person;
+package com.citu.module.menduner.system.controller.app.jobhunt.person;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
-import com.citu.module.menduner.system.controller.app.job.vo.AppJobAdvertisedRespVO;
-import com.citu.module.menduner.system.controller.app.person.enterprise.PersonEnterpriseSubscribeReqVO;
-import com.citu.module.menduner.system.controller.app.person.job.AppPersonJobFavoriteReqVO;
-import com.citu.module.menduner.system.controller.app.person.vo.AppPersonInfoRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.enterprise.PersonEnterpriseSubscribeReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.job.AppPersonJobFavoriteReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.vo.AppPersonInfoRespVO;
 import com.citu.module.menduner.system.convert.PersonConvert;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.service.job.JobIntegrationService;

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/AppPersonRecordController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/AppPersonRecordController.java

@@ -1,12 +1,12 @@
-package com.citu.module.menduner.system.controller.app.person;
+package com.citu.module.menduner.system.controller.app.jobhunt.person;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.record.AppPersonBrowseRecordPageReqVO;
 import com.citu.module.menduner.system.controller.base.person.record.PersonBrowseRecordRespVO;
-import com.citu.module.menduner.system.controller.app.enterprise.vo.look.AppEnterpriseUserLookPageReqVO;
-import com.citu.module.menduner.system.controller.app.person.record.AppPersonBrowseRecordPageReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.look.AppEnterpriseUserLookPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonBrowseRecordDO;
 import com.citu.module.menduner.system.service.enterprise.look.EnterpriseUserLookService;
 import com.citu.module.menduner.system.service.person.record.PersonBrowseRecordService;

+ 18 - 18
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/AppPersonResumeController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/AppPersonResumeController.java

@@ -1,24 +1,24 @@
-package com.citu.module.menduner.system.controller.app.person;
+package com.citu.module.menduner.system.controller.app.jobhunt.person;
 
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
-import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentRespVO;
-import com.citu.module.menduner.system.controller.app.person.cvattachment.AppCvAttachmentSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.eduexp.AppEduExpRespVO;
-import com.citu.module.menduner.system.controller.app.person.eduexp.AppEduExpSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.job.AppJobInterestedRespVO;
-import com.citu.module.menduner.system.controller.app.person.job.AppJobInterestedSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.projectexp.AppProjectExpRespVO;
-import com.citu.module.menduner.system.controller.app.person.projectexp.AppProjectExpSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.resume.AppPersonAdvantageSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.resume.AppPersonInfoSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.resume.AppPersonInfoSaveSimpleReqVO;
-import com.citu.module.menduner.system.controller.app.person.trainexp.AppTrainExpRespVO;
-import com.citu.module.menduner.system.controller.app.person.trainexp.AppTrainExpSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.skill.AppPersonSkillRespVO;
-import com.citu.module.menduner.system.controller.app.person.skill.AppPersonSkillSaveReqVO;
-import com.citu.module.menduner.system.controller.app.person.workexp.AppWorkExpRespVO;
-import com.citu.module.menduner.system.controller.app.person.workexp.AppWorkExpSaveReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.cvattachment.AppCvAttachmentRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.cvattachment.AppCvAttachmentSaveReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.eduexp.AppEduExpRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.eduexp.AppEduExpSaveReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.job.AppJobInterestedRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.job.AppJobInterestedSaveReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.projectexp.AppProjectExpRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.projectexp.AppProjectExpSaveReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.resume.AppPersonAdvantageSaveReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.resume.AppPersonInfoSaveReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.resume.AppPersonInfoSaveSimpleReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.trainexp.AppTrainExpRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.trainexp.AppTrainExpSaveReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.skill.AppPersonSkillRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.skill.AppPersonSkillSaveReqVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.workexp.AppWorkExpRespVO;
+import com.citu.module.menduner.system.controller.app.jobhunt.person.workexp.AppWorkExpSaveReqVO;
 import com.citu.module.menduner.system.convert.*;
 import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
 import com.citu.module.menduner.system.dal.dataobject.eduexp.EduExpDO;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/cvattachment/AppCvAttachmentRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/cvattachment/AppCvAttachmentRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.cvattachment;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.cvattachment;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/cvattachment/AppCvAttachmentSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/cvattachment/AppCvAttachmentSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.cvattachment;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.cvattachment;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/eduexp/AppEduExpRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/eduexp/AppEduExpRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.eduexp;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.eduexp;
 
 import com.citu.module.menduner.system.controller.base.eduexp.EduExpRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/eduexp/AppEduExpSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/eduexp/AppEduExpSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.eduexp;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.eduexp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/enterprise/PersonEnterpriseSubscribeReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/enterprise/PersonEnterpriseSubscribeReqVO.java

@@ -1,9 +1,8 @@
-package com.citu.module.menduner.system.controller.app.person.enterprise;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.enterprise;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Schema(description = "menduner 用户关注订阅企业 Request VO")

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/job/AppJobInterestedRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/job/AppJobInterestedRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.job;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.job;
 
 import com.citu.module.menduner.system.controller.base.job.JobInterestedRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/job/AppJobInterestedSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/job/AppJobInterestedSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.job;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.job;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/job/AppPersonJobFavoriteReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/job/AppPersonJobFavoriteReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.job;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.job;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/projectexp/AppProjectExpRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/projectexp/AppProjectExpRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.projectexp;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.projectexp;
 
 import com.citu.module.menduner.system.controller.base.projectexp.ProjectExpRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/projectexp/AppProjectExpSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/projectexp/AppProjectExpSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.projectexp;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.projectexp;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/record/AppPersonBrowseRecordPageReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/record/AppPersonBrowseRecordPageReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.record;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.record;
 
 import com.citu.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/record/AppPersonBrowseRecordPageRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/record/AppPersonBrowseRecordPageRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.record;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.record;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/resume/AppPersonAdvantageSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/resume/AppPersonAdvantageSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.resume;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.resume;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/resume/AppPersonInfoSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/resume/AppPersonInfoSaveReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.resume;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.resume;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/resume/AppPersonInfoSaveSimpleReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/resume/AppPersonInfoSaveSimpleReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.resume;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.resume;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/skill/AppPersonSkillRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/skill/AppPersonSkillRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.skill;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.skill;
 
 import com.citu.module.menduner.system.controller.base.person.skill.PersonSkillRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

+ 1 - 2
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/skill/AppPersonSkillSaveReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/skill/AppPersonSkillSaveReqVO.java

@@ -1,9 +1,8 @@
-package com.citu.module.menduner.system.controller.app.person.skill;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.skill;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Schema(description = "menduner - 人才技能保存 Request VO")

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/trainexp/AppTrainExpRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/person/trainexp/AppTrainExpRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.person.trainexp;
+package com.citu.module.menduner.system.controller.app.jobhunt.person.trainexp;
 
 import com.citu.module.menduner.system.controller.base.trainexp.TrainExpRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است