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,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 | @InEnum(SocialTypeEnum.class) | 37 | @InEnum(SocialTypeEnum.class) |
| 38 | private Integer socialType; | 38 | private Integer socialType; |
| 39 | 39 | ||
| @@ -53,4 +53,4 @@ public class AppAuthLoginReqVO { | @@ -53,4 +53,4 @@ public class AppAuthLoginReqVO { | ||
| 53 | return socialType == null || StrUtil.isNotEmpty(socialState); | 53 | return socialType == null || StrUtil.isNotEmpty(socialState); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | -} | 56 | -} |
| 57 | +} | ||
| 57 | \ No newline at end of file | 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,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 | @InEnum(SocialTypeEnum.class) | 39 | @InEnum(SocialTypeEnum.class) |
| 40 | private Integer socialType; | 40 | private Integer socialType; |
| 41 | 41 | ||
| @@ -55,4 +55,4 @@ public class AppAuthSmsLoginReqVO { | @@ -55,4 +55,4 @@ public class AppAuthSmsLoginReqVO { | ||
| 55 | return socialType == null || StrUtil.isNotEmpty(socialState); | 55 | return socialType == null || StrUtil.isNotEmpty(socialState); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | -} | 58 | -} |
| 59 | +} | ||
| 59 | \ No newline at end of file | 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,7 +18,7 @@ import javax.validation.constraints.NotNull; | ||
| 18 | @Builder | 18 | @Builder |
| 19 | public class AppAuthSocialLoginReqVO { | 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 | @InEnum(SocialTypeEnum.class) | 22 | @InEnum(SocialTypeEnum.class) |
| 23 | @NotNull(message = "社交平台的类型不能为空") | 23 | @NotNull(message = "社交平台的类型不能为空") |
| 24 | private Integer type; | 24 | private Integer type; |
| @@ -31,4 +31,4 @@ public class AppAuthSocialLoginReqVO { | @@ -31,4 +31,4 @@ public class AppAuthSocialLoginReqVO { | ||
| 31 | @NotEmpty(message = "state 不能为空") | 31 | @NotEmpty(message = "state 不能为空") |
| 32 | private String state; | 32 | private String state; |
| 33 | 33 | ||
| 34 | -} | 34 | -} |
| 35 | +} | ||
| 35 | \ No newline at end of file | 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,7 +18,7 @@ import javax.validation.constraints.NotNull; | ||
| 18 | @Builder | 18 | @Builder |
| 19 | public class AppSocialUserBindReqVO { | 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 | @InEnum(SocialTypeEnum.class) | 22 | @InEnum(SocialTypeEnum.class) |
| 23 | @NotNull(message = "社交平台的类型不能为空") | 23 | @NotNull(message = "社交平台的类型不能为空") |
| 24 | private Integer type; | 24 | private Integer type; |
| @@ -31,4 +31,4 @@ public class AppSocialUserBindReqVO { | @@ -31,4 +31,4 @@ public class AppSocialUserBindReqVO { | ||
| 31 | @NotEmpty(message = "state 不能为空") | 31 | @NotEmpty(message = "state 不能为空") |
| 32 | private String state; | 32 | private String state; |
| 33 | 33 | ||
| 34 | -} | 34 | -} |
| 35 | +} | ||
| 35 | \ No newline at end of file | 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,7 +18,7 @@ import javax.validation.constraints.NotNull; | ||
| 18 | @Builder | 18 | @Builder |
| 19 | public class AppSocialUserUnbindReqVO { | 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 | @InEnum(SocialTypeEnum.class) | 22 | @InEnum(SocialTypeEnum.class) |
| 23 | @NotNull(message = "社交平台的类型不能为空") | 23 | @NotNull(message = "社交平台的类型不能为空") |
| 24 | private Integer type; | 24 | private Integer type; |
| @@ -27,4 +27,4 @@ public class AppSocialUserUnbindReqVO { | @@ -27,4 +27,4 @@ public class AppSocialUserUnbindReqVO { | ||
| 27 | @NotEmpty(message = "社交用户的 openid 不能为空") | 27 | @NotEmpty(message = "社交用户的 openid 不能为空") |
| 28 | private String openid; | 28 | private String openid; |
| 29 | 29 | ||
| 30 | -} | 30 | -} |
| 31 | +} | ||
| 31 | \ No newline at end of file | 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 | package cn.iocoder.yudao.module.system.controller.admin.auth; | 1 | package cn.iocoder.yudao.module.system.controller.admin.auth; |
| 2 | 2 | ||
| 3 | +import cn.hutool.core.collection.CollUtil; | ||
| 3 | import cn.hutool.core.util.StrUtil; | 4 | import cn.hutool.core.util.StrUtil; |
| 4 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; | 5 | import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; |
| 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| @@ -153,4 +154,4 @@ public class AuthController { | @@ -153,4 +154,4 @@ public class AuthController { | ||
| 153 | return success(authService.socialLogin(reqVO)); | 154 | return success(authService.socialLogin(reqVO)); |
| 154 | } | 155 | } |
| 155 | 156 | ||
| 156 | -} | 157 | -} |
| 158 | +} | ||
| 157 | \ No newline at end of file | 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,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 | @InEnum(SocialTypeEnum.class) | 45 | @InEnum(SocialTypeEnum.class) |
| 46 | private Integer socialType; | 46 | private Integer socialType; |
| 47 | 47 | ||
| @@ -66,4 +66,4 @@ public class AuthLoginReqVO { | @@ -66,4 +66,4 @@ public class AuthLoginReqVO { | ||
| 66 | return socialType == null || StrUtil.isNotEmpty(socialState); | 66 | return socialType == null || StrUtil.isNotEmpty(socialState); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | -} | 69 | -} |
| 70 | +} | ||
| 70 | \ No newline at end of file | 71 | \ No newline at end of file |