wangys/urbanLifeline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gateway tomcat去除

Browse Source
This commit is contained in:
wangys
2025-12-22 17:03:37 +08:00
parent e09817015e
commit b023bec261
55 changed files with 1926 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
urbanLifelineServ/gateway/pom.xml
View File

@@ -18,6 +18,89 @@
<maven.compiler.target>21</maven.compiler.target>
</properties>
<!-- Gateway 是 WebFlux 应用，必须排除所有 Servlet/Tomcat 相关依赖 -->
<dependencyManagement>
<dependencies>
<!-- 覆盖父 pom 继承的 spring-boot-starter-web，设为 test scope 使其不参与编译和运行 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 覆盖父 pom 继承的 spring-boot-starter-security -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 覆盖父 pom 继承的 springdoc -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 排除 Tomcat -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>10.1.48</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<version>10.1.48</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>10.1.48</version>
<scope>test</scope>
</dependency>
<!-- 排除 spring-webmvc -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-framework.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- Spring Cloud Gateway -->
<dependency>
@@ -81,24 +164,81 @@
<dependency>
<groupId>org.xyzh.common</groupId>
<artifactId>common-auth</artifactId>
<exclusions>
<!-- 排除Tomcat，Gateway必须使用Netty -->
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Redis（用于Token验证、限流等） -->
<dependency>
<groupId>org.xyzh.common</groupId>
<artifactId>common-redis</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 工具类 -->
<dependency>
<!-- <dependency>
<groupId>org.xyzh.common</groupId>
<artifactId>common-utils</artifactId>
</dependency>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency> -->
<!-- 核心模块 -->
<dependency>
<groupId>org.xyzh.common</groupId>
<artifactId>common-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Spring Boot Actuator（健康检查） -->
@@ -138,6 +278,30 @@
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<!-- Gateway 需要 WebFlux 版本的 Spring Security -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
</dependency>
<!-- Servlet API (provided - 仅用于编译 common-auth 中的类，运行时不需要) -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- Spring WebMVC (provided - 仅用于编译 common-auth/common-utils 中的类) -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>

14
urbanLifelineServ/gateway/src/main/java/org/xyzh/gateway/GatewayApplication.java
View File

@@ -6,9 +6,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
import org.xyzh.common.auth.config.SecurityConfig;
import org.xyzh.common.auth.config.WebMvcConfig;
import org.xyzh.common.auth.config.GatewayAuthConfig;
/**
* @description Gateway 网关启动类
@@ -25,11 +22,12 @@ import org.xyzh.common.auth.config.GatewayAuthConfig;
"org.xyzh.common" // 公共模块（包括 common-auth）
},
excludeFilters = {
// 排除 Spring MVC 相关配置，Gateway 使用 WebFlux
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {
SecurityConfig.class, // Spring MVC Security配置
WebMvcConfig.class, // Spring MVC配置
GatewayAuthConfig.class // 微服务Gateway模式配置（使用Servlet Filter）
// 使用正则表达式排除 Spring MVC 相关配置，避免加载 WebMvcConfigurer 类
@ComponentScan.Filter(type = FilterType.REGEX, pattern = {
"org\\.xyzh\\.common\\.auth\\.config\\.SecurityConfig",
"org\\.xyzh\\.common\\.auth\\.config\\.WebMvcConfig",
"org\\.xyzh\\.common\\.auth\\.config\\.GatewayAuthConfig",
"org\\.xyzh\\.common\\.utils\\.config\\.FastJsonConfiguration"
})
}
)

33
urbanLifelineServ/gateway/src/main/java/org/xyzh/gateway/filter/AuthGlobalFilter.java
View File

@@ -131,27 +131,32 @@ public class AuthGlobalFilter implements GlobalFilter, Ordered {
}
/**
* 从请求头中提取 Token
* 从请求头或URL参数中提取 Token
*/
private String extractToken(ServerHttpRequest request) {
// 1. 优先从请求头获取
List<String> headers = request.getHeaders().get(authProperties.getTokenHeader());
if (headers == null || headers.isEmpty()) {
return null;
if (headers != null && !headers.isEmpty()) {
String header = headers.get(0);
if (StringUtils.hasText(header)) {
// 支持 Bearer 前缀
String prefix = authProperties.getTokenPrefix();
if (StringUtils.hasText(prefix) && header.startsWith(prefix)) {
return header.substring(prefix.length()).trim();
}
// 也支持直接传递 Token（不带前缀）
return header.trim();
}
}
String header = headers.get(0);
if (!StringUtils.hasText(header)) {
return null;
// 2. 从URL参数获取（用于WebSocket连接）
String tokenParam = request.getQueryParams().getFirst("token");
if (StringUtils.hasText(tokenParam)) {
log.debug("从URL参数获取Token");
return tokenParam.trim();
}
// 支持 Bearer 前缀
String prefix = authProperties.getTokenPrefix();
if (StringUtils.hasText(prefix) && header.startsWith(prefix)) {
return header.substring(prefix.length()).trim();
}
// 也支持直接传递 Token（不带前缀）
return header.trim();
return null;
}
/**

8
urbanLifelineServ/gateway/src/main/resources/application.yml
View File

@@ -92,6 +92,14 @@ spring:
filters:
- StripPrefix=1
# ==================== 工单服务 WebSocket 路由 ====================
- id: workcase-websocket
uri: lb:ws://workcase-service
predicates:
- Path=/urban-lifeline/workcase/ws/**
filters:
- StripPrefix=1
# ==================== 工单服务路由 ====================
- id: workcase-service
uri: lb://workcase-service