From 317394972de5a90f98b221c606dbaf51b1b9c939 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Mon, 8 Dec 2025 16:56:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7tok?= =?UTF-8?q?en?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sdm/system/controller/SysUserController.java | 6 +++--- .../main/java/com/sdm/system/service/ISysUserService.java | 2 +- .../sdm/system/service/impl/CID/CIDISysUserServiceImpl.java | 5 ++++- .../com/sdm/system/service/impl/LocalUserServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) 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 8400c31b..5b8656df 100644 --- a/system/src/main/java/com/sdm/system/controller/SysUserController.java +++ b/system/src/main/java/com/sdm/system/controller/SysUserController.java @@ -224,9 +224,9 @@ public class SysUserController implements ISysUserFeignClient { } @Operation(summary = "根据用户userId获取token", description = "根据用户userId调用CID获取token") - @PostMapping("/getUserToken") - public SdmResponse getUserToken(@Parameter(description = "获取token请求参数") @RequestBody UserQueryReq req) { - return ISysUserService.getUserToken(req); + @GetMapping("/getUserToken") + public SdmResponse getUserToken(@Parameter(description = "获取token请求参数") @RequestParam("userId") Long userId) { + return ISysUserService.getUserToken(userId); } 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 26f3bf26..f4c538cb 100644 --- a/system/src/main/java/com/sdm/system/service/ISysUserService.java +++ b/system/src/main/java/com/sdm/system/service/ISysUserService.java @@ -49,5 +49,5 @@ public interface ISysUserService extends IService { SdmResponse queryGroupMember(GroupMemberQueryReq req); - SdmResponse getUserToken(UserQueryReq req); + SdmResponse getUserToken(Long userId); } 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 1a16d72d..ffd566ad 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 @@ -3,6 +3,7 @@ package com.sdm.system.service.impl.CID; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sdm.common.common.SdmResponse; import com.sdm.common.common.ThreadLocalContext; @@ -258,8 +259,10 @@ public class CIDISysUserServiceImpl extends ServiceImpl } @Override - public SdmResponse getUserToken(UserQueryReq req) { + public SdmResponse getUserToken(Long userId) { try { + JSONObject req = new JSONObject(); + req.put("userId", userId); log.info("正在向CID获取用户token接口发送请求: {}，参数: {}", cidUrl + getUserToken, JSONUtil.toJsonStr(req)); String userJson = HttpUtil.post(cidUrl + getUserToken, JSONUtil.toJsonStr(req)); log.info("收到CID获取用户token接口的响应: {}", userJson); 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 eedbcaed..8f46d958 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 @@ -302,7 +302,7 @@ public class LocalUserServiceImpl extends ServiceImpl im } @Override - public SdmResponse getUserToken(UserQueryReq req) { + public SdmResponse getUserToken(Long userId) { return null; } From 673429bf9cb542fde6b215e7c1f85f4058479450 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Mon, 8 Dec 2025 18:06:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- system/src/main/resources/application-dev.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/src/main/resources/application-dev.yml b/system/src/main/resources/application-dev.yml index d688fa87..8e4d8790 100644 --- a/system/src/main/resources/application-dev.yml +++ b/system/src/main/resources/application-dev.yml @@ -176,4 +176,5 @@ cid: security: whitelist: paths: - - /systemApprove/approveStatusNotice \ No newline at end of file + - /systemApprove/approveStatusNotice + - /user/getUserToken \ No newline at end of file From 93b0d679472c81b2eae48c84f9cac3799137b01e Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Mon, 8 Dec 2025 19:31:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:YA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/sdm/project/service/impl/TaskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 38b9e05c..9f1ab199 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -1280,7 +1280,7 @@ public class TaskServiceImpl implements ITaskService { String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // 查询是否已同步过项目 SpdmNodeVo spdmNodeVo = nodeMapper.getNodeByProjectIdAndName(projectId,projectName); - if (ObjectUtils.isNotEmpty(spdmNodeVo)) { + if (ObjectUtils.isEmpty(spdmNodeVo)) { SpdmProjectNodeEditReq spdmProjectNodeEditReq = new SpdmProjectNodeEditReq(); spdmProjectNodeEditReq.setNodeName(req.getProjectName()); spdmProjectNodeEditReq.setNodeType(NodeTypeEnum.PROJECT.getValue());