使用 cn.reghao.jutil.web.ServletUtil

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/GetAppImpl.java

@@ -7,7 +7,7 @@ import cn.reghao.devops.manager.app.model.po.config.AppConfig;
 import cn.reghao.devops.common.build.model.LocalBuildDir;
 import cn.reghao.devops.manager.app.model.po.log.BuildLog;
 import cn.reghao.devops.manager.app.service.bd.GetApp;
-import cn.reghao.devops.manager.util.ServletUtil;
+import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.devops.manager.util.UploadDownload;
 import org.springframework.stereotype.Service;
 

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/webhook/WebhookService.java

@@ -9,7 +9,7 @@ import cn.reghao.devops.manager.monitor.model.po.AppMonitor;
 import cn.reghao.devops.manager.notification.model.po.NotifyGroup;
 import cn.reghao.devops.manager.notification.service.NotifyService;
 import cn.reghao.devops.manager.notification.service.notifier.ding.DingMsg;
-import cn.reghao.devops.manager.util.ServletUtil;
+import cn.reghao.jutil.web.ServletUtil;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/webhook/event/GithubPushEvent.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.app.service.bd.webhook.event;
 
-import cn.reghao.devops.manager.util.ServletUtil;
+import cn.reghao.jutil.web.ServletUtil;
 import com.google.gson.JsonObject;
 import org.springframework.stereotype.Component;
 

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/webhook/event/GogsPushEvent.java

@@ -1,6 +1,6 @@
 package cn.reghao.devops.manager.app.service.bd.webhook.event;
 
-import cn.reghao.devops.manager.util.ServletUtil;
+import cn.reghao.jutil.web.ServletUtil;
 import com.google.gson.JsonObject;
 import org.springframework.stereotype.Component;
 

manager/src/main/java/cn/reghao/devops/manager/rbac/UserContext.java

@@ -1,28 +0,0 @@
-package cn.reghao.devops.manager.rbac;
-
-
-import cn.reghao.devops.manager.rbac.model.po.User;
-
-/**
- * 获取当前请求的用户
- *
- * @author reghao
- * @date 2020-06-23 19:20:56
- */
-@Deprecated
-public class UserContext implements AutoCloseable {
-    static final ThreadLocal<User> CURRENT = new ThreadLocal<>();
-
-    public UserContext(User user) {
-        CURRENT.set(user);
-    }
-
-    public static User currentUser() {
-        return CURRENT.get();
-    }
-
-    @Override
-    public void close() {
-        CURRENT.remove();
-    }
-}

manager/src/main/java/cn/reghao/devops/manager/util/ServletUtil.java

@@ -1,51 +0,0 @@
-package cn.reghao.devops.manager.util;
-
-import org.springframework.util.StringUtils;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-/**
- * @author reghao
- * @date 2021-06-02 13:16:58
- */
-public class ServletUtil {
-    public static HttpSession getSession() {
-        return getRequest().getSession();
-    }
-
-    public static String getSessionId() {
-        return getRequest().getSession().getId();
-    }
-
-    /**
-     * 获取 query 参数值
-     *
-     * @param
-     * @return
-     * @date 2021-06-02 下午1:19
-     */
-    public static String getRequestParam(String param, String defaultValue){
-        String parameter = getRequest().getParameter(param);
-        return StringUtils.isEmpty(parameter) ? defaultValue : parameter;
-    }
-
-    public static String getHeader(String key) {
-        return getRequest().getHeader(key);
-    }
-
-    public static HttpServletRequest getRequest(){
-        return getServletRequest().getRequest();
-    }
-
-    public static HttpServletResponse getResponse(){
-        return getServletRequest().getResponse();
-    }
-
-    private static ServletRequestAttributes getServletRequest(){
-        return (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-    }
-}