都删了

D03-deploy/deploy-pps-all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>xstartup-cloud</groupId>
         <artifactId>xstartup-cloud-parent-app</artifactId>
-        <version>1.15.169-xstartup-cloud</version>
+        <version>1.16.69-xstartup-v3-cloud</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

D03-deploy/deploy-pps-all/src/main/resources/deploy-pps-all.app.properties

@@ -25,3 +25,16 @@ x.db.url=@x.db.url@
 x.db.user=@x.db.user@
 x.db.password=@x.db.password@
 x.db.naming=@x.db.naming@
+#\u6CE8\u518C\u4E2D\u5FC3
+x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
+x.cloud.discovery.namespace=@x.cloud.discovery.namespace@
+x.cloud.discovery.group=@x.cloud.discovery.group@
+x.cloud.discovery.username=@x.cloud.discovery.username@
+x.cloud.discovery.password=@x.cloud.discovery.password@
+#\u914D\u7F6E\u4E2D\u5FC3
+x.cloud.config.server-addr=@x.cloud.config.server-addr@
+x.cloud.config.namespace=@x.cloud.config.namespace@
+x.cloud.config.group=@x.cloud.config.group@
+x.cloud.config.file-extension=@x.cloud.config.file-extension@
+x.cloud.config.username=@x.cloud.config.username@
+x.cloud.config.password=@x.cloud.config.password@
\ No newline at end of file

D03-deploy/deploy-pps-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>xstartup-cloud</groupId>
         <artifactId>xstartup-cloud-parent-gateway</artifactId>
-        <version>1.15.169-xstartup-cloud</version>
+        <version>1.16.69-xstartup-v3-cloud</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,6 +13,21 @@
     <groupId>gf</groupId>
     <artifactId>deploy-pps-gateway</artifactId>
     <dependencies>
+        <dependency>
+            <groupId>xstartup-cloud</groupId>
+            <artifactId>xstartup-cloud-feature-alibaba-gateway</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>xstartup-cloud</groupId>
+            <artifactId>xstartup-cloud-feature-alibaba</artifactId>
+            <version>1.16.69-xstartup-v3-cloud</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <profiles>
         <!-- 开发环境，默认激活 -->

D03-deploy/deploy-pps-gateway/src/main/java/app/DeployPpsGatewayApplication.java

@@ -3,11 +3,15 @@ package app;
 import xstartup.base.XStartup;
 import xstartup.base.conf.XServerConf;
 import xstartup.boot.XStartupApplication;
+import xstartup.feature.cloud.XCloudAlibabaFeature;
+import xstartup.feature.cors.XCorsFeature;
 
 public class DeployPpsGatewayApplication {
     public static void main(String... args) {
         XStartup startup = new XStartupApplication("pps");
         startup.config(new XServerConf(22068).naming("pps-gateway-service"));
+        startup.enable(XCloudAlibabaFeature.class);
+        startup.enable(XCorsFeature.class);
         startup.run(args);
     }
 }

D03-deploy/deploy-pps-gateway/src/main/resources/deploy-pps-gateway.app.properties

@@ -3,7 +3,7 @@ x.app.buildtime=${maven.build.timestamp}
 x.log.level=@x.log.level@
 x.log.directory=@x.log.directory@
 x.server.port=@x.server.port.gateway@
-x.server.host=127.0.0.1
+x.server.host=@x.server.host@
 # redis
 x.cache.type=@x.cache.type@
 x.cache.host=@x.cache.host@
@@ -18,3 +18,18 @@ x.db.password=@x.db.password@
 x.db.naming=@x.db.naming@
 #cors
 x.cors.origin-pattern=*
+x.cors.exposed-headers=*
+spring.autoconfigure.exclude=*
+#\u6CE8\u518C\u4E2D\u5FC3
+x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
+x.cloud.discovery.namespace=@x.cloud.discovery.namespace@
+x.cloud.discovery.group=@x.cloud.discovery.group@
+x.cloud.discovery.username=@x.cloud.discovery.username@
+x.cloud.discovery.password=@x.cloud.discovery.password@
+#\u914D\u7F6E\u4E2D\u5FC3
+x.cloud.config.server-addr=@x.cloud.config.server-addr@
+x.cloud.config.namespace=@x.cloud.config.namespace@
+x.cloud.config.group=@x.cloud.config.group@
+x.cloud.config.file-extension=@x.cloud.config.file-extension@
+x.cloud.config.username=@x.cloud.config.username@
+x.cloud.config.password=@x.cloud.config.password@
\ No newline at end of file

D03-deploy/deploy-pps-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>xstartup-cloud</groupId>
         <artifactId>xstartup-cloud-parent-app</artifactId>
-        <version>1.15.169-xstartup-cloud</version>
+        <version>1.16.69-xstartup-v3-cloud</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -44,6 +44,10 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.23</version>
         </dependency>
+        <dependency>
+            <groupId>xstartup-cloud</groupId>
+            <artifactId>xstartup-cloud-feature-alibaba</artifactId>
+        </dependency>
     </dependencies>
 
     <profiles>

D03-deploy/deploy-pps-system/src/main/java/app/DeployPpsSystemApplication.java

@@ -8,6 +8,8 @@ import xstartup.base.conf.XServiceConf;
 import xstartup.boot.XStartupApplication;
 import xstartup.feature.api.XApiFeature;
 import xstartup.feature.api.conf.XApiCookieConf;
+import xstartup.feature.cloud.XCloudAlibabaFeature;
+import xstartup.feature.cors.XCorsFeature;
 import xstartup.feature.mybatis.XMybatisFeature;
 import xstartup.feature.rpc.XRpcFeature;
 import xstartup.feature.swagger.XSwaggerFeature;
@@ -23,6 +25,8 @@ public class DeployPpsSystemApplication {
         startup.enable(XSwaggerFeature.class);
         startup.enable(XMybatisFeature.class);
         startup.enable(XRpcFeature.class);
+        startup.enable(XCorsFeature.class);
+        startup.enable(XCloudAlibabaFeature.class);
         startup.run(args);
     }
 }

D03-deploy/deploy-pps-system/src/main/resources/deploy-pps-system.app.properties

@@ -30,3 +30,16 @@ x.db.pps.core.system.url=@x.db.pps.core.system.url@
 x.db.pps.core.system.user=@x.db.pps.core.system.user@
 x.db.pps.core.system.password=@x.db.pps.core.system.password@
 x.db.pps.core.system.naming=@x.db.pps.core.system.naming@
+#\u6CE8\u518C\u4E2D\u5FC3
+x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
+x.cloud.discovery.namespace=@x.cloud.discovery.namespace@
+x.cloud.discovery.group=@x.cloud.discovery.group@
+x.cloud.discovery.username=@x.cloud.discovery.username@
+x.cloud.discovery.password=@x.cloud.discovery.password@
+#\u914D\u7F6E\u4E2D\u5FC3
+x.cloud.config.server-addr=@x.cloud.config.server-addr@
+x.cloud.config.namespace=@x.cloud.config.namespace@
+x.cloud.config.group=@x.cloud.config.group@
+x.cloud.config.file-extension=@x.cloud.config.file-extension@
+x.cloud.config.username=@x.cloud.config.username@
+x.cloud.config.password=@x.cloud.config.password@
\ No newline at end of file

D03-deploy/deploy-pps-task/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>xstartup-cloud</groupId>
         <artifactId>xstartup-cloud-parent-app</artifactId>
-        <version>1.15.169-xstartup-cloud</version>
+        <version>1.16.69-xstartup-v3-cloud</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -35,6 +35,10 @@
             <groupId>xstartup</groupId>
             <artifactId>xstartup-feature-mybatis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>xstartup-cloud</groupId>
+            <artifactId>xstartup-cloud-feature-alibaba</artifactId>
+        </dependency>
     </dependencies>
 
     <profiles>

D03-deploy/deploy-pps-task/src/main/java/app/DeployPpsTaskApplication.java

@@ -7,6 +7,7 @@ import xstartup.base.conf.XServiceConf;
 import xstartup.boot.XStartupApplication;
 import xstartup.feature.api.XApiFeature;
 import xstartup.feature.api.conf.XApiCookieConf;
+import xstartup.feature.cloud.XCloudAlibabaFeature;
 import xstartup.feature.cors.XCorsFeature;
 import xstartup.feature.mybatis.XMybatisFeature;
 import xstartup.feature.rpc.XRpcFeature;
@@ -22,6 +23,8 @@ public class DeployPpsTaskApplication {
         startup.enable(XCorsFeature.class);
         startup.enable(XMybatisFeature.class);
         startup.enable(XRpcFeature.class);
+        startup.enable(XCorsFeature.class);
+        startup.enable(XCloudAlibabaFeature.class);
         startup.run(args);
     }
 }

D03-deploy/deploy-pps-task/src/main/resources/deploy-pps-task.app.properties

@@ -18,3 +18,16 @@ x.db.url=@x.db.url@
 x.db.user=@x.db.user@
 x.db.password=@x.db.password@
 x.db.naming=@x.db.naming@
+#\u6CE8\u518C\u4E2D\u5FC3
+x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
+x.cloud.discovery.namespace=@x.cloud.discovery.namespace@
+x.cloud.discovery.group=@x.cloud.discovery.group@
+x.cloud.discovery.username=@x.cloud.discovery.username@
+x.cloud.discovery.password=@x.cloud.discovery.password@
+#\u914D\u7F6E\u4E2D\u5FC3
+x.cloud.config.server-addr=@x.cloud.config.server-addr@
+x.cloud.config.namespace=@x.cloud.config.namespace@
+x.cloud.config.group=@x.cloud.config.group@
+x.cloud.config.file-extension=@x.cloud.config.file-extension@
+x.cloud.config.username=@x.cloud.config.username@
+x.cloud.config.password=@x.cloud.config.password@
\ No newline at end of file

D03-deploy/filters/filter-dev.properties

@@ -31,3 +31,16 @@ x.db.pps.core.system.url=jdbc:mysql://120.46.208.168:3306/gf_demo?allowPublicKey
 x.db.pps.core.system.user=root
 x.db.pps.core.system.password=vwy69PQDfShqozf4ISXEoQ==
 x.db.pps.core.system.naming=snake-case
+#nacos-\u6CE8\u518C\u4E2D\u5FC3
+x.cloud.discovery.server-addr=192.168.0.128:8848
+x.cloud.discovery.namespace=public
+x.cloud.discovery.group=DEFAULT_GROUP
+x.cloud.discovery.username=nacos
+x.cloud.discovery.password=nacos
+#nacos-\u914D\u7F6E\u4E2D\u5FC3
+x.cloud.config.server-addr=192.168.0.128:8848
+x.cloud.config.namespace=piublic
+x.cloud.config.group=DEFAULT_GROUP
+x.cloud.config.file-extension=properties
+x.cloud.config.username=nacos
+x.cloud.config.password=nacos
\ No newline at end of file

D03-deploy/filters/filter-prod.properties

@@ -31,3 +31,16 @@ x.db.pps.core.system.url=jdbc:mysql://120.46.208.168:3306/gf_demo?characterEncod
 x.db.pps.core.system.user=root
 x.db.pps.core.system.password=vwy69PQDfShqozf4ISXEoQ==
 x.db.pps.core.system.naming=snake-case
+#nacos-\u6CE8\u518C\u4E2D\u5FC3
+x.cloud.discovery.server-addr=192.168.0.128:8848
+x.cloud.discovery.namespace=public
+x.cloud.discovery.group=DEFAULT_GROUP
+x.cloud.discovery.username=nacos
+x.cloud.discovery.password=nacos
+#nacos-\u914D\u7F6E\u4E2D\u5FC3
+x.cloud.config.server-addr=192.168.0.128:8848
+x.cloud.config.namespace=piublic
+x.cloud.config.group=DEFAULT_GROUP
+x.cloud.config.file-extension=properties
+x.cloud.config.username=nacos
+x.cloud.config.password=nacos
\ No newline at end of file

D03-deploy/filters/filter-test.properties

@@ -31,3 +31,16 @@ x.db.pps.core.system.url=jdbc:mysql://127.0.0.1:3316/zero_carbon?characterEncodi
 x.db.pps.core.system.user=root
 x.db.pps.core.system.password=bZuyzaSCnZ8kmqIIYOk3Ag==
 x.db.pps.core.system.naming=snake-case
+#nacos-\u6CE8\u518C\u4E2D\u5FC3
+x.cloud.discovery.server-addr=192.168.0.128:8848
+x.cloud.discovery.namespace=public
+x.cloud.discovery.group=DEFAULT_GROUP
+x.cloud.discovery.username=nacos
+x.cloud.discovery.password=nacos
+#nacos-\u914D\u7F6E\u4E2D\u5FC3
+x.cloud.config.server-addr=192.168.0.128:8848
+x.cloud.config.namespace=piublic
+x.cloud.config.group=DEFAULT_GROUP
+x.cloud.config.file-extension=properties
+x.cloud.config.username=nacos
+x.cloud.config.password=nacos
\ No newline at end of file