Przeglądaj źródła

1、修改部分国际化参数效验提示

rayson 1 rok temu
rodzic
commit
ad6f0161e2
26 zmienionych plików z 193 dodań i 82 usunięć
  1. 27 1
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java
  2. 4 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpSaveReqVO.java
  3. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserSaveReqVO.java
  4. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserUpdatePasswordReqVO.java
  5. 5 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthCheckCodeReqVO.java
  6. 6 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthLoginReqVO.java
  7. 6 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthSmsLoginReqVO.java
  8. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthSmsSendReqVO.java
  9. 4 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthSmsValidateReqVO.java
  10. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthSocialLoginReqVO.java
  11. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/vo/AppMdeAuthWeixinMiniAppLoginReqVO.java
  12. 7 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/AppPersonController.java
  13. 4 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/eduexp/AppEduExpSaveReqVO.java
  14. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/test/TestReqVO.java
  15. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserCreatePhonePCReqVO.java
  16. 6 6
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserResetPasswordReqVO.java
  17. 5 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserUpdatePasswordReqVO.java
  18. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserUpdatePhoneByWeixinReqVO.java
  19. 7 7
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserUpdatePhoneReqVO.java
  20. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/message/MdeVisitsSendMessage.java
  21. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/favorite/PersonJobFavoriteService.java
  22. 3 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/favorite/PersonJobFavoriteServiceImpl.java
  23. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/subscribe/PersonEnterpriseSubscribeService.java
  24. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/subscribe/PersonEnterpriseSubscribeServiceImpl.java
  25. 43 1
      menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties
  26. 44 1
      menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

+ 27 - 1
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -17,7 +17,7 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_INDUSTRY_NOT_EXISTS = new ErrorCode(1_100_002_001, "行业信息不存在");
 
     // ========== 职位信息 1_100_003_000 ==========
-    ErrorCode MDE_POSITION_NOT_EXISTS = new ErrorCode(1_100_002_003, "职位信息不存在");
+    ErrorCode MDE_POSITION_NOT_EXISTS = new ErrorCode(1_100_003_001, "职位信息不存在");
 
     // ========== 地区 1_100_004_000 ==========
     ErrorCode MDE_AREA_NOT_EXISTS = new ErrorCode(1_100_004_001, "地区不存在");
@@ -28,6 +28,10 @@ public interface ErrorCodeConstants {
 
     // ========== 教育经历 1_100_006_000 ==========
     ErrorCode MDE_EDU_EXP_NOT_EXISTS = new ErrorCode(1_100_006_001, "教育经历不存在");
+    ErrorCode MDE_EDU_EXP_EDUCATION_TYPE_NOT_EXISTS = new ErrorCode(1_100_006_002, "未选择学历");
+    ErrorCode MDE_EDU_EXP_EDUCATION_SYSTEM_TYPE_NOT_EXISTS = new ErrorCode(1_100_006_003, "未选择学制类型");
+    ErrorCode MDE_EDU_EXP_START_TIME_NOT_EXISTS = new ErrorCode(1_100_006_004, "未选择在校开始日期");
+    ErrorCode MDE_EDU_EXP_END_TIME_NOT_EXISTS = new ErrorCode(1_100_006_005, "未选择在校结束日期");
 
     // ========== 求职意向 1_100_007_000 ==========
     ErrorCode MDE_JOB_INTERESTED_NOT_EXISTS = new ErrorCode(1_100_007_001, "求职意向不存在");
@@ -55,6 +59,9 @@ public interface ErrorCodeConstants {
 
     // ========== 访问量 1_100_015_000 ==========
     ErrorCode MDE_VISITS_NOT_EXISTS = new ErrorCode(1_100_015_001, "访问量不存在");
+    ErrorCode MDE_VISITS_TYPE_NOT_EXISTS = new ErrorCode(1_100_015_002, "业务类型不存在");
+    ErrorCode MDE_VISITS_BUSINESS_ID_NOT_EXISTS = new ErrorCode(1_100_015_003, "业务id不存在");
+    ErrorCode MDE_VISITS_DATE_NOT_EXISTS = new ErrorCode(1_100_015_004, "访问日期不存在");
 
     // ========== 用户登录 1_200_001_000 ==========
     ErrorCode MDE_USER_NOT_EXISTS = new ErrorCode(1_200_001_001, "用户不存在");
@@ -64,10 +71,20 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_USER_USERNAME_EXISTS = new ErrorCode(1_200_001_004, "用户账号已经存在");
     ErrorCode MDE_USER_MOBILE_EXISTS = new ErrorCode(1_200_001_005, "手机号已经存在");
     ErrorCode MDE_USER_EMAIL_EXISTS = new ErrorCode(1_200_001_006, "邮箱已经存在");
+    ErrorCode MDE_USER_MOBILE_NOT_NULL = new ErrorCode(1_200_001_007, "手机号不能为空");
     ErrorCode MDE_USER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_200_001_008, "导入用户数据不能为空!");
     ErrorCode MDE_USER_PASSWORD_FAILED = new ErrorCode(1_200_001_009, "用户密码校验失败");
     ErrorCode MDE_USER_IS_DISABLE = new ErrorCode(1_200_001_010, "名字为【{}】的用户已被禁用");
     ErrorCode MDE_USER_COUNT_MAX = new ErrorCode(1_200_001_011, "创建用户失败,原因:超过租户最大租户配额({})!");
+    ErrorCode MDE_USER_NEW_PASSWORD_NOT_NULL = new ErrorCode(1_200_001_012, "新密码不能为空");
+    ErrorCode MDE_USER_CODE_NOT_NULL = new ErrorCode(1_200_001_013, "手机验证码不能为空");
+    ErrorCode MDE_USER_CODE_LENGTH = new ErrorCode(1_200_001_014, "手机验证码长度为 4-6 位");
+    ErrorCode MDE_USER_PHONE_LENGTH = new ErrorCode(1_200_001_015, "手机号码长度为 8-11 位");
+    ErrorCode MDE_USER_CODE_NUMBER = new ErrorCode(1_200_001_016, "手机验证码必须都是数字");
+    ErrorCode MDE_USER_PASSWORD_LENGTH = new ErrorCode(1_200_001_017, "密码长度为 4-16 位");
+    ErrorCode MDE_USER_ID_NOT_NULL = new ErrorCode(1_200_001_018, "用户编号不能为空");
+    ErrorCode MDE_USER_PASSWORD_NOT_NULL = new ErrorCode(1_200_001_019, "密码不能为空");
+
 
     // ========== AUTH 模块 1_200_002_000 ==========
     ErrorCode MDE_AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1_200_002_001, "登录失败,账号密码不正确");
@@ -79,6 +96,15 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_AUTH_THIRD_LOGIN_NOT_BIND = new ErrorCode(1_002_000_005, "未绑定账号,需要进行绑定");
     ErrorCode MDE_AUTH_TOKEN_EXPIRED = new ErrorCode(1_002_000_006, "Token 已经过期");
     ErrorCode MDE_AUTH_MOBILE_NOT_EXISTS = new ErrorCode(1_002_000_007, "手机号不存在");
+    ErrorCode MDE_AUTH_SEND_SMS_SCENE_NOT_NULL = new ErrorCode(1_002_000_008, "发送场景不能为空");
+    ErrorCode MDE_AUTH_PHONE_CODE_NOT_NULL = new ErrorCode(1_002_000_009, "手机code不能为空");
+    ErrorCode MDE_AUTH_LOGIN_CODE_ERROR = new ErrorCode(1_002_000_010, "登录code不能为空");
+    ErrorCode MDE_AUTH_LOGIN_STATE_NOT_NULL = new ErrorCode(1_002_000_011, "state不能为空");
+    ErrorCode MDE_AUTH_AUTHORIZATION_CODE_NOT_NULL = new ErrorCode(1_002_000_012, "授权码不能为空");
+    ErrorCode MDE_AUTH_SOCIAL_TYPE_NOT_NULL = new ErrorCode(1_002_000_013, "社交平台的类型不能为空");
+    ErrorCode MDE_AUTH_CAPTCHA_CODE_NOT_NULL = new ErrorCode(1_002_000_014, "验证码不能为空");
+
+
 
     // ========== 角色模块 1_200_003_000 ==========
     ErrorCode MDE_ROLE_NOT_EXISTS = new ErrorCode(1_200_003_001, "角色不存在");

+ 4 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/eduexp/vo/EduExpSaveReqVO.java

@@ -22,11 +22,11 @@ public class EduExpSaveReqVO {
     @Schema(description = "学校名称(没有选择系统企业可自定义)", example = "李四")
     private String schoolName;
 
-    @NotNull(message = "未选择学历")
+    @NotNull(message = "{1_100_006_002}")
     @Schema(description = "学历(0初中及以下 | 1中专/中技 | 2高中 | 3大专 | 4 本科 5 硕士 6 博士 99 其他)", example = "2")
     private Integer educationType;
 
-    @NotNull(message = "未选择学制类型")
+    @NotNull(message = "{1_100_006_003}")
     @Schema(description = "学制类型(0 全日制 | 1 非全日制)", example = "1")
     private Integer educationSystemType;
 
@@ -36,11 +36,11 @@ public class EduExpSaveReqVO {
     @Schema(description = "专业名称(没有选择系统企业可自定义)")
     private String major;
 
-    @NotNull(message = "未填写在校开始日期")
+    @NotNull(message = "{1_100_006_004}")
     @Schema(description = "在校开始日期")
     private LocalDateTime startTime;
 
-    @NotNull(message = "未填写在校结束日期")
+    @NotNull(message = "{1_100_006_005}")
     @Schema(description = "在校结束时间")
     private LocalDateTime endTime;
 

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserSaveReqVO.java

@@ -20,7 +20,7 @@ public class MdeUserSaveReqVO {
     private String username;
 
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "密码不能为空")
+    @NotEmpty(message = "{1_200_001_019}")
     private String password;
 
     @Schema(description = "用户邮箱")

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/user/vo/MdeUserUpdatePasswordReqVO.java

@@ -12,12 +12,12 @@ import javax.validation.constraints.NotNull;
 public class MdeUserUpdatePasswordReqVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotNull(message = "用户编号不能为空")
+    @NotNull(message = "{1_200_001_018}")
     private Long id;
 
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
-    @NotEmpty(message = "密码不能为空")
-    @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
+    @NotEmpty(message = "{1_200_001_012}")
+    @Length(min = 4, max = 16, message = "{1_200_001_017}")
     private String password;
 
 }

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

@@ -23,18 +23,18 @@ import javax.validation.constraints.Pattern;
 public class AppMdeAuthCheckCodeReqVO {
 
     @Schema(description = "手机号", example = "15601691234")
-    @NotBlank(message = "手机号不能为空")
+    @NotBlank(message = "{1_200_001_007}")
     @Mobile
     private String phone;
 
     @Schema(description = "手机验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotBlank(message = "手机验证码不能为空")
-    @Length(min = 4, max = 6, message = "手机验证码长度为 4-6 位")
-    @Pattern(regexp = "^[0-9]+$", message = "手机验证码必须都是数字")
+    @NotBlank(message = "{1_200_001_013}")
+    @Length(min = 4, max = 6, message = "{1_200_001_014}")
+    @Pattern(regexp = "^[0-9]+$", message = "{1_200_001_016}")
     private String code;
 
     @Schema(description = "发送场景,对应 SmsSceneEnum 枚举", example = "1")
-    @NotNull(message = "发送场景不能为空")
+    @NotNull(message = "{1_002_000_008}")
     @InEnum(SmsSceneEnum.class)
     private Integer scene;
 

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

@@ -22,13 +22,13 @@ import javax.validation.constraints.NotEmpty;
 public class AppMdeAuthLoginReqVO {
 
     @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300")
-    @NotEmpty(message = "手机号不能为空")
+    @NotEmpty(message = "{1_200_001_007}")
     @Mobile
     private String phone;
 
     @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
-    @NotEmpty(message = "密码不能为空")
-    @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
+    @NotEmpty(message = "{1_200_001_019}")
+    @Length(min = 4, max = 16, message = "{1_200_001_014}")
     private String password;
 
 
@@ -36,7 +36,7 @@ public class AppMdeAuthLoginReqVO {
 
     @Schema(description = "验证码,验证码开启时,需要传递", requiredMode = Schema.RequiredMode.REQUIRED,
             example = "PfcH6mgr8tpXuMWFjvW6YVaqrswIuwmWI5dsVZSg7sGpWtDCUbHuDEXl3cFB1+VvCC/rAkSwK8Fad52FSuncVg==")
-    @NotEmpty(message = "验证码不能为空", groups = CodeEnableGroup.class)
+    @NotEmpty(message = "{1_002_000_014}", groups = CodeEnableGroup.class)
     private String captchaVerification;
 
     // ========== 绑定社交登录时,需要传递如下参数 ==========
@@ -51,12 +51,12 @@ public class AppMdeAuthLoginReqVO {
     @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62")
     private String socialState;
 
-    @AssertTrue(message = "授权码不能为空")
+    @AssertTrue(message = "{1_002_000_012}")
     public boolean isSocialCodeValid() {
         return socialType == null || StrUtil.isNotEmpty(socialCode);
     }
 
-    @AssertTrue(message = "授权 state 不能为空")
+    @AssertTrue(message = "{1_002_000_011}")
     public boolean isSocialState() {
         return socialType == null || StrUtil.isNotEmpty(socialState);
     }

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

@@ -23,14 +23,14 @@ import javax.validation.constraints.Pattern;
 public class AppMdeAuthSmsLoginReqVO {
 
     @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300")
-    @NotEmpty(message = "手机号不能为空")
+    @NotEmpty(message = "{1_200_001_007}")
     @Mobile
     private String phone;
 
     @Schema(description = "手机验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotEmpty(message = "手机验证码不能为空")
-    @Length(min = 4, max = 6, message = "手机验证码长度为 4-6 位")
-    @Pattern(regexp = "^[0-9]+$", message = "手机验证码必须都是数字")
+    @NotEmpty(message = "{1_200_001_013}")
+    @Length(min = 4, max = 6, message = "{1_200_001_014}")
+    @Pattern(regexp = "^[0-9]+$", message = "{1_200_001_016}")
     private String code;
 
     // ========== 绑定社交登录时,需要传递如下参数 ==========
@@ -45,12 +45,12 @@ public class AppMdeAuthSmsLoginReqVO {
     @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62")
     private String socialState;
 
-    @AssertTrue(message = "授权码不能为空")
+    @AssertTrue(message = "{1_002_000_012}")
     public boolean isSocialCodeValid() {
         return socialType == null || StrUtil.isNotEmpty(socialCode);
     }
 
-    @AssertTrue(message = "授权 state 不能为空")
+    @AssertTrue(message = "{1_002_000_011}")
     public boolean isSocialState() {
         return socialType == null || StrUtil.isNotEmpty(socialState);
     }

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

@@ -19,7 +19,7 @@ public class AppMdeAuthSmsSendReqVO {
     private String phone;
 
     @Schema(description = "发送场景,对应 SmsSceneEnum 枚举", example = "1")
-    @NotNull(message = "发送场景不能为空")
+    @NotNull(message = "{1_002_000_008}")
     @InEnum(SmsSceneEnum.class)
     private Integer scene;
 

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

@@ -22,14 +22,14 @@ public class AppMdeAuthSmsValidateReqVO {
     private String phone;
 
     @Schema(description = "发送场景,对应 SmsSceneEnum 枚举", example = "1")
-    @NotNull(message = "发送场景不能为空")
+    @NotNull(message = "{1_002_000_008}")
     @InEnum(SmsSceneEnum.class)
     private Integer scene;
 
     @Schema(description = "手机验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotEmpty(message = "手机验证码不能为空")
-    @Length(min = 4, max = 6, message = "手机验证码长度为 4-6 位")
-    @Pattern(regexp = "^[0-9]+$", message = "手机验证码必须都是数字")
+    @NotEmpty(message = "{1_200_001_013}")
+    @Length(min = 4, max = 6, message = "{1_200_001_014}")
+    @Pattern(regexp = "^[0-9]+$", message = "{1_200_001_016}")
     private String code;
 
 }

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

@@ -20,15 +20,15 @@ public class AppMdeAuthSocialLoginReqVO {
 
     @Schema(description = "社交平台的类型,参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @InEnum(SocialTypeEnum.class)
-    @NotNull(message = "社交平台的类型不能为空")
+    @NotNull(message = "{1_002_000_013}")
     private Integer type;
 
     @Schema(description = "授权码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotEmpty(message = "授权码不能为空")
+    @NotEmpty(message = "{1_002_000_012}")
     private String code;
 
     @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62")
-    @NotEmpty(message = "state 不能为空")
+    @NotEmpty(message = "{1_002_000_011}")
     private String state;
 
 }

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

@@ -16,15 +16,15 @@ import javax.validation.constraints.NotEmpty;
 public class AppMdeAuthWeixinMiniAppLoginReqVO {
 
     @Schema(description = "手机 code,小程序通过 wx.getPhoneNumber 方法获得", requiredMode = Schema.RequiredMode.REQUIRED, example = "hello")
-    @NotEmpty(message = "手机 code 不能为空")
+    @NotEmpty(message = "{1_002_000_009}")
     private String phoneCode;
 
     @Schema(description = "登录 code,小程序通过 wx.login 方法获得", requiredMode = Schema.RequiredMode.REQUIRED, example = "word")
-    @NotEmpty(message = "登录 code 不能为空")
+    @NotEmpty(message = "{1_002_000_010}")
     private String loginCode;
 
     @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "9b2ffbc1-7425-4155-9894-9d5c08541d62")
-    @NotEmpty(message = "state 不能为空")
+    @NotEmpty(message = "{1_002_000_011}")
     private String state;
 
 }

+ 7 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/person/AppPersonController.java

@@ -18,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 
@@ -49,7 +50,7 @@ public class AppPersonController {
     @PreAuthenticated
     @PostMapping("/job/favorite")
     @Operation(summary = "用户收藏职位")
-    public CommonResult<Boolean> favorite(PersonJobFavoriteReqVO reqVO) {
+    public CommonResult<Boolean> favorite(@Valid @RequestBody PersonJobFavoriteReqVO reqVO) {
         Boolean result = jobFavoriteService.favorite(reqVO);
         return success(result);
     }
@@ -57,7 +58,7 @@ public class AppPersonController {
     @PreAuthenticated
     @PostMapping("/enterprise/subscribe")
     @Operation(summary = "用户关注订阅企业")
-    public CommonResult<Boolean> subscribe(PersonEnterpriseSubscribeReqVO reqVO) {
+    public CommonResult<Boolean> subscribe(@Valid @RequestBody PersonEnterpriseSubscribeReqVO reqVO) {
         Boolean result = enterpriseSubscribeService.subscribe(reqVO);
         return success(result);
     }
@@ -65,16 +66,16 @@ public class AppPersonController {
     @PreAuthenticated
     @DeleteMapping("/job/unfavorite")
     @Operation(summary = "用户取消收藏职位")
-    public CommonResult<Boolean> unFavorite(PersonJobFavoriteReqVO reqVO) {
-        Boolean result = jobFavoriteService.unFavorite(reqVO);
+    public CommonResult<Boolean> unFavorite(@RequestParam("jobId") Long jobId) {
+        Boolean result = jobFavoriteService.unFavorite(jobId);
         return success(result);
     }
 
     @PreAuthenticated
     @DeleteMapping("/enterprise/unsubscribe")
     @Operation(summary = "用户取消关注订阅企业")
-    public CommonResult<Boolean> unsubscribe(PersonEnterpriseSubscribeReqVO reqVO) {
-        Boolean result = enterpriseSubscribeService.unSubscribe(reqVO);
+    public CommonResult<Boolean> unsubscribe(Long enterpriseId) {
+        Boolean result = enterpriseSubscribeService.unSubscribe(enterpriseId);
         return success(result);
     }
 

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

@@ -19,11 +19,11 @@ public class AppEduExpSaveReqVO {
     @Schema(description = "学校名称(没有选择系统企业可自定义)", example = "李四")
     private String schoolName;
 
-    @NotNull(message = "未选择学历")
+    @NotNull(message = "{1_100_006_002}")
     @Schema(description = "学历(0初中及以下 | 1中专/中技 | 2高中 | 3大专 | 4 本科 5 硕士 6 博士 99 其他)", example = "2")
     private Integer educationType;
 
-    @NotNull(message = "未选择学制类型")
+    @NotNull(message = "{1_100_006_003}")
     @Schema(description = "学制类型(0 全日制 | 1 非全日制)", example = "1")
     private Integer educationSystemType;
 
@@ -33,11 +33,11 @@ public class AppEduExpSaveReqVO {
     @Schema(description = "专业名称(没有选择系统企业可自定义)")
     private String major;
 
-    @NotNull(message = "未选择在校开始日期")
+    @NotNull(message = "{1_100_006_004}")
     @Schema(description = "在校开始日期")
     private LocalDateTime startTime;
 
-    @NotNull(message = "未选择在校结束日期")
+    @NotNull(message = "{1_100_006_005}")
     @Schema(description = "在校结束时间")
     private LocalDateTime endTime;
 

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/test/TestReqVO.java

@@ -9,6 +9,6 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class TestReqVO {
 
-    @NotBlank(message = "{person.name}")
+    @NotBlank(message = "{1_100_006_005}")
     private String name;
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserCreatePhonePCReqVO.java

@@ -17,7 +17,7 @@ import javax.validation.constraints.NotBlank;
 public class AppMdeUserCreatePhonePCReqVO {
 
     @Schema(description = "手机号",requiredMode = Schema.RequiredMode.REQUIRED,example = "15878962356")
-    @NotBlank(message = "手机号不能为空")
+    @NotBlank(message = "{1_200_001_007}")
     @Mobile
     private String phone;
 

+ 6 - 6
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserResetPasswordReqVO.java

@@ -20,18 +20,18 @@ import javax.validation.constraints.Pattern;
 public class AppMdeUserResetPasswordReqVO {
 
     @Schema(description = "新密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
-    @NotEmpty(message = "新密码不能为空")
-    @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
+    @NotEmpty(message = "{1_200_001_012}")
+    @Length(min = 4, max = 16, message = "{1_200_001_017}")
     private String password;
 
     @Schema(description = "手机验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotEmpty(message = "手机验证码不能为空")
-    @Length(min = 4, max = 6, message = "手机验证码长度为 4-6 位")
-    @Pattern(regexp = "^[0-9]+$", message = "手机验证码必须都是数字")
+    @NotEmpty(message = "{1_200_001_013}")
+    @Length(min = 4, max = 6, message = "{1_200_001_014}")
+    @Pattern(regexp = "^[0-9]+$", message = "{1_200_001_016}")
     private String code;
 
     @Schema(description = "手机号",requiredMode = Schema.RequiredMode.REQUIRED,example = "15878962356")
-    @NotBlank(message = "手机号不能为空")
+    @NotBlank(message = "{1_200_001_007}")
     @Mobile
     private String phone;
 

+ 5 - 5
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserUpdatePasswordReqVO.java

@@ -18,14 +18,14 @@ import javax.validation.constraints.Pattern;
 public class AppMdeUserUpdatePasswordReqVO {
 
     @Schema(description = "新密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
-    @NotEmpty(message = "新密码不能为空")
-    @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
+    @NotEmpty(message = "{1_200_001_012}")
+    @Length(min = 4, max = 16, message = "{1_200_001_017}")
     private String password;
 
     @Schema(description = "手机验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotEmpty(message = "手机验证码不能为空")
-    @Length(min = 4, max = 6, message = "手机验证码长度为 4-6 位")
-    @Pattern(regexp = "^[0-9]+$", message = "手机验证码必须都是数字")
+    @NotEmpty(message = "{1_200_001_013}")
+    @Length(min = 4, max = 6, message = "{1_200_001_014}")
+    @Pattern(regexp = "^[0-9]+$", message = "{1_200_001_016}")
     private String code;
 
 }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserUpdatePhoneByWeixinReqVO.java

@@ -11,7 +11,7 @@ public class AppMdeUserUpdatePhoneByWeixinReqVO {
 
     @Schema(description = "手机 code,小程序通过 wx.getPhoneNumber 方法获得",
             requiredMode = Schema.RequiredMode.REQUIRED, example = "hello")
-    @NotEmpty(message = "手机 code 不能为空")
+    @NotEmpty(message = "{1_002_000_009}")
     private String code;
 
 }

+ 7 - 7
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/vo/AppMdeUserUpdatePhoneReqVO.java

@@ -14,20 +14,20 @@ import javax.validation.constraints.Pattern;
 public class AppMdeUserUpdatePhoneReqVO {
 
     @Schema(description = "手机验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @NotEmpty(message = "手机验证码不能为空")
-    @Length(min = 4, max = 6, message = "手机验证码长度为 4-6 位")
-    @Pattern(regexp = "^[0-9]+$", message = "手机验证码必须都是数字")
+    @NotEmpty(message = "{1_200_001_013}")
+    @Length(min = 4, max = 6, message = "{1_200_001_014}")
+    @Pattern(regexp = "^[0-9]+$", message = "{1_200_001_016}")
     private String code;
 
     @Schema(description = "手机号",requiredMode = Schema.RequiredMode.REQUIRED, example = "15823654487")
-    @NotBlank(message = "手机号不能为空")
-    @Length(min = 8, max = 11, message = "手机号码长度为 8-11 位")
+    @NotBlank(message = "{1_200_001_007}")
+    @Length(min = 8, max = 11, message = "{1_200_001_015}")
     @Mobile
     private String phone;
 
     @Schema(description = "原手机验证码", example = "1024")
-    @Length(min = 4, max = 6, message = "手机验证码长度为 4-6 位")
-    @Pattern(regexp = "^[0-9]+$", message = "手机验证码必须都是数字")
+    @Length(min = 4, max = 6, message = "{1_200_001_014}")
+    @Pattern(regexp = "^[0-9]+$", message = "{1_200_001_016}")
     private String oldCode;
 
 }

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/message/MdeVisitsSendMessage.java

@@ -20,15 +20,15 @@ import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DA
 @Schema(description = "用户端 - 访问量新增/修改 Request VO")
 public class MdeVisitsSendMessage {
 
-    @NotNull(message = "业务类型不能为空")
+    @NotNull(message = "{1_100_015_002}")
     @Schema(description = "业务类型")
     private Integer type;
 
-    @NotNull(message = "业务id不能为空")
+    @NotNull(message = "{1_100_015_003}")
     @Schema(description = "业务id")
     private Long bizId;
 
-    @NotNull(message = "访问日期不能为空")
+    @NotNull(message = "{1_100_015_004}")
     @Schema(description = "访问日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime date;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/favorite/PersonJobFavoriteService.java

@@ -80,6 +80,6 @@ public interface PersonJobFavoriteService {
      *
      * @return 成功|失败
      */
-    Boolean unFavorite(PersonJobFavoriteReqVO reqVO);
+    Boolean unFavorite(Long jobId);
 
 }

+ 3 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/favorite/PersonJobFavoriteServiceImpl.java

@@ -5,7 +5,6 @@ import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.admin.person.vo.favorite.PersonJobFavoritePageReqVO;
 import com.citu.module.menduner.system.controller.admin.person.vo.favorite.PersonJobFavoriteSaveReqVO;
 import com.citu.module.menduner.system.controller.app.person.job.PersonJobFavoriteReqVO;
-import com.citu.module.menduner.system.dal.dataobject.person.PersonEnterpriseSubscribeDO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonJobFavoriteDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonJobFavoriteMapper;
 import org.springframework.stereotype.Service;
@@ -118,14 +117,14 @@ public class PersonJobFavoriteServiceImpl implements PersonJobFavoriteService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean unFavorite(PersonJobFavoriteReqVO reqVO) {
+    public Boolean unFavorite(Long jobId) {
         Long userId = getLoginUserId();
         if (null == userId) {
             // 未登录
             return false;
         }
-        if (null != personJobFavoriteMapper.selectByUserIdAndJobId(userId, reqVO.getJobId())) {
-            return personJobFavoriteMapper.deleteByUserIdAndJobId(userId,reqVO.getJobId());
+        if (null != personJobFavoriteMapper.selectByUserIdAndJobId(userId, jobId)) {
+            return personJobFavoriteMapper.deleteByUserIdAndJobId(userId, jobId);
         }
         return false;
     }

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/subscribe/PersonEnterpriseSubscribeService.java

@@ -80,5 +80,5 @@ public interface PersonEnterpriseSubscribeService {
      *
      * @return 成功|失败
      */
-    Boolean unSubscribe(PersonEnterpriseSubscribeReqVO reqVO);
+    Boolean unSubscribe(Long enterpriseId);
 }

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/subscribe/PersonEnterpriseSubscribeServiceImpl.java

@@ -115,14 +115,14 @@ public class PersonEnterpriseSubscribeServiceImpl implements PersonEnterpriseSub
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean unSubscribe(PersonEnterpriseSubscribeReqVO reqVO) {
+    public Boolean unSubscribe(Long enterpriseId) {
         Long userId = getLoginUserId();
         if (null == userId) {
             // 未登录
             return false;
         }
-        if (null != personEnterpriseSubscribeMapper.selectByUserIdAndEnterpriseId(userId, reqVO.getEnterpriseId())) {
-           return personEnterpriseSubscribeMapper.deleteByUserIdAndEnterpriseId(userId, reqVO.getEnterpriseId());
+        if (null != personEnterpriseSubscribeMapper.selectByUserIdAndEnterpriseId(userId, enterpriseId)) {
+           return personEnterpriseSubscribeMapper.deleteByUserIdAndEnterpriseId(userId, enterpriseId);
         }
         return false;
     }

+ 43 - 1
menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties

@@ -1,9 +1,28 @@
+# ========== 系统 ==========
+0=Successful
+# ========== 客户端错误段 ==========
+400=incorrect request parameters
+401=account not logged in
+403=no permission for this operation
+404=request not found
+405=incorrect request method
+423=request failed, please try again later # concurrent request, not allowed
+429=request too frequent, please try again later
+
+# ========== 服务端错误段 ==========
+500=system abnormality
+501=function not implemented/not enabled
+502=incorrect configuration item
+# ========== 自定义错误段 ==========
+900=duplicate request, please try again later # duplicate request
+901=demonstration mode, write operation prohibited
+999=unknown error
 # ========== 人员信息-个人档案 1_100_001_000 ==========
 1_100_001_001=Personal Profile Does Not Exist
 # ========== 行业信息 1_100_002_000 ==========
 1_100_002_001=Industry information does not exist
 # ========== 职位信息 1_100_003_000 ==========
-1_100_002_003=Position information does not exist
+1_100_003_001=Position information does not exist
 # ========== 地区 1_100_004_000 ==========
 1_100_004_001=Region does not exist
 1_100_004_002=Popular regions already exist, please do not add them again
@@ -11,6 +30,10 @@
 1_100_005_001=Resume attachment does not exist
 # ========== 教育经历 1_100_006_000 ==========
 1_100_006_001=Educational experience does not exist
+1_100_006_002=No education selected
+1_100_006_003=No educational system type selected
+1_100_006_004=No school start date selected
+1_100_006_005=No end date selected for school
 # ========== 求职意向 1_100_007_000 ==========
 1_100_007_001=Job search intention does not exist
 # ========== 专业 1_100_008_000 ==========
@@ -29,6 +52,9 @@
 1_100_014_001=Certificate does not exist
 # ========== 访问量 1_100_015_000 ==========
 1_100_015_001=The traffic does not exist
+1_100_015_002=Business type does not exist
+1_100_015_003=Business ID does not exist
+1_100_015_004=Access date does not exist
 # ========== 用户登录 1_200_001_000 ==========
 1_200_001_001=User does not exist
 1_200_001_002=Unregistered user with phone number
@@ -36,10 +62,19 @@
 1_200_001_004=User account already exists
 1_200_001_005=Phone number already exists
 1_200_001_006=Email already exists
+1_200_001_007=Phone number cannot be empty
 1_200_001_008=Importing user data cannot be empty!
 1_200_001_009=User password verification failed
 1_200_001_010=The user named [{}] has been disabled
 1_200_001_011=User creation failed due to exceeding the maximum tenant quota ({}) for tenants!
+1_200_001_012=The new password cannot be empty
+1_200_001_013=Phone verification code cannot be empty
+1_200_001_014=The length of the mobile verification code is 4-6 digits
+1_200_001_015=The length of the phone number is 8-11 digits
+1_200_001_016=Phone verification codes must all be numbers
+1_200_001_017=Password length is 4-16 bits
+1_200_001_018=User ID cannot be empty
+1_200_001_019=Password cannot be empty
 # ========== AUTH 模块 1_200_002_000 ==========
 1_200_002_001=Login failed, incorrect account and password
 1_200_002_002=Login failed, account disabled
@@ -49,6 +84,13 @@
 1_002_000_005=Account not bound, needs to be bound
 1_002_000_006=Token has expired
 1_002_000_007=Phone number does not exist
+1_002_000_008=Sending scene cannot be empty
+1_002_000_009=Phone code cannot be empty
+1_002_000_010=Login code cannot be empty
+1_002_000_011=State cannot be empty
+1_002_000_012=Authorization code cannot be empty
+1_002_000_013=The type of social platform cannot be empty
+1_002_000_014=The verification code cannot be empty
 # ========== 角色模块 1_200_003_000 ==========
 1_200_003_001=Character does not exist
 1_200_003_002=A role named [{}] already exists

+ 44 - 1
menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -1,9 +1,29 @@
+# ========== 系统 ==========
+0=成功
+# ========== 客户端错误段 ==========
+400=请求参数不正确
+401=账号未登录
+403=没有该操作权限
+404=请求未找到
+405=请求方法不正确
+423=请求失败,请稍后重试 # 并发请求,不允许
+429=请求过于频繁,请稍后重试
+
+# ========== 服务端错误段 ==========
+500=系统异常
+501=功能未实现/未开启
+502=错误的配置项
+# ========== 自定义错误段 ==========
+900=重复请求,请稍后重试 # 重复请求
+901=演示模式,禁止写操作
+999=未知错误
+
 # ========== 人员信息-个人档案 1_100_001_000 ==========
 1_100_001_001=人员信息-个人档案不存在
 # ========== 行业信息 1_100_002_000 ==========
 1_100_002_001=行业信息不存在
 # ========== 职位信息 1_100_003_000 ==========
-1_100_002_003=职位信息不存在
+1_100_003_001=职位信息不存在
 # ========== 地区 1_100_004_000 ==========
 1_100_004_001=地区不存在
 1_100_004_002=热门地区已存在,请勿重复添加
@@ -11,6 +31,10 @@
 1_100_005_001=简历附件不存在
 # ========== 教育经历 1_100_006_000 ==========
 1_100_006_001=教育经历不存在
+1_100_006_002=未选择学历
+1_100_006_003=未选择学制类型
+1_100_006_004=未选择在校开始日期
+1_100_006_005=未选择在校结束日期
 # ========== 求职意向 1_100_007_000 ==========
 1_100_007_001=求职意向不存在
 # ========== 专业 1_100_008_000 ==========
@@ -29,6 +53,9 @@
 1_100_014_001=证书不存在
 # ========== 访问量 1_100_015_000 ==========
 1_100_015_001=访问量不存在
+1_100_015_002=业务类型不存在
+1_100_015_003=业务id不存在
+1_100_015_004=访问日期不存在
 # ========== 用户登录 1_200_001_000 ==========
 1_200_001_001=用户不存在
 1_200_001_002=手机号未注册用户
@@ -36,10 +63,19 @@
 1_200_001_004=用户账号已经存在
 1_200_001_005=手机号已经存在
 1_200_001_006=邮箱已经存在
+1_200_001_007=手机号不能为空
 1_200_001_008=导入用户数据不能为空!
 1_200_001_009=用户密码校验失败
 1_200_001_010=名字为【{}】的用户已被禁用
 1_200_001_011=创建用户失败,原因:超过租户最大租户配额({})!
+1_200_001_012=新密码不能为空
+1_200_001_013=手机验证码不能为空
+1_200_001_014=手机验证码长度为 4-6 位
+1_200_001_015=手机号码长度为 8-11 位
+1_200_001_016=手机验证码必须都是数字
+1_200_001_017=密码长度为 4-16 位
+1_200_001_018=用户编号不能为空
+1_200_001_019=密码不能为空
 # ========== AUTH 模块 1_200_002_000 ==========
 1_200_002_001=登录失败,账号密码不正确
 1_200_002_002=登录失败,账号被禁用
@@ -49,6 +85,13 @@
 1_002_000_005=未绑定账号,需要进行绑定
 1_002_000_006=Token 已经过期
 1_002_000_007=手机号不存在
+1_002_000_008=发送场景不能为空
+1_002_000_009=手机code不能为空
+1_002_000_010=登录code不能为空
+1_002_000_011=state不能为空
+1_002_000_012=授权码不能为空
+1_002_000_013=社交平台的类型不能为空
+1_002_000_014=验证码不能为空
 # ========== 角色模块 1_200_003_000 ==========
 1_200_003_001=角色不存在
 1_200_003_002=已经存在名为【{}】的角色