From 43ede4dadee222b32af6b524b811f7d3f9fa7076 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Fri, 6 Jun 2025 14:43:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E6=B3=95=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DefaultRunContextManager.java | 1 - .../engine/manager/impl/MemoryLogManager.java | 2 +- .../engine/runContext/PipelineRunContext.java | 1 - .../pipeline/impl/PipelineServiceImpl.java | 2 +- .../service/stage/impl/StageServiceImpl.java | 2 +- .../service/task/impl/TaskServiceImpl.java | 2 +- .../ci/process/util/WebFrameworkUtils.java | 57 +++++++++++++++++++ 7 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java index 8115cf2e..6229ed0e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java @@ -21,7 +21,6 @@ import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.service.pipeline.PipelineService; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; -import cd.casic.framework.commons.util.util.WebFrameworkUtils; import cd.casic.framework.security.core.LoginUser; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.serializer.SerializerFeature; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java index cacaa1ec..d6b81c91 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/MemoryLogManager.java @@ -10,7 +10,7 @@ import cd.casic.ci.process.process.service.task.TaskService; import cd.casic.ci.process.util.snowflake.SnowflakeIdWorker; import cd.casic.ci.process.util.snowflake.SnowflakeIdentifierGenerator; import cd.casic.framework.commons.util.network.IpUtil; -import cd.casic.framework.commons.util.util.WebFrameworkUtils; +import cd.casic.ci.process.util.WebFrameworkUtils; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java index 988b00f9..676f397f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/PipelineRunContext.java @@ -10,7 +10,6 @@ import cd.casic.ci.process.process.dataObject.history.PipPipelineHisInstance; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; -import cd.casic.framework.commons.util.util.WebFrameworkUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonIgnore; 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 049b8d99..6ef74ac2 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 @@ -28,7 +28,7 @@ import cd.casic.ci.process.process.service.template.impl.TemplateManagerServiceI import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.commons.pojo.PageResult; -import cd.casic.framework.commons.util.util.WebFrameworkUtils; +import cd.casic.ci.process.util.WebFrameworkUtils; import cd.casic.framework.security.dal.user.AdminUserDO; import cd.casic.framework.tenant.core.service.AdminUserServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java index 754ce1f9..0623e0a4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java @@ -16,7 +16,7 @@ import cd.casic.ci.process.process.service.stage.StageService; import cd.casic.ci.process.process.service.task.TaskService; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; -import cd.casic.framework.commons.util.util.WebFrameworkUtils; +import cd.casic.ci.process.util.WebFrameworkUtils; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java index 30a76bc9..cf8b71df 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java @@ -11,7 +11,7 @@ import cd.casic.ci.process.process.service.task.TaskService; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.commons.pojo.CommonResult; -import cd.casic.framework.commons.util.util.WebFrameworkUtils; +import cd.casic.ci.process.util.WebFrameworkUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; 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 new file mode 100644 index 00000000..ce790948 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/WebFrameworkUtils.java @@ -0,0 +1,57 @@ +package cd.casic.ci.process.util; + +import cd.casic.framework.commons.config.WebProperties; +import cd.casic.framework.commons.enums.TerminalEnum; +import cd.casic.framework.commons.enums.UserTypeEnum; +import cd.casic.framework.commons.pojo.CommonResult; +import cd.casic.framework.security.core.LoginUser; +import cn.hutool.core.util.NumberUtil; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +/** + * 专属于 web 包的工具类 + * + * @author mianbin modified from yudao + */ +public class WebFrameworkUtils { + + + + + + public static String getLoginNickName() { + try { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + LoginUser principal = (LoginUser) authentication.getPrincipal(); + return principal.getInfo().get("nickName"); + } catch (Exception e){ + return ""; + } + } + + public static Long getLoginUserId() { + try { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + LoginUser principal = (LoginUser) authentication.getPrincipal(); + return principal.getId(); + } catch (Exception e){ + return null; + } + } + public static String getLoginUserIdStr(){ + Long loginUserId = getLoginUserId(); + if (loginUserId!=null) { + return String.valueOf(loginUserId); + } + return ""; + } + + + +}