From eb722d84e3aaa8f3e60ae2ecac0320d9f4b9a716 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Wed, 30 Jul 2025 16:21:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7id=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91=EF=BC=88=E9=A2=84=E7=95=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/process/dataObject/pipeline/PipPipeline.java | 1 + .../service/pipeline/impl/PipelineServiceImpl.java | 3 ++- .../java/cd/casic/ci/process/util/WebFrameworkUtils.java | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java index 7d336e44..c9924261 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java @@ -138,4 +138,5 @@ public class PipPipeline extends PipBaseElement { * 机器id * */ private String machineId; + private Long tenantId; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java index 0f32472b..b96c9568 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java @@ -109,7 +109,8 @@ public class PipelineServiceImpl extends ServiceImpl i List pipTaskList = new ArrayList<>(0); PipPipeline pipeline = pipelineConverter.reqToDO(pipelineReq); - + Long tenantId = WebFrameworkUtils.getLoginUser().getTenantId(); + pipeline.setTenantId(tenantId); // 随机颜色 int randomNumber = (int)(Math.random() * 5) + 1; pipeline.setColor(randomNumber); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java index 6b157d74..1640c94b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java @@ -40,6 +40,14 @@ public class WebFrameworkUtils { return null; } } + public static LoginUser getLoginUser() { + try { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + return (LoginUser) authentication.getPrincipal(); + } catch (Exception e){ + return null; + } + } public static String getLoginUserIdStr(){ Long loginUserId = getLoginUserId(); if (loginUserId!=null) {