diff --git a/common/src/main/java/com/sdm/common/entity/resp/system/UserTokenResp.java b/common/src/main/java/com/sdm/common/entity/resp/system/UserTokenResp.java new file mode 100644 index 00000000..89bbb953 --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/resp/system/UserTokenResp.java @@ -0,0 +1,19 @@ +package com.sdm.common.entity.resp.system; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "用户新增请求参数") +public class UserTokenResp { + + @Schema(description = "token") + private String access_token; + + @Schema(description = "用户ID") + private String cid_user_id; + + @Schema(description = "租户ID") + private String cid_tenant_id; + +} diff --git a/system/src/main/java/com/sdm/system/controller/SysUserController.java b/system/src/main/java/com/sdm/system/controller/SysUserController.java index 5cd809f2..8400c31b 100644 --- a/system/src/main/java/com/sdm/system/controller/SysUserController.java +++ b/system/src/main/java/com/sdm/system/controller/SysUserController.java @@ -4,13 +4,10 @@ import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.system.QueryGroupDetailReq; import com.sdm.common.entity.req.system.UserListReq; import com.sdm.common.entity.req.system.UserQueryReq; -import com.sdm.common.entity.resp.system.CIDRoleResp; -import com.sdm.common.entity.resp.system.CIDUserResp; +import com.sdm.common.entity.resp.system.*; import com.sdm.common.entity.resp.PageDataResp; import com.sdm.common.feign.inter.system.ISysUserFeignClient; import com.sdm.system.model.req.user.*; -import com.sdm.common.entity.resp.system.SysUserGroupDetailResp; -import com.sdm.common.entity.resp.system.SysUserGroupResp; import com.sdm.system.service.ISysUserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -226,4 +223,11 @@ public class SysUserController implements ISysUserFeignClient { return ISysUserService.queryGroupMember(req); } + @Operation(summary = "根据用户userId获取token", description = "根据用户userId调用CID获取token") + @PostMapping("/getUserToken") + public SdmResponse getUserToken(@Parameter(description = "获取token请求参数") @RequestBody UserQueryReq req) { + return ISysUserService.getUserToken(req); + } + + } \ No newline at end of file diff --git a/system/src/main/java/com/sdm/system/service/ISysUserService.java b/system/src/main/java/com/sdm/system/service/ISysUserService.java index 4b83fde2..26f3bf26 100644 --- a/system/src/main/java/com/sdm/system/service/ISysUserService.java +++ b/system/src/main/java/com/sdm/system/service/ISysUserService.java @@ -5,13 +5,10 @@ import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.system.QueryGroupDetailReq; import com.sdm.common.entity.req.system.UserListReq; import com.sdm.common.entity.req.system.UserQueryReq; -import com.sdm.common.entity.resp.system.CIDRoleResp; -import com.sdm.common.entity.resp.system.CIDUserResp; +import com.sdm.common.entity.resp.system.*; import com.sdm.common.entity.resp.PageDataResp; import com.sdm.system.model.entity.SysUser; import com.sdm.system.model.req.user.*; -import com.sdm.common.entity.resp.system.SysUserGroupDetailResp; -import com.sdm.common.entity.resp.system.SysUserGroupResp; import java.util.List; @@ -51,4 +48,6 @@ public interface ISysUserService extends IService { SdmResponse updateGroupMember(UpdateGroupMemberBatchReq req); SdmResponse queryGroupMember(GroupMemberQueryReq req); + + SdmResponse getUserToken(UserQueryReq req); } diff --git a/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java index 7302f81d..1a16d72d 100644 --- a/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/CID/CIDISysUserServiceImpl.java @@ -10,13 +10,10 @@ import com.sdm.common.entity.req.system.QueryGroupDetailReq; import com.sdm.common.entity.req.system.UserListReq; import com.sdm.common.entity.req.system.UserQueryReq; import com.sdm.common.entity.resp.PageDataResp; -import com.sdm.common.entity.resp.system.CIDRoleResp; +import com.sdm.common.entity.resp.system.*; import com.sdm.system.dao.SysUserMapper; import com.sdm.system.model.entity.SysUser; import com.sdm.system.model.req.user.*; -import com.sdm.common.entity.resp.system.CIDUserResp; -import com.sdm.common.entity.resp.system.SysUserGroupDetailResp; -import com.sdm.common.entity.resp.system.SysUserGroupResp; import com.sdm.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; @@ -57,6 +54,9 @@ public class CIDISysUserServiceImpl extends ServiceImpl @Value("${cid.user.queryGroupMember}") private String queryGroupMember; + @Value("${cid.user.getUserToken}") + private String getUserToken; + @Override public String getType() { return type; @@ -256,4 +256,21 @@ public class CIDISysUserServiceImpl extends ServiceImpl return SdmResponse.failed("查询用户组成员失败: "); } } + + @Override + public SdmResponse getUserToken(UserQueryReq req) { + try { + log.info("正在向CID获取用户token接口发送请求: {},参数: {}", cidUrl + getUserToken, JSONUtil.toJsonStr(req)); + String userJson = HttpUtil.post(cidUrl + getUserToken, JSONUtil.toJsonStr(req)); + log.info("收到CID获取用户token接口的响应: {}", userJson); + SdmResponse cIDUserResp = JSON.parseObject(userJson, SdmResponse.class); + if (cIDUserResp != null) { + return cIDUserResp; + } + return SdmResponse.failed("获取用户token失败"); + } catch (Exception e) { + log.error("获取用户token失败", e); + return SdmResponse.failed("获取用户token失败: "); + } + } } diff --git a/system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java index d48ec585..eedbcaed 100644 --- a/system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java @@ -11,6 +11,7 @@ import com.sdm.common.entity.req.system.UserListReq; import com.sdm.common.entity.req.system.UserQueryReq; import com.sdm.common.entity.resp.PageDataResp; import com.sdm.common.entity.resp.system.CIDRoleResp; +import com.sdm.common.entity.resp.system.UserTokenResp; import com.sdm.common.utils.PageUtils; import com.sdm.system.dao.SysUserMapper; import com.sdm.system.model.entity.*; @@ -300,4 +301,9 @@ public class LocalUserServiceImpl extends ServiceImpl im return SdmResponse.success(sysUsers); } + @Override + public SdmResponse getUserToken(UserQueryReq req) { + return null; + } + } diff --git a/system/src/main/resources/application-dev.yml b/system/src/main/resources/application-dev.yml index d875b4a6..d688fa87 100644 --- a/system/src/main/resources/application-dev.yml +++ b/system/src/main/resources/application-dev.yml @@ -149,6 +149,7 @@ cid: queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail queryGroupMember: /spdm-user/queryGroupMember + getUserToken: /spdm-user/getUserToken role: getRoleByRoleName: /spdm-role/getRoleByRoleName getRoleByRoleCode: /spdm-role/getRoleByRoleCode diff --git a/system/src/main/resources/application-local.yml b/system/src/main/resources/application-local.yml index 93cd950d..abc62a85 100644 --- a/system/src/main/resources/application-local.yml +++ b/system/src/main/resources/application-local.yml @@ -149,6 +149,7 @@ cid: queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail queryGroupMember: /spdm-user/queryGroupMember + getUserToken: /spdm-user/getUserToken role: getRoleByRoleName: /spdm-role/getRoleByRoleName getRoleByRoleCode: /spdm-role/getRoleByRoleCode diff --git a/system/src/main/resources/application-prod.yml b/system/src/main/resources/application-prod.yml index de92d899..66c32c37 100644 --- a/system/src/main/resources/application-prod.yml +++ b/system/src/main/resources/application-prod.yml @@ -160,6 +160,7 @@ cid: queryGroup: /spdm-user/queryGroup queryGroupDetail: /spdm-user/queryGroupDetail queryGroupMember: /spdm-user/queryGroupMember + getUserToken: /spdm-user/getUserToken role: getRoleByRoleName: /spdm-role/getRoleByRoleName getRoleByRoleCode: /spdm-role/getRoleByRoleCode