Merge remote-tracking branch 'origin/main'

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;
+
+}

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<UserTokenResp> getUserToken(@Parameter(description = "获取token请求参数") @RequestBody UserQueryReq req) {
+        return ISysUserService.getUserToken(req);
+    }
+
+
 }

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<SysUser> {
     SdmResponse updateGroupMember(UpdateGroupMemberBatchReq req);
 
     SdmResponse<CIDUserResp>  queryGroupMember(GroupMemberQueryReq req);
+
+    SdmResponse<UserTokenResp> getUserToken(UserQueryReq req);
 }

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<SysUserMapper, SysUser>
     @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<SysUserMapper, SysUser>
             return SdmResponse.failed("查询用户组成员失败: ");
         }
     }
+
+    @Override
+    public SdmResponse<UserTokenResp> 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<UserTokenResp> 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失败: ");
+        }
+    }
 }

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<SysUserMapper, SysUser> im
         return SdmResponse.success(sysUsers);
     }
 
+    @Override
+    public SdmResponse<UserTokenResp> getUserToken(UserQueryReq req) {
+        return null;
+    }
+
 }

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

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

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