From 4b592521e7b04b579512d8b4352f422d4498899c Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 10 四月 2025 14:03:23 +0800
Subject: [PATCH] 移除MonitorApi，恢复sms
---
iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java | 30 +++++++
/dev/null | 18 ----
iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/SmsCodeApi.java | 36 +++++++++
iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/SmsSendApi.java | 28 +++++++
iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java | 34 ++++++++
iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java | 30 +++++++
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/framework/rpc/config/RpcConfiguration.java | 3
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/convert/auth/AuthConvert.java | 3
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java | 16 ----
iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java | 26 ++++++
10 files changed, 185 insertions(+), 39 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/SmsCodeApi.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/SmsCodeApi.java
new file mode 100644
index 0000000..a976e7d
--- /dev/null
+++ b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/SmsCodeApi.java
@@ -0,0 +1,36 @@
+package com.iailab.module.system.api.sms;
+
+import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.module.system.api.sms.dto.code.SmsCodeValidateReqDTO;
+import com.iailab.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
+import com.iailab.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
+import com.iailab.module.system.enums.ApiConstants;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - 短信验证码")
+public interface SmsCodeApi {
+
+ String PREFIX = ApiConstants.PREFIX + "/oauth2/sms/code";
+
+ @PostMapping(PREFIX + "/send")
+ @Operation(summary = "创建短信验证码，并进行发送")
+ CommonResult<Boolean> sendSmsCode(@Valid @RequestBody SmsCodeSendReqDTO reqDTO);
+
+ @PutMapping(PREFIX + "/use")
+ @Operation(summary = "验证短信验证码，并进行使用")
+ CommonResult<Boolean> useSmsCode(@Valid @RequestBody SmsCodeUseReqDTO reqDTO);
+
+ @GetMapping(PREFIX + "/validate")
+ @Operation(summary = "检查验证码是否有效")
+ CommonResult<Boolean> validateSmsCode(@Valid @RequestBody SmsCodeValidateReqDTO reqDTO);
+
+}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/SmsSendApi.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/SmsSendApi.java
new file mode 100644
index 0000000..d1fdca5
--- /dev/null
+++ b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/SmsSendApi.java
@@ -0,0 +1,28 @@
+package com.iailab.module.system.api.sms;
+
+import com.iailab.framework.common.pojo.CommonResult;
+import com.iailab.module.system.api.sms.dto.send.SmsSendSingleToUserReqDTO;
+import com.iailab.module.system.enums.ApiConstants;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.Valid;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - 短信发送")
+public interface SmsSendApi {
+
+ String PREFIX = ApiConstants.PREFIX + "/sms/send";
+
+ @PostMapping(PREFIX + "/send-single-admin")
+ @Operation(summary = "发送单条短信给 Admin 用户", description = "在 mobile 为空时，使用 userId 加载对应 Admin 的手机号")
+ CommonResult<Long> sendSingleSmsToAdmin(@Valid @RequestBody SmsSendSingleToUserReqDTO reqDTO);
+
+ @PostMapping(PREFIX + "/send-single-member")
+ @Operation(summary = "发送单条短信给 Member 用户", description = "在 mobile 为空时，使用 userId 加载对应 Member 的手机号")
+ CommonResult<Long> sendSingleSmsToMember(@Valid @RequestBody SmsSendSingleToUserReqDTO reqDTO);
+
+}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java
new file mode 100644
index 0000000..425f04e
--- /dev/null
+++ b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeSendReqDTO.java
@@ -0,0 +1,30 @@
+package com.iailab.module.system.api.sms.dto.code;
+
+import com.iailab.framework.common.validation.InEnum;
+import com.iailab.framework.common.validation.Mobile;
+import com.iailab.module.system.enums.sms.SmsSceneEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "RPC 服务 - 短信验证码的发送 Request DTO")
+@Data
+public class SmsCodeSendReqDTO {
+
+ @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300")
+ @Mobile
+ @NotEmpty(message = "手机号不能为空")
+ private String mobile;
+
+ @Schema(description = "发送场景", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "发送场景不能为空")
+ @InEnum(SmsSceneEnum.class)
+
+ private Integer scene;
+ @Schema(description = "发送 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "10.20.30.40")
+ @NotEmpty(message = "发送 IP 不能为空")
+ private String createIp;
+
+}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java
new file mode 100644
index 0000000..a9b4d55
--- /dev/null
+++ b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeUseReqDTO.java
@@ -0,0 +1,34 @@
+package com.iailab.module.system.api.sms.dto.code;
+
+import com.iailab.framework.common.validation.InEnum;
+import com.iailab.framework.common.validation.Mobile;
+import com.iailab.module.system.enums.sms.SmsSceneEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "RPC 服务 - 短信验证码的使用 Request DTO")
+@Data
+public class SmsCodeUseReqDTO {
+
+ @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300")
+ @Mobile
+ @NotEmpty(message = "手机号不能为空")
+ private String mobile;
+
+ @Schema(description = "发送场景", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "发送场景不能为空")
+ @InEnum(SmsSceneEnum.class)
+ private Integer scene;
+
+ @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotEmpty(message = "验证码")
+ private String code;
+
+ @Schema(description = "发送 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "10.20.30.40")
+ @NotEmpty(message = "使用 IP 不能为空")
+ private String usedIp;
+
+}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java
new file mode 100644
index 0000000..11d892f
--- /dev/null
+++ b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/code/SmsCodeValidateReqDTO.java
@@ -0,0 +1,30 @@
+package com.iailab.module.system.api.sms.dto.code;
+
+import com.iailab.framework.common.validation.InEnum;
+import com.iailab.framework.common.validation.Mobile;
+import com.iailab.module.system.enums.sms.SmsSceneEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "RPC 服务 - 短信验证码的校验 Request DTO")
+@Data
+public class SmsCodeValidateReqDTO {
+
+ @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300")
+ @Mobile
+ @NotEmpty(message = "手机号不能为空")
+ private String mobile;
+
+ @Schema(description = "发送场景", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "发送场景不能为空")
+ @InEnum(SmsSceneEnum.class)
+ private Integer scene;
+
+ @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+ @NotEmpty(message = "验证码")
+ private String code;
+
+}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
new file mode 100644
index 0000000..05f2290
--- /dev/null
+++ b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/sms/dto/send/SmsSendSingleToUserReqDTO.java
@@ -0,0 +1,26 @@
+package com.iailab.module.system.api.sms.dto.send;
+
+import com.iailab.framework.common.validation.Mobile;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Map;
+
+@Schema(description = "RPC 服务 - 短信发送给 Admin 或者 Member 用户 Request DTO")
+@Data
+public class SmsSendSingleToUserReqDTO {
+
+ @Schema(description = "用户编号", example = "1024")
+ private Long userId;
+ @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300")
+ @Mobile
+ private String mobile;
+
+ @Schema(description = "短信模板编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "USER_SEND")
+ @NotEmpty(message = "短信模板编号不能为空")
+ private String templateCode;
+ @Schema(description = "短信模板参数")
+ private Map<String, Object> templateParams;
+
+}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/SocialClientApi.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/SocialClientApi.java
deleted file mode 100644
index 7d9f998..0000000
--- a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/SocialClientApi.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.iailab.module.system.api.social;
-
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO;
-import com.iailab.module.system.api.social.dto.SocialWxPhoneNumberInfoRespDTO;
-import com.iailab.module.system.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(name = ApiConstants.NAME)
-@Tag(name = "RPC 服务 - 社交应用")
-public interface SocialClientApi {
-
- String PREFIX = ApiConstants.PREFIX + "/social-client";
-
- @GetMapping(PREFIX + "/get-authorize-url")
- @Operation(summary = "获得社交平台的授权 URL")
- @Parameters({
- @Parameter(name = "socialType", description = "社交平台的类型", example = "1", required = true),
- @Parameter(name = "userType", description = "用户类型", example = "1", required = true),
- @Parameter(name = "redirectUri", description = "重定向 URL", example = "https://www.baidu.com", required = true)
- })
- CommonResult<String> getAuthorizeUrl(@RequestParam("socialType") Integer socialType,
- @RequestParam("userType") Integer userType,
- @RequestParam("redirectUri") String redirectUri);
-
- @GetMapping(PREFIX + "/create-wx-mp-jsapi-signature")
- @Operation(summary = "创建微信公众号 JS SDK 初始化所需的签名")
- @Parameters({
- @Parameter(name = "userType", description = "用户类型", example = "1", required = true),
- @Parameter(name = "url", description = "访问 URL", example = "https://www.baidu.com", required = true)
- })
- CommonResult<SocialWxJsapiSignatureRespDTO> createWxMpJsapiSignature(@RequestParam("userType") Integer userType,
- @RequestParam("url") String url);
-
- @GetMapping(PREFIX + "/create-wx-ma-phone-number-info")
- @Operation(summary = "获得微信小程序的手机信息")
- @Parameters({
- @Parameter(name = "userType", description = "用户类型", example = "1", required = true),
- @Parameter(name = "phoneCode", description = "手机授权码", example = "iailab11", required = true)
- })
- CommonResult<SocialWxPhoneNumberInfoRespDTO> getWxMaPhoneNumberInfo(@RequestParam("userType") Integer userType,
- @RequestParam("phoneCode") String phoneCode);
-
-}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/SocialUserApi.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/SocialUserApi.java
deleted file mode 100644
index eae329c..0000000
--- a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/SocialUserApi.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.iailab.module.system.api.social;
-
-import com.iailab.framework.common.exception.ServiceException;
-import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.system.api.social.dto.SocialUserBindReqDTO;
-import com.iailab.module.system.api.social.dto.SocialUserRespDTO;
-import com.iailab.module.system.api.social.dto.SocialUserUnbindReqDTO;
-import com.iailab.module.system.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-@FeignClient(name = ApiConstants.NAME)
-@Tag(name = "RPC 服务 - 社交用户")
-public interface SocialUserApi {
-
- String PREFIX = ApiConstants.PREFIX + "/social-user";
-
- @PostMapping(PREFIX + "/bind")
- @Operation(summary = "绑定社交用户")
- CommonResult<String> bindSocialUser(@Valid @RequestBody SocialUserBindReqDTO reqDTO);
-
- @DeleteMapping(PREFIX + "/unbind")
- @Operation(summary = "取消绑定社交用户")
- CommonResult<Boolean> unbindSocialUser(@Valid @RequestBody SocialUserUnbindReqDTO reqDTO);
-
- @GetMapping(PREFIX + "/get-by-user-id")
- @Operation(summary = "获得社交用户，基于 userId")
- @Parameters({
- @Parameter(name = "userType", description = "用户类型", example = "2", required = true),
- @Parameter(name = "userId", description = "用户编号", example = "1024", required = true),
- @Parameter(name = "socialType", description = "社交平台的类型", example = "1", required = true),
- })
- CommonResult<SocialUserRespDTO> getSocialUserByUserId(@RequestParam("userType") Integer userType,
- @RequestParam("userId") Long userId,
- @RequestParam("socialType") Integer socialType);
-
- @GetMapping(PREFIX + "/get-by-code")
- @Operation(summary = "获得社交用") // 在认证信息不正确的情况下，也会抛出 {@link ServiceException} 业务异常
- @Parameters({
- @Parameter(name = "userType", description = "用户类型", example = "2", required = true),
- @Parameter(name = "socialType", description = "社交平台的类型", example = "1", required = true),
- @Parameter(name = "code", description = "授权码", example = "88888", required = true),
- @Parameter(name = "state", description = "state", example = "666", required = true),
- })
- CommonResult<SocialUserRespDTO> getSocialUserByCode(@RequestParam("userType") Integer userType,
- @RequestParam("socialType") Integer socialType,
- @RequestParam("code") String code,
- @RequestParam("state") String state);
-
-}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialUserBindReqDTO.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialUserBindReqDTO.java
deleted file mode 100644
index b2e7392..0000000
--- a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialUserBindReqDTO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.iailab.module.system.api.social.dto;
-
-import com.iailab.framework.common.enums.UserTypeEnum;
-import com.iailab.framework.common.validation.InEnum;
-import com.iailab.module.system.enums.social.SocialTypeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "RPC 服务 - 取消绑定社交用户 Request DTO")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class SocialUserBindReqDTO {
-
- @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotNull(message = "用户编号不能为空")
- private Long userId;
- @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @InEnum(UserTypeEnum.class)
- @NotNull(message = "用户类型不能为空")
- private Integer userType;
-
- @Schema(description = "社交平台的类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @InEnum(SocialTypeEnum.class)
- @NotNull(message = "社交平台的类型不能为空")
- private Integer socialType;
- @Schema(description = "授权码", requiredMode = Schema.RequiredMode.REQUIRED, example = "zsw")
- @NotEmpty(message = "授权码不能为空")
- private String code;
- @Schema(description = "state", requiredMode = Schema.RequiredMode.REQUIRED, example = "qtw")
- @NotEmpty(message = "state 不能为空")
- private String state;
-
-}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialUserRespDTO.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialUserRespDTO.java
deleted file mode 100644
index 8eaffc0..0000000
--- a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialUserRespDTO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.iailab.module.system.api.social.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Schema(description = "RPC 服务 - 社交用户 Response DTO")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class SocialUserRespDTO {
-
- @Schema(description = "社交用户 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "zsw")
- private String openid;
-
- @Schema(description = "社交用户的昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "iailab")
- private String nickname;
-
- @Schema(description = "社交用户的头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.baidu.com/1.jpg")
- private String avatar;
-
- @Schema(description = "关联的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- private Long userId;
-
-}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialUserUnbindReqDTO.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialUserUnbindReqDTO.java
deleted file mode 100644
index 6f76ba4..0000000
--- a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialUserUnbindReqDTO.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.iailab.module.system.api.social.dto;
-
-import com.iailab.framework.common.enums.UserTypeEnum;
-import com.iailab.framework.common.validation.InEnum;
-import com.iailab.module.system.enums.social.SocialTypeEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "RPC 服务 - 取消绑定社交用户 Request DTO")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SocialUserUnbindReqDTO {
-
- @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
- @NotNull(message = "用户编号不能为空")
- private Long userId;
- @Schema(description = "用户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @InEnum(UserTypeEnum.class)
- @NotNull(message = "用户类型不能为空")
- private Integer userType;
-
- @Schema(description = "社交平台的类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @InEnum(SocialTypeEnum.class)
- @NotNull(message = "社交平台的类型不能为空")
- private Integer socialType;
- @Schema(description = "社交平台的 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "zsw")
- @NotEmpty(message = "社交平台的 openid 不能为空")
- private String openid;
-
-}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialWxJsapiSignatureRespDTO.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialWxJsapiSignatureRespDTO.java
deleted file mode 100644
index c7cbd3d..0000000
--- a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialWxJsapiSignatureRespDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.iailab.module.system.api.social.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "RPC 服务 - 微信公众号 JSAPI 签名 Response DTO")
-@Data
-public class SocialWxJsapiSignatureRespDTO {
-
- @Schema(description = "微信公众号的 appId", requiredMode = Schema.RequiredMode.REQUIRED, example = "wx123456")
- private String appId;
-
- @Schema(description = "匿名串", requiredMode = Schema.RequiredMode.REQUIRED, example = "zsw")
- private String nonceStr;
-
- @Schema(description = "时间戳", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456789")
- private Long timestamp;
-
- @Schema(description = "URL", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.baidu.com")
- private String url;
-
- @Schema(description = "签名", requiredMode = Schema.RequiredMode.REQUIRED, example = "zsw")
- private String signature;
-
-}
diff --git a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialWxPhoneNumberInfoRespDTO.java b/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialWxPhoneNumberInfoRespDTO.java
deleted file mode 100644
index 2fdeefc..0000000
--- a/iailab-module-system/iailab-module-system-api/src/main/java/com/iailab/module/system/api/social/dto/SocialWxPhoneNumberInfoRespDTO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.iailab.module.system.api.social.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "RPC 服务 - 微信小程序的手机信息 Response DTO")
-@Data
-public class SocialWxPhoneNumberInfoRespDTO {
-
- @Schema(description = "用户绑定的手机号（国外手机号会有区号）", requiredMode = Schema.RequiredMode.REQUIRED, example = "021-13579246810")
- private String phoneNumber;
-
- @Schema(description = "没有区号的手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13579246810")
- private String purePhoneNumber;
- @Schema(description = "区号", requiredMode = Schema.RequiredMode.REQUIRED, example = "021")
- private String countryCode;
-
-}
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java
index 69c6fa8..85b5baf 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java
@@ -55,21 +55,5 @@
* 所属岗位数组
*/
private List<PostSimpleRespVO> posts;
- /**
- * 社交用户数组
- */
- private List<SocialUser> socialUsers;
-
- @Schema(description = "社交用户")
- @Data
- public static class SocialUser {
-
- @Schema(description = "社交平台的类型，参见 SocialTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
- private Integer type;
-
- @Schema(description = "社交用户的 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "IPRmJ0wvBptiPIlGEZiPewGwiEiE")
- private String openid;
-
- }
}
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/convert/auth/AuthConvert.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/convert/auth/AuthConvert.java
index a14b65d..e7e8573 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/convert/auth/AuthConvert.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/convert/auth/AuthConvert.java
@@ -2,7 +2,6 @@
import cn.hutool.core.collection.CollUtil;
import com.iailab.framework.common.util.object.BeanUtils;
-import com.iailab.module.system.api.social.dto.SocialUserBindReqDTO;
import com.iailab.module.system.controller.admin.auth.vo.*;
import com.iailab.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
import com.iailab.module.system.dal.dataobject.permission.MenuDO;
@@ -214,7 +213,5 @@
}
return menuVOS;
}
-
- SocialUserBindReqDTO convert(Long userId, Integer userType, AuthSocialLoginReqVO reqVO);
}
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/framework/rpc/config/RpcConfiguration.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/framework/rpc/config/RpcConfiguration.java
index c71cb83..751584e 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/framework/rpc/config/RpcConfiguration.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/framework/rpc/config/RpcConfiguration.java
@@ -3,13 +3,12 @@
import com.iailab.module.infra.api.config.ConfigApi;
import com.iailab.module.infra.api.db.DataSourceConfigServiceApi;
import com.iailab.module.infra.api.file.FileApi;
-import com.iailab.module.infra.api.monitor.MonitorApi;
import com.iailab.module.infra.api.websocket.WebSocketSenderApi;
import com.iailab.module.system.api.tenant.TenantApi;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {FileApi.class, MonitorApi.class, WebSocketSenderApi.class, DataSourceConfigServiceApi.class, ConfigApi.class, TenantApi.class})
+@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, DataSourceConfigServiceApi.class, ConfigApi.class, TenantApi.class})
public class RpcConfiguration {
}
--
Gitblit v1.9.3