diff --git a/changelog.md b/changelog.md index dbb4cebc..3a2b354d 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,7 @@ 需要执行`sop-upgrade-4.1.0.sql` - 重构路由监控功能 +- 升级SpringBoot，SpringCloud，SpringCloudAlibaba版本 ## 4.0.3 diff --git a/pom.xml b/pom.xml index 95c92603..a224f1e2 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,6 @@ 1.2.3 - 4.11 @@ -58,8 +57,8 @@ 3.8.1 1.11 1.2 - - + 2.0.1.Final + 6.0.13.Final 1.9.1 2.3.0.RELEASE 29.0-jre diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/MonitorApi.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/MonitorApi.java index 9fac96a3..4b1e9d91 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/MonitorApi.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/MonitorApi.java @@ -29,8 +29,11 @@ import java.util.stream.Collectors; /** * @author tanghc + * @deprecated use com.gitee.sop.adminserver.api.service.MonitorNewApi + * @see MonitorNewApi */ -@ApiService +@Deprecated +//@ApiService @ApiDoc("服务管理-监控") @Slf4j public class MonitorApi { diff --git a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/MonitorNewApi.java b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/MonitorNewApi.java index a4e564bc..b21f6afc 100644 --- a/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/MonitorNewApi.java +++ b/sop-admin/sop-admin-server/src/main/java/com/gitee/sop/adminserver/api/service/MonitorNewApi.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.stream.Collectors; /** + * 路由监控 * @author tanghc */ @ApiService diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/configuration/BaseGatewayConfiguration.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/configuration/BaseGatewayConfiguration.java index f5036d8a..40de5cf2 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/configuration/BaseGatewayConfiguration.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/configuration/BaseGatewayConfiguration.java @@ -1,10 +1,6 @@ package com.gitee.sop.gatewaycommon.gateway.configuration; import com.gitee.sop.gatewaycommon.bean.ApiConfig; -import com.gitee.sop.gatewaycommon.gateway.controller.ConfigChannelController; -import com.gitee.sop.gatewaycommon.gateway.controller.ErrorLogController; -import com.gitee.sop.gatewaycommon.gateway.controller.GatewayController; -import com.gitee.sop.gatewaycommon.gateway.controller.GatewayMonitorController; import com.gitee.sop.gatewaycommon.gateway.filter.GatewayModifyResponseGatewayFilter; import com.gitee.sop.gatewaycommon.gateway.filter.IndexFilter; import com.gitee.sop.gatewaycommon.gateway.filter.LimitFilter; @@ -50,26 +46,6 @@ public class BaseGatewayConfiguration extends AbstractConfiguration { return new IndexFilter(); } - @Bean - public GatewayController gatewayErrorController() { - return new GatewayController(); - } - - @Bean - public ConfigChannelController configChannelController() { - return new ConfigChannelController(); - } - - @Bean - public ErrorLogController errorLogController() { - return new ErrorLogController(); - } - - @Bean - public GatewayMonitorController gatewayMonitorController() { - return new GatewayMonitorController(); - } - /** * 自定义异常处理[@@]注册Bean时依赖的Bean，会从容器中直接获取，所以直接注入即可 * diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/controller/ErrorLogController.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/controller/ErrorLogController.java deleted file mode 100644 index 978e533a..00000000 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/controller/ErrorLogController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gitee.sop.gatewaycommon.gateway.controller; - -import com.gitee.sop.gatewaycommon.bean.BaseErrorLogController; -import com.gitee.sop.gatewaycommon.param.ApiParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.server.ServerWebExchange; - -import java.util.Map; - -/** - * @author tanghc - */ -@RestController -public class ErrorLogController extends BaseErrorLogController { - - @Override - protected ApiParam getApiParam(ServerWebExchange request) { - Map params = request.getRequest().getQueryParams().toSingleValueMap(); - return ApiParam.build(params); - } -} diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/controller/GatewayMonitorController.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/controller/GatewayMonitorController.java deleted file mode 100644 index 910c874c..00000000 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/controller/GatewayMonitorController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gitee.sop.gatewaycommon.gateway.controller; - -import com.gitee.sop.gatewaycommon.support.BaseMonitorController; -import com.gitee.sop.gatewaycommon.param.ApiParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.server.ServerWebExchange; - -import java.util.Map; - -/** - * @author tanghc - */ -@RestController -public class GatewayMonitorController extends BaseMonitorController { - - @Override - protected ApiParam getApiParam(ServerWebExchange request) { - Map params = request.getRequest().getQueryParams().toSingleValueMap(); - return ApiParam.build(params); - } -} diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/loadbalancer/LoadBalanceConfig.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/loadbalancer/LoadBalanceConfig.java deleted file mode 100644 index 77f6c009..00000000 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/loadbalancer/LoadBalanceConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.gitee.sop.gatewaycommon.loadbalancer; - -/** - * @author tanghc - */ -public class LoadBalanceConfig { - -} diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/EnvGrayManager.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/EnvGrayManager.java index e58c70b8..8cf8ff6d 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/EnvGrayManager.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/EnvGrayManager.java @@ -8,8 +8,6 @@ import com.gitee.sop.gatewaycommon.loadbalancer.ServiceGrayConfig; */ public interface EnvGrayManager extends BeanInitializer { - String ENV_GRAY = "sop.env-gray"; - /** * 保存灰度配置 * @param serviceGrayConfig 灰度配置 diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml index 5633391c..6d84bddd 100644 --- a/sop-common/sop-service-common/pom.xml +++ b/sop-common/sop-service-common/pom.xml @@ -65,7 +65,6 @@ org.springframework spring-webmvc - 5.1.4.RELEASE true diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml index 97eed025..5268c01f 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -40,16 +40,6 @@ spring-boot-starter-actuator - - - io.projectreactor.netty - reactor-netty - 0.9.4.RELEASE - - net.oschina.durcframework fastmybatis-spring-boot-starter diff --git a/sop-gateway/src/main/java/com/gitee/sop/gateway/SopGatewayApplication.java b/sop-gateway/src/main/java/com/gitee/sop/gateway/SopGatewayApplication.java index 20b6880a..ebcc7e92 100644 --- a/sop-gateway/src/main/java/com/gitee/sop/gateway/SopGatewayApplication.java +++ b/sop-gateway/src/main/java/com/gitee/sop/gateway/SopGatewayApplication.java @@ -3,7 +3,7 @@ package com.gitee.sop.gateway; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication +@SpringBootApplication(scanBasePackages = "com.gitee.sop") public class SopGatewayApplication { public static void main(String[] args) {