登录用户获取方法更换
This commit is contained in:
parent
4487f4e97a
commit
43ede4dade
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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 "";
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user