Commit 57d2b7e3bedc7eb71cfbf2a73df945b14391bda3
Committed by
GitHub
Merge pull request #342 from Lemon-cc-hang/social
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum
Showing
7 changed files
with
14 additions
and
13 deletions
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthLoginReqVO.java
| ... | ... | @@ -33,7 +33,7 @@ public class AppAuthLoginReqVO { |
| 33 | 33 | |
| 34 | 34 | // ========== 绑定社交登录时,需要传递如下参数 ========== |
| 35 | 35 | |
| 36 | - @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 36 | + @Schema(description = "社交平台的类型,参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 37 | 37 | @InEnum(SocialTypeEnum.class) |
| 38 | 38 | private Integer socialType; |
| 39 | 39 | |
| ... | ... | @@ -53,4 +53,4 @@ public class AppAuthLoginReqVO { |
| 53 | 53 | return socialType == null || StrUtil.isNotEmpty(socialState); |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | -} |
| 57 | +} | |
| 57 | 58 | \ No newline at end of file | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java
| ... | ... | @@ -35,7 +35,7 @@ public class AppAuthSmsLoginReqVO { |
| 35 | 35 | |
| 36 | 36 | // ========== 绑定社交登录时,需要传递如下参数 ========== |
| 37 | 37 | |
| 38 | - @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 38 | + @Schema(description = "社交平台的类型,参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 39 | 39 | @InEnum(SocialTypeEnum.class) |
| 40 | 40 | private Integer socialType; |
| 41 | 41 | |
| ... | ... | @@ -55,4 +55,4 @@ public class AppAuthSmsLoginReqVO { |
| 55 | 55 | return socialType == null || StrUtil.isNotEmpty(socialState); |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | -} |
| 59 | +} | |
| 59 | 60 | \ No newline at end of file | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java
| ... | ... | @@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull; |
| 18 | 18 | @Builder |
| 19 | 19 | public class AppAuthSocialLoginReqVO { |
| 20 | 20 | |
| 21 | - @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 21 | + @Schema(description = "社交平台的类型,参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 22 | 22 | @InEnum(SocialTypeEnum.class) |
| 23 | 23 | @NotNull(message = "社交平台的类型不能为空") |
| 24 | 24 | private Integer type; |
| ... | ... | @@ -31,4 +31,4 @@ public class AppAuthSocialLoginReqVO { |
| 31 | 31 | @NotEmpty(message = "state 不能为空") |
| 32 | 32 | private String state; |
| 33 | 33 | |
| 34 | 34 | -} |
| 35 | +} | |
| 35 | 36 | \ No newline at end of file | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/vo/AppSocialUserBindReqVO.java
| ... | ... | @@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull; |
| 18 | 18 | @Builder |
| 19 | 19 | public class AppSocialUserBindReqVO { |
| 20 | 20 | |
| 21 | - @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 21 | + @Schema(description = "社交平台的类型,参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 22 | 22 | @InEnum(SocialTypeEnum.class) |
| 23 | 23 | @NotNull(message = "社交平台的类型不能为空") |
| 24 | 24 | private Integer type; |
| ... | ... | @@ -31,4 +31,4 @@ public class AppSocialUserBindReqVO { |
| 31 | 31 | @NotEmpty(message = "state 不能为空") |
| 32 | 32 | private String state; |
| 33 | 33 | |
| 34 | 34 | -} |
| 35 | +} | |
| 35 | 36 | \ No newline at end of file | ... | ... |
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/vo/AppSocialUserUnbindReqVO.java
| ... | ... | @@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull; |
| 18 | 18 | @Builder |
| 19 | 19 | public class AppSocialUserUnbindReqVO { |
| 20 | 20 | |
| 21 | - @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 21 | + @Schema(description = "社交平台的类型,参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 22 | 22 | @InEnum(SocialTypeEnum.class) |
| 23 | 23 | @NotNull(message = "社交平台的类型不能为空") |
| 24 | 24 | private Integer type; |
| ... | ... | @@ -27,4 +27,4 @@ public class AppSocialUserUnbindReqVO { |
| 27 | 27 | @NotEmpty(message = "社交用户的 openid 不能为空") |
| 28 | 28 | private String openid; |
| 29 | 29 | |
| 30 | 30 | -} |
| 31 | +} | |
| 31 | 32 | \ No newline at end of file | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
| 1 | 1 | package cn.iocoder.yudao.module.system.controller.admin.auth; |
| 2 | 2 | |
| 3 | +import cn.hutool.core.collection.CollUtil; | |
| 3 | 4 | import cn.hutool.core.util.StrUtil; |
| 4 | 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 5 | 6 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| ... | ... | @@ -153,4 +154,4 @@ public class AuthController { |
| 153 | 154 | return success(authService.socialLogin(reqVO)); |
| 154 | 155 | } |
| 155 | 156 | |
| 156 | 157 | -} |
| 158 | +} | |
| 157 | 159 | \ No newline at end of file | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
| ... | ... | @@ -41,7 +41,7 @@ public class AuthLoginReqVO { |
| 41 | 41 | |
| 42 | 42 | // ========== 绑定社交登录时,需要传递如下参数 ========== |
| 43 | 43 | |
| 44 | - @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 44 | + @Schema(description = "社交平台的类型,参见 SocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") | |
| 45 | 45 | @InEnum(SocialTypeEnum.class) |
| 46 | 46 | private Integer socialType; |
| 47 | 47 | |
| ... | ... | @@ -66,4 +66,4 @@ public class AuthLoginReqVO { |
| 66 | 66 | return socialType == null || StrUtil.isNotEmpty(socialState); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | -} |
| 70 | +} | |
| 70 | 71 | \ No newline at end of file | ... | ... |