Merge remote-tracking branch 'origin/main'

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());

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

system/src/main/java/com/sdm/system/service/ISysUserService.java

@@ -49,5 +49,5 @@ public interface ISysUserService extends IService<SysUser> {
 
     SdmResponse<CIDUserResp>  queryGroupMember(GroupMemberQueryReq req);
 
-    SdmResponse<UserTokenResp> getUserToken(UserQueryReq req);
+    SdmResponse<UserTokenResp> getUserToken(Long userId);
 }

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

system/src/main/java/com/sdm/system/service/impl/LocalUserServiceImpl.java

@@ -302,7 +302,7 @@ public class LocalUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> im
     }
 
     @Override
-    public SdmResponse<UserTokenResp> getUserToken(UserQueryReq req) {
+    public SdmResponse<UserTokenResp> getUserToken(Long userId) {
         return null;
     }
 

system/src/main/resources/application-dev.yml

@@ -176,4 +176,5 @@ cid:
 security:
   whitelist:
     paths:
-      - /systemApprove/approveStatusNotice
+      - /systemApprove/approveStatusNotice
+      - /user/getUserToken