Merge branch 'master' of http://124.220.229.80:9093/root/backstage

backstage-service/pom.xml

@@ -35,7 +35,6 @@
         <dependency>
             <groupId>com.txz</groupId>
             <artifactId>common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -88,41 +87,41 @@
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-            <version>3.0.10</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo-spring-boot-starter</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </dependency> -->
 
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-            <version>3.0.10</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </dependency> -->
 
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>kryo</artifactId>
-            <version>4.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>de.javakaffee</groupId>
-            <artifactId>kryo-serializers</artifactId>
-            <version>0.45</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>com.esotericsoftware</groupId> -->
+        <!--     <artifactId>kryo</artifactId> -->
+        <!--     <version>4.0.2</version> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>de.javakaffee</groupId> -->
+        <!--     <artifactId>kryo-serializers</artifactId> -->
+        <!--     <version>0.45</version> -->
+        <!-- </dependency> -->
 
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
+            <groupId>org.apache.dubbo.extensions</groupId>
             <artifactId>dubbo-serialization-kryo</artifactId>
-            <version>2.7.9</version>
+            <version>1.0.1</version>
         </dependency>
 
         <!-- Dubbo Registry Nacos -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-registry-nacos</artifactId>
-            <version>3.0.10</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.apache.dubbo</groupId> -->
+        <!--     <artifactId>dubbo-registry-nacos</artifactId> -->
+        <!--     <version>3.0.10</version> -->
+        <!-- </dependency> -->
 
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -158,11 +157,11 @@
             <version>1.56.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.alibaba.nacos</groupId>
-            <artifactId>nacos-client</artifactId>
-            <version>2.2.2</version>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>com.alibaba.nacos</groupId> -->
+        <!--     <artifactId>nacos-client</artifactId> -->
+        <!--     <version>2.2.2</version> -->
+        <!-- </dependency> -->
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>

backstage-service/src/main/java/com/txz/backstage/configurer/WebFluxConfig.java

@@ -1,6 +1,7 @@
 package com.txz.backstage.configurer;
 
 import cn.hutool.core.util.StrUtil;
+import com.txz.backstage.core.ProjectConstant;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -11,6 +12,7 @@ import springfox.documentation.swagger.web.SwaggerResource;
 import springfox.documentation.swagger.web.SwaggerResourcesProvider;
 import reactor.core.publisher.Flux;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -20,6 +22,10 @@ public class WebFluxConfig {
     @Value("${swagger.resource}")
     private String swaggerResource;
 
+    @Resource
+    private Parameters parameters;
+
+
     // @Bean
     // public CorsWebFilter corsWebFilter() {
     //      CorsConfiguration config = new CorsConfiguration();
@@ -37,6 +43,7 @@ public class WebFluxConfig {
 
     @Bean
     public SwaggerResourcesProvider swaggerResourcesProvider() {
+        ProjectConstant.application = parameters.getApplication();
         return () -> {
             List<SwaggerResource> resources = new ArrayList<>();
             resources.add(swaggerResource("backstage", "/v2/api-docs", "1.0"));

backstage-service/src/main/resources/bootstrap.properties

@@ -36,6 +36,7 @@ dubbo.cloud.subscribed-services=
 dubbo.application.qos.enable=false
 dubbo.application.qos.port=28111
 dubbo.application.qos.accept.foreign.ip=false
+dubbo.registry.group=
 
 dubbo.reference.com.foo.BarService.check=false
 dubbo.reference.check=false
@@ -82,8 +83,8 @@ spring.main.web-application-type=reactive
 # Spring Cloud Gateway ??
 spring.cloud.gateway.discovery.locator.enabled=true
 spring.cloud.gateway.discovery.locator.lower-case-service-id=true
-spring.cloud.gateway.httpclient.connect-timeout=500
-spring.cloud.gateway.httpclient.response-timeout=5000
+spring.cloud.gateway.httpclient.connect-timeout=1000
+spring.cloud.gateway.httpclient.response-timeout=60000
 spring.cloud.gateway.filter.circuit-breaker.enabled=true
 
 spring.cloud.gateway.globalcors.cors-configurations.[/**].allowed-headers=*

pom.xml

@@ -2,57 +2,62 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
     <groupId>com.txz</groupId>
     <version>1.0.0-SNAPSHOT</version>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.18</version>
+        <version>2.7.18</version>
     </parent>
 
 
     <artifactId>backstage</artifactId>
     <packaging>pom</packaging>
-	<modules>
-<!--        <module>backstage-interface</module>-->
+    <modules>
+        <!--        <module>backstage-interface</module>-->
         <module>backstage-service</module>
-		<module>backstage-api</module>
+        <module>backstage-api</module>
     </modules>
 
-   <dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>2021.0.8</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!-- <dependency> -->
-			<!--     <groupId>org.springframework.cloud</groupId> -->
-			<!--     <artifactId>spring-cloud-alibaba-dependencies</artifactId> -->
-			<!--     <version>0.2.2.RELEASE</version> -->
-			<!--     <type>pom</type> -->
-			<!--     <scope>import</scope> -->
-			<!-- </dependency> -->
-		</dependencies>
-	</dependencyManagement>
-	<distributionManagement>
-		<snapshotRepository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>nexus-snapshots</id>
-			<name>Nexus Snapshot Repository</name>
-			<url>http://124.220.229.80:9091/repository/maven-snapshots/</url>
-			<layout>default</layout>
-		</snapshotRepository>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.txz</groupId>
+                <artifactId>common</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>2021.0.8</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>2021.0.5.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <distributionManagement>
+        <snapshotRepository>
+            <uniqueVersion>false</uniqueVersion>
+            <id>nexus-snapshots</id>
+            <name>Nexus Snapshot Repository</name>
+            <url>http://124.220.229.80:9091/repository/maven-snapshots/</url>
+            <layout>default</layout>
+        </snapshotRepository>
 
-		<repository>
-			<id>nexus-releases</id>
-			<name>maven-releases</name>
-			<url>http://124.220.229.80:9091/repository/maven-releases/</url>
-		</repository>
-	</distributionManagement>
+        <repository>
+            <id>nexus-releases</id>
+            <name>maven-releases</name>
+            <url>http://124.220.229.80:9091/repository/maven-releases/</url>
+        </repository>
+    </distributionManagement>
 
 
     <build>