都删了

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

@@ -23,12 +23,6 @@
             <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,7 +3,7 @@ package app;
 import xstartup.base.XStartup;
 import xstartup.base.conf.XServerConf;
 import xstartup.boot.XStartupApplication;
-import xstartup.feature.cloud.XCloudAlibabaFeature;
+import xstartup.feature.cloud.XCloudAlibabaGatewayFeature;
 import xstartup.feature.cors.XCorsFeature;
 
 /**
@@ -16,7 +16,7 @@ public class DeployPpsGatewayApplication {
     public static void main(String... args) {
         XStartup startup = new XStartupApplication("pps");
         startup.config(new XServerConf(22068).naming("pps-gateway"));
-        startup.enable(XCloudAlibabaFeature.class);
+        startup.enable(XCloudAlibabaGatewayFeature.class);
         startup.enable(XCorsFeature.class);
         startup.run(args);
     }

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

@@ -19,7 +19,7 @@ x.db.user=@x.db.user@
 x.db.password=@x.db.password@
 x.db.naming=@x.db.naming@
 #cors
-x.cors.origin-pattern=*
+x.cors.origin-pattern=@x.cors.origin-pattern@
 x.cors.exposed-headers=*
 spring.autoconfigure.exclude=*
 #\u6CE8\u518C\u4E2D\u5FC3

D03-deploy/filters/filter-dev.properties

@@ -59,7 +59,8 @@ 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
-
+#cors
+x.cors.origin-pattern=http://localhost:8080,http://localhost:8900,http://localhost:8901,http://localhost:8902
 #nacos-\u6CE8\u518C\u4E2D\u5FC3
 x.cloud.discovery.server-addr=192.168.0.128:8848
 x.cloud.discovery.namespace=public

D03-deploy/filters/filter-prod.properties

@@ -223,6 +223,8 @@ x.db.pps.core.ims.user=pps_interface_user
 x.db.pps.core.ims.password=QIb-U6D4dKMTP4NwMh7AOA==
 x.db.pps.core.ims.naming=snake-case
 
+#cors
+x.cors.origin-pattern=http://localhost:8080,http://localhost:8900,http://localhost:8901,http://localhost:8902
 #nacos-\u6CE8\u518C\u4E2D\u5FC3
 x.cloud.discovery.server-addr=192.168.0.128:8848
 x.cloud.discovery.namespace=public

D03-deploy/filters/filter-test.properties

@@ -15,7 +15,6 @@ x.server.port.signature=10093
 x.server.port.third-interface=10094
 x.server.port.report=10095
 x.server.host=127.0.0.1
-
 #\u81EA\u5B9A\u4E49\u914D\u7F6E
 #\uFF01\uFF01\uFF01\uFF01\u7531\u4E8E\u534E\u4E3A\u4E91\u5E73\u53F0\u8C03\u6574\uFF0C \u5F00\u53D1\uFF0825-test\uFF09\u548C\u6D4B\u8BD5\uFF08150-uat\uFF09\u73AF\u5883\u5171\u7528\u4E00\u4E2Amq \uFF0C\u6545\u5F00\u53D1\u73AF\u5883 \u4F7F\u7528\u7684topic \u6DFB\u52A0dev_ \u524D\u7F00 \uFF01\uFF01\uFF01\uFF01
 #\uFF01\uFF01\uFF01\uFF01\u7531\u4E8E\u534E\u4E3A\u4E91\u5E73\u53F0\u8C03\u6574\uFF0C \u5F00\u53D1\uFF0825-test\uFF09\u548C\u6D4B\u8BD5\uFF08150-uat\uFF09\u73AF\u5883\u5171\u7528\u4E00\u4E2Amq \uFF0C\u6545\u5F00\u53D1\u73AF\u5883 \u4F7F\u7528\u7684topic \u6DFB\u52A0dev_ \u524D\u7F00 \uFF01\uFF01\uFF01\uFF01
@@ -44,9 +43,7 @@ pps.core.system.login-config.adminRoles=638dc709-7b21-4139-bf27-56ac9390168b
 pps.core.system.login-config.iamToLoginUrl=http://10.21.140.25/
 pps.core.transfer.transfer-config.oldPPSAddress=http://10.20.89.75
 pps.core.task.task-config.ackImsUrl=https://test-ims.pipechina.com.cn/api/maintenance/weekPlan/updatePPS
-
 pps.core.common.base-config.predictedUrl=http://121.36.43.217:8098/
-
 pps.core.primbpm.bps-config.bpsAddress=http://10.37.19.112:48084
 pps.core.primbpm.bps-config.bpsVirtualAddress=http://10.37.19.7:8762
 pps.core.primbpm.bps-config.bpsGraphAddress=http://10.37.19.173
@@ -54,38 +51,30 @@ pps.core.primbpm.bps-config.bpsPartyAddress=http://10.37.19.46:8090
 pps.core.primbpm.bps-config.userId=sysadmin
 pps.core.primbpm.bps-config.userName=sysadmin
 pps.core.primbpm.bps-config.tenantId=PPS
-
 pps.core.iam.iam-config.clientId=gwxpps
 pps.core.iam.iam-config.iamUrl=http://10.20.144.9
 pps.core.iam.iam-config.redirectUrl=http://10.21.140.150/api/pps/system/login/iam-to-login
 pps.core.iam.iam-config.responseType=code
 pps.core.iam.iam-config.state=pipe
 pps.core.common.analysis-transfer-config.useMq2Analysis=true
-
 pps.core.measure.si-config.siUrl=http://10.20.89.75/interface/
-
-
 pps.core.system.login-config.ukeyUrl=https://mfstest-iam.pipechina.com.cn/verify_signature
 pps.core.system.login-config.appid=mEvc
-
 #\u65E5\u5FD7\u914D\u7F6E
 x.log.level=debug
 x.log.directory=/home/pps/log
-
 # redis
 x.cache.type=redis-cluster
 x.cache.host=172.16.1.153,172.16.1.148,172.16.1.160,172.16.1.63,172.16.1.32,172.16.1.145,172.16.1.238,172.16.1.9,172.16.1.114,172.16.1.4,172.16.1.254,172.16.1.85,172.16.1.118,172.16.1.252,172.16.1.26,172.16.1.47
 x.cache.port=6379,6379,6379,6379,6379,6379,6379,6379,6379,6379,6379,6379,6379,6379,6379,6379
 x.cache.auth=p7i7ZEsgxUnuUXxYPQLGJA==
 x.cache.db=0
-
 #obs
 x.storage.type=obs
 x.storage.endpoint=obsv3.gw-beijing-1.bjcloud.pipechina.com.cn
 x.storage.access-key-id=ZZT1D5TQBMQ1C72OY3Y6
 x.storage.secret-access-key=u5o2eW942TVgYo6O9vJTJKovcz3z5BoZsY3oCAY0
 x.storage.bucket-name=pps-obs-02
-
 #mqs
 x.mq.factory=xstartup.toolkit.mq.kafka.SaslSslKafkaMqFactory
 x.mq.host=172.16.80.12,172.16.80.74,172.16.80.37
@@ -96,7 +85,6 @@ x.mq.group=group001
 x.mq.sasl-mechanism=PLAIN
 x.mq.ssl-endpoint-identification-algorithm=
 x.mq.ssl-truststore-location=classpath:kafka/truststore-test.jks
-
 # datasource
 x.db.sharding=1
 x.db.driver=org.postgresql.Driver
@@ -104,133 +92,116 @@ x.db.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/p
 x.db.user=root
 x.db.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.naming=snake-case
-
 x.db.pps.core.analysis.sharding=1
 x.db.pps.core.analysis.driver=org.postgresql.Driver
 x.db.pps.core.analysis.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_analysis&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.analysis.user=root
 x.db.pps.core.analysis.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.analysis.naming=snake-case
-
 x.db.pps.core.primbpm.sharding=1
 x.db.pps.core.primbpm.driver=org.postgresql.Driver
 x.db.pps.core.primbpm.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_workflow&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.primbpm.user=root
 x.db.pps.core.primbpm.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.primbpm.naming=snake-case
-
 x.db.pps.core.calc.sharding=1
 x.db.pps.core.calc.driver=org.postgresql.Driver
 x.db.pps.core.calc.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_transportation_calc&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.calc.user=root
 x.db.pps.core.calc.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.calc.naming=snake-case
-
 x.db.pps.core.dispatch.sharding=1
 x.db.pps.core.dispatch.driver=org.postgresql.Driver
 x.db.pps.core.dispatch.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_dispatch&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.dispatch.user=root
 x.db.pps.core.dispatch.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.dispatch.naming=snake-case
-
 x.db.pps.core.energy.sharding=1
 x.db.pps.core.energy.driver=org.postgresql.Driver
 x.db.pps.core.energy.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_energy_consumption&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.energy.user=root
 x.db.pps.core.energy.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.energy.naming=snake-case
-
 x.db.pps.core.baseframe.sharding=1
 x.db.pps.core.baseframe.driver=org.postgresql.Driver
 x.db.pps.core.baseframe.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_base_frame&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.baseframe.user=root
 x.db.pps.core.baseframe.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.baseframe.naming=snake-case
-
 x.db.pps.core.measure.sharding=1
 x.db.pps.core.measure.driver=org.postgresql.Driver
 x.db.pps.core.measure.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_measure&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.measure.user=root
 x.db.pps.core.measure.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.measure.naming=snake-case
-
 x.db.pps.core.online.sharding=1
 x.db.pps.core.online.driver=org.postgresql.Driver
 x.db.pps.core.online.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_into_production&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.online.user=root
 x.db.pps.core.online.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.online.naming=snake-case
-
 x.db.pps.core.plan.sharding=1
 x.db.pps.core.plan.driver=org.postgresql.Driver
 x.db.pps.core.plan.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_plan&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.plan.user=root
 x.db.pps.core.plan.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.plan.naming=snake-case
-
 x.db.pps.core.signature.sharding=1
 x.db.pps.core.signature.driver=org.postgresql.Driver
 x.db.pps.core.signature.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_signature&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.signature.user=root
 x.db.pps.core.signature.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.signature.naming=snake-case
-
 x.db.pps.core.system.sharding=1
 x.db.pps.core.system.driver=org.postgresql.Driver
 x.db.pps.core.system.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_base_info&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.system.user=root
 x.db.pps.core.system.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.system.naming=snake-case
-
 x.db.pps.core.interface.sharding=1
 x.db.pps.core.interface.driver=org.postgresql.Driver
 x.db.pps.core.interface.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_interface&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.interface.user=root
 x.db.pps.core.interface.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.interface.naming=snake-case
-
 x.db.pps.core.report.sharding=1
 x.db.pps.core.report.driver=org.postgresql.Driver
 x.db.pps.core.report.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_report&characterEncoding=utf8&allowEncodingChanges=true
 x.db.pps.core.report.user=root
 x.db.pps.core.report.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.report.naming=snake-case
-
 x.db.pps.core.mdm.sharding=1
 x.db.pps.core.mdm.driver=org.postgresql.Driver
 x.db.pps.core.mdm.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_third&characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai
 x.db.pps.core.mdm.user=root
 x.db.pps.core.mdm.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.mdm.naming=snake-case
-
 x.db.pps.core.ihd.sharding=1
 x.db.pps.core.ihd.driver=org.postgresql.Driver
 x.db.pps.core.ihd.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_base_info&characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai
 x.db.pps.core.ihd.user=root
 x.db.pps.core.ihd.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.ihd.naming=snake-case
-
 x.db.pps.core.transfer.sharding=1
 x.db.pps.core.transfer.driver=org.postgresql.Driver
 x.db.pps.core.transfer.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_interface&characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai
 x.db.pps.core.transfer.user=root
 x.db.pps.core.transfer.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.transfer.naming=snake-case
-
 x.db.pps.core.ims.sharding=1
 x.db.pps.core.ims.driver=org.postgresql.Driver
 x.db.pps.core.ims.url=jdbc:postgresql://172.16.1.56:8000,172.16.1.80:8000,172.16.1.187:8000/pps_uat?currentSchema=pps_third&characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai
 x.db.pps.core.ims.user=root
 x.db.pps.core.ims.password=yCimDc1KyfJbgDJ3p7Cqyg==
 x.db.pps.core.ims.naming=snake-case
-
+#cors
+x.cors.origin-pattern=http://localhost:8080,http://localhost:8900,http://localhost:8901,http://localhost:8902
 #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
@@ -238,7 +209,6 @@ x.cloud.config.group=DEFAULT_GROUP
 x.cloud.config.file-extension=properties
 x.cloud.config.username=nacos
 x.cloud.config.password=nacos
-
 # \u81EA\u5B9A\u4E49\u914D\u7F6E
 weather.file.temp.path=/home/weather-jar/temp/receive
 weather.mail.host=imap.163.com