wol/AgileBoot-Back-End
2
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: wol:18bb9f9c95771df15e05dc789399cabea60cb61f
Branches Tags
wol:dev wol:dev-text wol:hzm-gateway wol:dev-boot-v3.5.4 wol:dev-codegen wol:dev-gateway wol:dev-hzm wol:dev-cloud-v3.5.4 wol:wuwuming wol:test wol:main wol:For-Pure wol:OLD
...
compare: wol:406f20f7cb19f0fe8bf857f9af672355f38eaa5d
Branches Tags
wol:dev-text wol:dev wol:hzm-gateway wol:dev-boot-v3.5.4 wol:dev-codegen wol:dev-gateway wol:dev-hzm wol:dev-cloud-v3.5.4 wol:wuwuming wol:test wol:main wol:For-Pure wol:OLD

3 Commits
18bb9f9c95 ... 406f20f7cb

Author SHA1 Message Date
cuijiawang
406f20f7cb fix(gateway): 注释掉客户端ID与Token匹配检查逻辑- 临时注释掉Sa-Token中的客户端ID与Token匹配检查代码 
- 保留原有登录校验逻辑
- 为后续重新设计客户端认证机制做准备
 2025-10-23 17:30:00 +08:00
cuijiawang
fb130a65f3 feat(nacos): 添加配置导入功能- 在nacos.yml中新增config.import配置项 
- 支持从Nacos服务器可选导入应用配置文件
- 配置文件路径使用应用名和文件扩展名变量
- 实现配置的动态加载和热更新支持
 2025-10-23 16:49:20 +08:00
cuijiawang
8847f3edef chore(deps): 添加spring依赖-boot-starter-test 
- 在wol-common-web模块中添加测试依赖
- 引入spring-boot-starter-test以支持单元测试
- 为后续测试代码提供基础框架支持
 2025-10-23 11:18:10 +08:00
3 changed files with 25 additions and 16 deletions
Expand all files Collapse all files

4
agileboot-common/wol-common-nacos/src/main/resources/nacos.yml
View File

@@ -16,3 +16,7 @@ spring:
name: ${spring.application.name} name: ${spring.application.name}
username: ${wol.nacos.server.username} username: ${wol.nacos.server.username}
password: ${wol.nacos.server.password} password: ${wol.nacos.server.password}
config:
import:
- optional:nacos:${spring.application.name}.${spring.cloud.nacos.config.file-extension}

4
agileboot-common/wol-common-web/pom.xml
View File

@@ -21,5 +21,9 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

33
wol-gateway/src/main/java/com/agileboot/gateway/config/SaTokenConfig.java
View File

@@ -35,22 +35,23 @@ public class SaTokenConfig {
.setAuth(obj -> { .setAuth(obj -> {
// 登录校验 -- 拦截所有路由 // 登录校验 -- 拦截所有路由
SaRouter.match("/**", "/auth/login", StpUtil::checkLogin) SaRouter.match("/**", "/auth/login", StpUtil::checkLogin)
.check(r -> { // .check(r -> {
ServerHttpRequest request = SaReactorSyncHolder.getExchange().getRequest(); // ServerHttpRequest request = SaReactorSyncHolder.getExchange().getRequest();
// 检查是否登录 是否有token // // 检查是否登录 是否有token
StpUtil.checkLogin(); // StpUtil.checkLogin();
//
// 检查 header 与 param 里的 clientid 与 token 里的是否一致 // // 检查 header 与 param 里的 clientid 与 token 里的是否一致
String headerCid = request.getHeaders().getFirst(LoginHelper.CLIENT_KEY); // String headerCid = request.getHeaders().getFirst(LoginHelper.CLIENT_KEY);
String paramCid = request.getQueryParams().getFirst(LoginHelper.CLIENT_KEY); // String paramCid = request.getQueryParams().getFirst(LoginHelper.CLIENT_KEY);
String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString(); // String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString();
if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) { // if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) {
// token 无效 // // token 无效
throw NotLoginException.newInstance(StpUtil.getLoginType(), // throw NotLoginException.newInstance(StpUtil.getLoginType(),
"-100", "客户端ID与Token不匹配", // "-100", "客户端ID与Token不匹配",
StpUtil.getTokenValue()); // StpUtil.getTokenValue());
} // }
}); // })
;
}).setError(e -> { }).setError(e -> {
if (e instanceof NotLoginException) { if (e instanceof NotLoginException) {
return SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED); return SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED);