diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index ff9cc67f7..af1618e48 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -26,7 +26,7 @@ 21.3.0.0 8.4.1.jre8 8.1.2.79 - 4.0.0 + 3.0.3 2.2.0 1.6.9 4.4.0 @@ -232,9 +232,9 @@ ${springdoc.version} - com.github.xiaoymin + io.springboot knife4j-openapi3-ui - ${knife4j.version} + 3.0.3 io.swagger.core.v3 diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/PigxRibbonRuleProperties.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/PigxRibbonRuleProperties.java deleted file mode 100755 index eb6360135..000000000 --- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/PigxRibbonRuleProperties.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.common.gateway.support; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; - -import java.util.ArrayList; -import java.util.List; - -/** - * Ribbon 配置 - * - * @author L.cm - */ -@Getter -@Setter -@RefreshScope -@ConfigurationProperties("ribbon.rule") -public class PigxRibbonRuleProperties { - - /** - * 是否开启,默认:true - */ - private boolean enabled = Boolean.TRUE; - - /** - * 是否开启灰度路由,默认:false - */ - private boolean grayEnabled; - - /** - * 优先的ip列表,支持通配符,例如:10.20.0.8*、10.20.0.* - */ - private List priorIpPattern = new ArrayList<>(); - -} diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 340360012..bebd1942c 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -99,7 +99,7 @@ - com.github.xiaoymin + io.springboot knife4j-openapi3-ui diff --git a/pigx-gateway/src/main/resources/application.yml b/pigx-gateway/src/main/resources/application.yml index f83e61d07..f918e7dd6 100644 --- a/pigx-gateway/src/main/resources/application.yml +++ b/pigx-gateway/src/main/resources/application.yml @@ -10,15 +10,6 @@ spring: server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} - gateway: - routes: - # 固定路由转发配置 无修改 - - id: openapi - uri: lb://pigx-gateway - predicates: - - Path=/v3/api-docs/** - filters: - - RewritePath=/v3/api-docs/(?.*), /$\{path}/$\{path}/v3/api-docs config: import: - optional:nacos:application-@profiles.active@.yml