wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解決衝突

Browse Source
This commit is contained in:
wulin 2023-09-22 10:22:11 +08:00
commit cfcc9caf0f
4 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
iot-gateway/src/main/java/com/qiuguo/iot/gateway/filter/AuthFilter.java
View File

@ -36,29 +36,30 @@ public class AuthFilter implements GlobalFilter, Ordered {
@Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
ServerHttpRequest request = exchange.getRequest();
String url = request.getURI().toString();
if (xssProperties.getExcludeUrls().contains(url)) {
return chain.filter(exchange);
}
String api_token = exchange.getRequest().getHeaders().getFirst(UserAuthContains.API_TOKEN);
String api_type = exchange.getRequest().getHeaders().getFirst(UserAuthContains.API_TYPE);
if (ObjectUtils.isEmpty(api_token) || ObjectUtils.isEmpty(api_type)) {
return Mono.error(new RuntimeException("未登录"));
}
String key = RedisConstans.IOT_TOKEN.concat(api_token);
return reactiveRedisTemplate.getExpire(key).map(Duration::getSeconds).flatMap(ttl -> {
if (ttl == -1) {
// 用户没登陆
return Mono.error(new RuntimeException("未登录"));
} else if (ttl <= 3600) {
// token 将要失效
return reactiveRedisTemplate.expire(key, Duration.ofDays(7)).then(chain.filter(exchange));
} else {
// 正常登录
return chain.filter(exchange);
}
});
String url = request.getPath().toString();
return chain.filter(exchange);
// if (xssProperties.getExcludeUrls().contains(url)) {
// return chain.filter(exchange);
// }
//
// String api_token = exchange.getRequest().getHeaders().getFirst(UserAuthContains.API_TOKEN);
// String api_type = exchange.getRequest().getHeaders().getFirst(UserAuthContains.API_TYPE);
// if (ObjectUtils.isEmpty(api_token) || ObjectUtils.isEmpty(api_type)) {
// return Mono.error(new RuntimeException("未登录"));
// }
// String key = RedisConstans.IOT_TOKEN.concat(api_token);
// return reactiveRedisTemplate.getExpire(key).map(Duration::getSeconds).flatMap(ttl -> {
// if (ttl == -1) {
// // 用户没登陆
// return Mono.error(new RuntimeException("未登录"));
// } else if (ttl <= 3600) {
// // token 将要失效
// return reactiveRedisTemplate.expire(key, Duration.ofDays(7)).then(chain.filter(exchange));
// } else {
// // 正常登录
// return chain.filter(exchange);
// }
// });
}

15
iot-gateway/src/main/resources/bootstrap-dev.yml
View File

@ -30,15 +30,8 @@ spring:
timeout: 5000
gateway:
routes:
- id: user-api
uri: lb://user-api
- id: qiuguo-iot-box-user-api
uri: http://192.168.8.199:8080
predicates:
- Path=/device/**
- Path=/user/**
- Path=/tuya/**
order: 1
- id: websocket-api
uri: lb://websocket-api
predicates:
- Path=/websocket/**
order: 2
- Path=/iot-user/**
order: 1

3
iot-gateway/src/main/resources/bootstrap.yml
View File

@ -1,5 +1,5 @@
server:
port: 8080
port: 8081
spring:
profiles:
# 环境配置
@ -7,4 +7,3 @@ spring:
application:
name: qiuguo-iot-gateway

1
iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml
View File

@ -1,5 +1,6 @@
server:
port: 8080
spring:
profiles:
# 环境配置