فهرست منبع

1、增加新用户修改密码逻辑

rayson 8 ماه پیش
والد
کامیت
c5f18bdb93
37فایلهای تغییر یافته به همراه86 افزوده شده و 54 حذف شده
  1. 3 0
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/CommonConstants.java
  2. 6 0
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java
  3. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/AppMdeAuthController.java
  4. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/enterprise/AppEnterpriseAuthLoginReqVO.java
  5. 2 2
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/enterprise/AppEnterpriseAuthSmsLoginReqVO.java
  6. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/enterprise/AppEnterpriseAuthSwitchLoginReqVO.java
  7. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/enterprise/AppEnterpriseResetPasswordReqVO.java
  8. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthCheckCodeReqVO.java
  9. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthLoginReqVO.java
  10. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthLoginRespVO.java
  11. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthSmsLoginReqVO.java
  12. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthSmsRegisterReqVO.java
  13. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthSmsSendReqVO.java
  14. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthSmsValidateReqVO.java
  15. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthSocialLoginReqVO.java
  16. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthWeixinMiniAppLoginReqVO.java
  17. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeWeixinJsapiSignatureRespVO.java
  18. 5 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/AppSocialUserController.java
  19. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialUserBindReqVO.java
  20. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialUserRespVO.java
  21. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialUserUnbindReqVO.java
  22. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialWxaQrcodeReqVO.java
  23. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialWxaSubscribeTemplateRespVO.java
  24. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/test/TestController.java
  25. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/test/TestReqVO.java
  26. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/user/vo/AppMdeUserResetPasswordReqVO.java
  27. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/auth/AppRecruitEnterpriseAuthController.java
  28. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/auth/vo/AppRecruitEnterpriseAuthLoginReqVO.java
  29. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/auth/vo/AppRecruitEnterpriseAuthSmsLoginReqVO.java
  30. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/convert/MdeAuthConvert.java
  31. 1 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeAuthService.java
  32. 9 5
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeAuthServiceImpl.java
  33. 3 3
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeEnterpriseAuthService.java
  34. 15 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeEnterpriseAuthServiceImpl.java
  35. 8 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/bind/EnterpriseUserBindServiceImpl.java
  36. 2 0
      menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties
  37. 2 0
      menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

+ 3 - 0
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/CommonConstants.java

@@ -6,4 +6,7 @@ package com.citu.module.menduner.system.enums;
 public class CommonConstants {
     /** 邮箱验证码 **/
     public static final String EMAIL_TEMPLATE_CODE = "menduner-code";
+
+    /** 邮箱初始化密码 **/
+    public static final String EMAIL_ENTERPRISE_INIT_PASSWORD = "menduner-enterprise-init-password";
 }

+ 6 - 0
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -173,6 +173,12 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_USER_EMAIL_NOT_REGISTERED = new ErrorCode(1_100_017_019, "邮箱号未注册");
     ErrorCode MDE_USER_EMAIL_CODE_ERROR = new ErrorCode(1_100_017_020, "邮箱验证码不正确");
 
+    ErrorCode MDE_USER_EMAIL_INIT_PASSWORD=
+            new ErrorCode(1_100_017_021, "您是首次登录,初始化密码已发往您的邮箱");
+
+    ErrorCode MDE_USER_PHONE_INIT_PASSWORD=
+            new ErrorCode(1_100_017_022, "密码不安全,请修改密码后登录");
+
     // ========== 角色模块 1_100_018_000 ==========
     ErrorCode MDE_ROLE_NOT_EXISTS = new ErrorCode(1_100_018_001, "角色不存在");
     ErrorCode MDE_ROLE_NAME_DUPLICATE = new ErrorCode(1_100_018_002, "已经存在名为【{}】的角色");

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

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth;
+package com.citu.module.menduner.system.controller.app.common.auth;
 
 import cn.hutool.core.util.StrUtil;
 import com.citu.framework.common.enums.UserTypeEnum;
@@ -6,7 +6,7 @@ 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.common.util.LoginUserContext;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.*;
+import com.citu.module.menduner.system.controller.app.common.auth.vo.*;
 import com.citu.module.menduner.system.controller.app.jobhunt.user.vo.AppMdeUserResetPasswordReqVO;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.service.auth.MdeAuthService;

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

@@ -1,6 +1,6 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise;
+package com.citu.module.menduner.system.controller.app.common.auth.enterprise;
 
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.AppMdeAuthLoginReqVO;
+import com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/enterprise/AppEnterpriseAuthSmsLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/enterprise/AppEnterpriseAuthSmsLoginReqVO.java

@@ -1,6 +1,6 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise;
+package com.citu.module.menduner.system.controller.app.common.auth.enterprise;
 
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.AppMdeAuthSmsLoginReqVO;
+import com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/enterprise/AppEnterpriseAuthSwitchLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/enterprise/AppEnterpriseAuthSwitchLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise;
+package com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/enterprise/AppEnterpriseResetPasswordReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/enterprise/AppEnterpriseResetPasswordReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise;
+package com.citu.module.menduner.system.controller.app.common.auth.enterprise;
 
 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/jobhunt/auth/vo/AppMdeAuthCheckCodeReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthCheckCodeReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
+package com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/vo/AppMdeAuthLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
+package com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/vo/AppMdeAuthLoginRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthLoginRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
+package com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/vo/AppMdeAuthSmsLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthSmsLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
+package com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/vo/AppMdeAuthSmsRegisterReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthSmsRegisterReqVO.java

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

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

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
+package com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/vo/AppMdeAuthSmsValidateReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthSmsValidateReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
+package com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/vo/AppMdeAuthSocialLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthSocialLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
+package com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/vo/AppMdeAuthWeixinMiniAppLoginReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeAuthWeixinMiniAppLoginReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.auth.vo;
+package com.citu.module.menduner.system.controller.app.common.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/jobhunt/auth/vo/AppMdeWeixinJsapiSignatureRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/vo/AppMdeWeixinJsapiSignatureRespVO.java

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

+ 5 - 5
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/social/AppSocialUserController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/AppSocialUserController.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.social;
+package com.citu.module.menduner.system.controller.app.common.social;
 
 import cn.hutool.core.codec.Base64;
 import com.citu.framework.common.enums.UserTypeEnum;
@@ -6,10 +6,10 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.common.util.LoginUserContext;
-import com.citu.module.menduner.system.controller.app.jobhunt.social.vo.AppSocialUserBindReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.social.vo.AppSocialUserRespVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.social.vo.AppSocialUserUnbindReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.social.vo.AppSocialWxaSubscribeTemplateRespVO;
+import com.citu.module.menduner.system.controller.app.common.social.vo.AppSocialUserBindReqVO;
+import com.citu.module.menduner.system.controller.app.common.social.vo.AppSocialUserRespVO;
+import com.citu.module.menduner.system.controller.app.common.social.vo.AppSocialUserUnbindReqVO;
+import com.citu.module.menduner.system.controller.app.common.social.vo.AppSocialWxaSubscribeTemplateRespVO;
 import com.citu.module.system.api.social.SocialClientApi;
 import com.citu.module.system.api.social.SocialUserApi;
 import com.citu.module.system.api.social.dto.*;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/social/vo/AppSocialUserBindReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialUserBindReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.social.vo;
+package com.citu.module.menduner.system.controller.app.common.social.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/jobhunt/social/vo/AppSocialUserRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialUserRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.social.vo;
+package com.citu.module.menduner.system.controller.app.common.social.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/jobhunt/social/vo/AppSocialUserUnbindReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialUserUnbindReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.social.vo;
+package com.citu.module.menduner.system.controller.app.common.social.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/jobhunt/social/vo/AppSocialWxaQrcodeReqVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialWxaQrcodeReqVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.social.vo;
+package com.citu.module.menduner.system.controller.app.common.social.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/jobhunt/social/vo/AppSocialWxaSubscribeTemplateRespVO.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/social/vo/AppSocialWxaSubscribeTemplateRespVO.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.social.vo;
+package com.citu.module.menduner.system.controller.app.common.social.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/jobhunt/test/TestController.java → menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/test/TestController.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.test;
+package com.citu.module.menduner.system.controller.app.common.test;
 
 import com.citu.framework.common.pojo.CommonResult;
 import io.swagger.v3.oas.annotations.tags.Tag;

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

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.system.controller.app.jobhunt.test;
+package com.citu.module.menduner.system.controller.app.common.test;
 
 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/jobhunt/user/vo/AppMdeUserResetPasswordReqVO.java

@@ -1,7 +1,7 @@
 package com.citu.module.menduner.system.controller.app.jobhunt.user.vo;
 
 import com.citu.framework.common.validation.Mobile;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise.AppEnterpriseResetPasswordReqVO;
+import com.citu.module.menduner.system.controller.app.common.auth.enterprise.AppEnterpriseResetPasswordReqVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -5,9 +5,9 @@ import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.security.config.SecurityProperties;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise.AppEnterpriseAuthSwitchLoginReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise.AppEnterpriseResetPasswordReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.AppMdeAuthLoginRespVO;
+import com.citu.module.menduner.system.controller.app.common.auth.enterprise.AppEnterpriseAuthSwitchLoginReqVO;
+import com.citu.module.menduner.system.controller.app.common.auth.enterprise.AppEnterpriseResetPasswordReqVO;
+import com.citu.module.menduner.system.controller.app.common.auth.vo.AppMdeAuthLoginRespVO;
 import com.citu.module.menduner.system.service.auth.MdeEnterpriseAuthService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

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

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

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

@@ -1,6 +1,6 @@
 package com.citu.module.menduner.system.controller.app.recruit.auth.vo;
 
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.AppMdeAuthSmsLoginReqVO;
+import com.citu.module.menduner.system.controller.app.common.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/convert/MdeAuthConvert.java

@@ -1,7 +1,7 @@
 package com.citu.module.menduner.system.convert;
 
 
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.*;
+import com.citu.module.menduner.system.controller.app.common.auth.vo.*;
 import com.citu.module.menduner.system.controller.app.jobhunt.user.vo.AppMdeUserResetPasswordReqVO;
 import com.citu.module.system.api.oauth2.dto.OAuth2AccessTokenRespDTO;
 import com.citu.module.system.api.sms.dto.code.SmsCodeSendReqDTO;

+ 1 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeAuthService.java

@@ -1,7 +1,7 @@
 package com.citu.module.menduner.system.service.auth;
 
 
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.*;
+import com.citu.module.menduner.system.controller.app.common.auth.vo.*;
 import com.citu.module.menduner.system.controller.app.jobhunt.user.vo.AppMdeUserResetPasswordReqVO;
 
 import javax.validation.Valid;

+ 9 - 5
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeAuthServiceImpl.java

@@ -11,8 +11,7 @@ import com.citu.framework.common.util.validation.ValidationUtils;
 import com.citu.module.menduner.common.enums.EventAsyncUrlEnum;
 import com.citu.module.menduner.common.enums.PointBizTypeEnum;
 import com.citu.module.menduner.common.message.EventAsyncConfirmMessage;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise.AppEnterpriseResetPasswordReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.*;
+import com.citu.module.menduner.system.controller.app.common.auth.vo.*;
 import com.citu.module.menduner.system.controller.app.jobhunt.user.vo.AppMdeUserResetPasswordReqVO;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
@@ -142,7 +141,12 @@ public class MdeAuthServiceImpl implements MdeAuthService {
         }
         if (!userService.isPasswordMatch(password, user.getPassword())) {
             createLoginLog(user.getId(), account, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);
-            throw exception(MDE_AUTH_LOGIN_BAD_CREDENTIALS);
+            if (null == user.getLoginDate()) {
+                // 第一次登录
+                throw exception(MDE_USER_PHONE_INIT_PASSWORD);
+            } else {
+                throw exception(MDE_AUTH_LOGIN_BAD_CREDENTIALS);
+            }
         }
         // 校验是否禁用
         if (ObjectUtil.notEqual(user.getStatus(), MendunerStatusEnum.ENABLE.getStatus())) {
@@ -225,7 +229,7 @@ public class MdeAuthServiceImpl implements MdeAuthService {
         }
 
         // 创建用户并返回
-        user = userService.createUserIfAbsent(reqVO.getPhone(),reqVO.getInviteCode());
+        user = userService.createUserIfAbsent(reqVO.getPhone(), reqVO.getInviteCode());
 
         if (null != reqVO.getInviteCode()) {
             // 给邀请人增加积分
@@ -351,7 +355,7 @@ public class MdeAuthServiceImpl implements MdeAuthService {
                 getClientIP())).getCheckedData();
 
         // 更新密码
-        userService.updateUserPassword(user.getId(),reqVO.getPassword());
+        userService.updateUserPassword(user.getId(), reqVO.getPassword());
     }
 
     @Override

+ 3 - 3
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeEnterpriseAuthService.java

@@ -1,8 +1,8 @@
 package com.citu.module.menduner.system.service.auth;
 
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise.AppEnterpriseAuthSwitchLoginReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise.AppEnterpriseResetPasswordReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.AppMdeAuthLoginRespVO;
+import com.citu.module.menduner.system.controller.app.common.auth.enterprise.AppEnterpriseAuthSwitchLoginReqVO;
+import com.citu.module.menduner.system.controller.app.common.auth.enterprise.AppEnterpriseResetPasswordReqVO;
+import com.citu.module.menduner.system.controller.app.common.auth.vo.AppMdeAuthLoginRespVO;
 
 import javax.validation.Valid;
 

+ 15 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeEnterpriseAuthServiceImpl.java

@@ -10,9 +10,9 @@ import com.citu.framework.common.util.servlet.ServletUtils;
 import com.citu.framework.common.util.validation.ValidationUtils;
 import com.citu.framework.security.core.LoginUser;
 import com.citu.module.menduner.common.util.LoginUserContext;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise.AppEnterpriseAuthSwitchLoginReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.enterprise.AppEnterpriseResetPasswordReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.auth.vo.AppMdeAuthLoginRespVO;
+import com.citu.module.menduner.system.controller.app.common.auth.enterprise.AppEnterpriseAuthSwitchLoginReqVO;
+import com.citu.module.menduner.system.controller.app.common.auth.enterprise.AppEnterpriseResetPasswordReqVO;
+import com.citu.module.menduner.system.controller.app.common.auth.vo.AppMdeAuthLoginRespVO;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
@@ -135,7 +135,18 @@ public class MdeEnterpriseAuthServiceImpl implements MdeEnterpriseAuthService {
         }
         if (!userBindService.isPasswordMatch(password, user.getPassword())) {
             createLoginLog(user.getId(), email, logTypeEnum, LoginResultEnum.BAD_CREDENTIALS);
-            throw exception(MDE_AUTH_LOGIN_BAD_CREDENTIALS);
+            if (userBindService.checkNeedUpdatePassword()) {
+                // 效验有没有更改过密码
+                // 没有则发送邮箱
+                MailSendSingleToUserReqDTO reqDTO = new MailSendSingleToUserReqDTO();
+                reqDTO.setMail(email);
+                reqDTO.setTemplateCode(CommonConstants.EMAIL_ENTERPRISE_INIT_PASSWORD);
+                reqDTO.setTemplateParams(MapUtil.builder("email", (Object) email).build());
+                mailSendApi.sendSingleMailToMember(reqDTO).getCheckedData();
+                throw exception(MDE_USER_EMAIL_INIT_PASSWORD);
+            } else {
+                throw exception(MDE_AUTH_LOGIN_BAD_CREDENTIALS);
+            }
         }
         // 校验是否禁用
         if (ObjectUtil.notEqual(user.getStatus(), MendunerStatusEnum.ENABLE.getStatus())) {

+ 8 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/bind/EnterpriseUserBindServiceImpl.java

@@ -415,10 +415,14 @@ public class EnterpriseUserBindServiceImpl implements EnterpriseUserBindService
         Long userId = LoginUserContext.getUserId();
         EnterpriseUserBindDO userBindDO = mapper.selectByEnterpriseIdAndUserId(enterpriseId, userId);
 
-        String password = userBindDO.getEmail();
-        // 邮箱和密码一样则提示要改了
-        if (!isPasswordMatch(password, userBindDO.getPassword())) {
-            // 要改密码
+//        String password = userBindDO.getEmail();
+//        // 邮箱和密码一样则提示要改了
+//        if (!isPasswordMatch(password, userBindDO.getPassword())) {
+//            // 要改密码
+//            return true;
+//        }
+        // 首次登录要改密码
+        if(null == userBindDO.getLoginDate()) {
             return true;
         }
         return false;

+ 2 - 0
menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties

@@ -139,6 +139,8 @@
 1_100_017_018=Access token cannot be empty
 1_100_017_019=Email number not registered
 1_100_017_020=Email verification code incorrect
+1_100_017_021=This is your first login, and the initialization password has been sent to your email
+1_100_017_022=Password is not secure, please change your password and log in
 # ========== 角色模块 1_100_018_000 ==========
 1_100_018_001=Character does not exist
 1_100_018_002=A role named [{}] already exists

+ 2 - 0
menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -139,6 +139,8 @@
 1_100_017_018=访问令牌不能为空
 1_100_017_019=邮箱号未注册
 1_100_017_020=邮箱验证码不正确
+1_100_017_021=您是首次登录,初始化密码已发往您的邮箱
+1_100_017_022=密码不安全,请修改密码后登录
 # ========== 角色模块 1_100_018_000 ==========
 1_100_018_001=角色不存在
 1_100_018_002=已经存在名为【{}】的角色