From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中，关阀报（83）中的RTU时钟改为关阀时间，但代码误注解掉了这行代码，修改之； 2、通信中间件测试web系统增加查询所在在线情况的命令下发。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java
index 7fc1185..164f7f5 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webFilter/UserTokenFilter.java
@@ -9,43 +9,53 @@
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
-
import java.io.IOException;
import java.io.PrintWriter;
@Slf4j
public class UserTokenFilter implements Filter {
+
+
@Override
public void init(FilterConfig filterConfig) throws ServletException {
}
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
- HttpServletRequest request = (HttpServletRequest) servletRequest;
- HttpServletResponse response = (HttpServletResponse) servletResponse;
- String token = request.getHeader(Constant.UserTokenKeyInHeader);
- if(!StringUtils.isNullOrEmpty(token)){
- UserTokenContext.set(token);
+ HttpServletRequest httpRequest = (HttpServletRequest) servletRequest;
+ String requestURI = httpRequest.getRequestURI();
+ // 妫�鏌ヨ姹傛槸鍚︿负闈炶繃婊ら」
+ if (UserTokenNoFilter.urls != null && UserTokenNoFilter.urls.stream().anyMatch(url -> requestURI.startsWith(url))) {
+ // 濡傛灉鏄潪杩囨护椤癸紝鐩存帴璋冪敤涓嬩竴涓繃婊ゅ櫒鎴杝ervlet
filterChain.doFilter(servletRequest, servletResponse);
- }else{
- PrintWriter pw = null ;
- try {
- BaseResponse<?> res = BaseResponseUtils.buildToLogin() ;
- String jsonString = JSON.toJSONString(res);
- response.setCharacterEncoding("UTF-8");
- response.setContentType("application/json; charset=utf-8");
- pw = response.getWriter() ;
- pw.write(jsonString);
- pw.flush();
- } catch (IOException e) {
- e.printStackTrace();
- }finally {
- if(pw != null){
- pw.close();
+ } else {
+ // 濡傛灉涓嶆槸闈炶繃婊ら」锛屾墽琛岃繃婊ら�昏緫
+ HttpServletRequest request = (HttpServletRequest) servletRequest;
+ HttpServletResponse response = (HttpServletResponse) servletResponse;
+ String token = request.getHeader(Constant.UserTokenKeyInHeader);
+ if(!StringUtils.isNullOrEmpty(token)){
+ UserTokenContext.set(token);
+ filterChain.doFilter(servletRequest, servletResponse);
+ }else{
+ PrintWriter pw = null ;
+ try {
+ BaseResponse<?> res = BaseResponseUtils.buildToLogin() ;
+ String jsonString = JSON.toJSONString(res);
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("application/json; charset=utf-8");
+ pw = response.getWriter() ;
+ pw.write(jsonString);
+ pw.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }finally {
+ if(pw != null){
+ pw.close();
+ }
}
+ //request.setAttribute(Constant.ErrorKeyInRequest, "鏈緱鍒扮敤鎴穞oken");
+ //response.sendRedirect("/error");
}
- //request.setAttribute(Constant.ErrorKeyInRequest, "鏈緱鍒扮敤鎴穞oken");
- //response.sendRedirect("/error");
}
}
--
Gitblit v1.8.0