mirror of
http://git.pig4cloud.com/pig/pigx.git
synced 2026-11-08 12:39:05 +08:00
🐛 修复 BUG:解决动态路由导致swagger失效的问题
This commit is contained in:
1 parent
a226c8b936
commit
54a10c1446
2 files changed
+131
-7
No files matched your search
@@ -17,9 +17,8 @@
|
||||
|
||||
package com.pig4cloud.pigx.gateway.config;
|
||||
|
||||
import com.pig4cloud.pigx.gateway.handler.DynamicRouteHandler;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.cloud.gateway.config.GatewayProperties;
|
||||
import org.springframework.cloud.gateway.route.RouteLocator;
|
||||
import org.springframework.cloud.gateway.support.NameUtils;
|
||||
import org.springframework.context.annotation.Primary;
|
||||
import org.springframework.stereotype.Component;
|
||||
@@ -38,22 +37,22 @@ import java.util.List;
|
||||
@AllArgsConstructor
|
||||
public class SwaggerProvider implements SwaggerResourcesProvider {
|
||||
private static final String API_URI = "/v2/api-docs";
|
||||
private final RouteLocator routeLocator;
|
||||
private final GatewayProperties gatewayProperties;
|
||||
private final DynamicRouteHandler dynamicRouteHandler;
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public List<SwaggerResource> get() {
|
||||
List<SwaggerResource> resources = new ArrayList<>();
|
||||
List<String> routes = new ArrayList<>();
|
||||
routeLocator.getRoutes().subscribe(route -> routes.add(route.getId()));
|
||||
gatewayProperties.getRoutes().stream().filter(routeDefinition -> routes.contains(routeDefinition.getId()))
|
||||
dynamicRouteHandler.routes().subscribe(routeMap->routeMap.keySet().forEach(route->routes.add(route)));
|
||||
dynamicRouteHandler.routes().subscribe(routeMap->routeMap.values().stream().filter(routeDefinition -> routes.contains(routeDefinition.getId()))
|
||||
.forEach(routeDefinition -> routeDefinition.getPredicates().stream()
|
||||
.filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName()))
|
||||
.filter(predicateDefinition -> !"pigx-auth".equalsIgnoreCase(routeDefinition.getId()))
|
||||
.forEach(predicateDefinition -> resources.add(swaggerResource(routeDefinition.getId(),
|
||||
predicateDefinition.getArgs().get(NameUtils.GENERATED_NAME_PREFIX + "0")
|
||||
.replace("/**", API_URI)))));
|
||||
.replace("/**", API_URI))))));
|
||||
return resources;
|
||||
}
|
||||
|
||||
|
||||
+125
@@ -0,0 +1,125 @@
|
||||
package com.pig4cloud.pigx.gateway.handler;
|
||||
|
||||
import cn.hutool.json.JSONArray;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import com.pig4cloud.pigx.common.core.constant.CommonConstant;
|
||||
import com.pig4cloud.pigx.common.gateway.support.DynamicRouteInitEvent;
|
||||
import com.pig4cloud.pigx.common.gateway.vo.RouteDefinitionVo;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.cloud.gateway.event.RefreshRoutesEvent;
|
||||
import org.springframework.cloud.gateway.filter.FilterDefinition;
|
||||
import org.springframework.cloud.gateway.handler.predicate.PredicateDefinition;
|
||||
import org.springframework.cloud.gateway.route.RouteDefinition;
|
||||
import org.springframework.cloud.gateway.route.RouteDefinitionLocator;
|
||||
import org.springframework.context.ApplicationEventPublisher;
|
||||
import org.springframework.context.ApplicationEventPublisherAware;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
|
||||
import org.springframework.stereotype.Service;
|
||||
import reactor.core.publisher.Mono;
|
||||
|
||||
import java.net.URI;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* DynamicRouteHandler
|
||||
* 动态路由处理器
|
||||
* @author: lengleng
|
||||
* @date: 2018/11/7
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class DynamicRouteHandler implements ApplicationEventPublisherAware {
|
||||
private final RouteDefinitionLocator routeDefinitionLocator;
|
||||
private final RedisTemplate redisTemplate;
|
||||
private ApplicationEventPublisher applicationEventPublisher;
|
||||
|
||||
public DynamicRouteHandler(RedisTemplate redisTemplate
|
||||
, RouteDefinitionLocator routeDefinitionLocator) {
|
||||
this.redisTemplate = redisTemplate;
|
||||
this.routeDefinitionLocator = routeDefinitionLocator;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取全部路由
|
||||
* <p>
|
||||
* RedisRouteDefinitionWriter.java
|
||||
* PropertiesRouteDefinitionLocator.java
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Mono<Map<String, RouteDefinition>> routes() {
|
||||
return routeDefinitionLocator.getRouteDefinitions()
|
||||
.collectMap(RouteDefinition::getId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新路由信息
|
||||
*
|
||||
* @param routes 路由信息
|
||||
* @return
|
||||
*/
|
||||
public Mono<Void> editRoutes(JSONObject routes) {
|
||||
Boolean result = redisTemplate.delete(CommonConstant.ROUTE_KEY);
|
||||
log.info("清空网关路由 {} ", result);
|
||||
|
||||
routes.forEach((key, value) -> {
|
||||
log.info("更新路由 -> {} ->{}", key, value);
|
||||
RouteDefinitionVo vo = new RouteDefinitionVo();
|
||||
Map<String, Object> map = (Map) value;
|
||||
|
||||
Object id = map.get("id");
|
||||
if (id != null) {
|
||||
vo.setId(String.valueOf(id));
|
||||
}
|
||||
|
||||
Object predicates = map.get("predicates");
|
||||
if (predicates != null) {
|
||||
JSONArray predicatesArray = (JSONArray) predicates;
|
||||
List<PredicateDefinition> predicateDefinitionList =
|
||||
predicatesArray.toList(PredicateDefinition.class);
|
||||
vo.setPredicates(predicateDefinitionList);
|
||||
}
|
||||
|
||||
Object filters = map.get("filters");
|
||||
if (filters != null) {
|
||||
JSONArray filtersArray = (JSONArray) filters;
|
||||
List<FilterDefinition> filterDefinitionList
|
||||
= filtersArray.toList(FilterDefinition.class);
|
||||
vo.setFilters(filterDefinitionList);
|
||||
}
|
||||
|
||||
Object uri = map.get("uri");
|
||||
if (uri != null) {
|
||||
vo.setUri(URI.create(String.valueOf(uri)));
|
||||
}
|
||||
|
||||
Object order = map.get("order");
|
||||
if (order != null) {
|
||||
vo.setOrder(Integer.parseInt(String.valueOf(order)));
|
||||
}
|
||||
|
||||
redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(RouteDefinitionVo.class));
|
||||
redisTemplate.opsForHash().put(CommonConstant.ROUTE_KEY, key, vo);
|
||||
});
|
||||
log.debug("更新网关路由结束 ");
|
||||
this.applicationEventPublisher.publishEvent(new RefreshRoutesEvent(this));
|
||||
return Mono.empty();
|
||||
}
|
||||
|
||||
/**
|
||||
* 回滚路由
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public Mono<Void> fallback() {
|
||||
this.applicationEventPublisher.publishEvent(new DynamicRouteInitEvent(this));
|
||||
return Mono.empty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
|
||||
this.applicationEventPublisher = applicationEventPublisher;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user