feat(能源管理系统): 修改架构

1.修改架构添加cse;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -35,7 +35,7 @@
         </dependency>
         <dependency>
             <groupId>xstartup-cloud</groupId>
-            <artifactId>xstartup-cloud-feature-alibaba</artifactId>
+            <artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>

D03-deploy/deploy-pps-base/src/main/java/app/DeployPpsBaseApplication.java

@@ -7,7 +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.cloud.XCloudHuaweiCseFeature;
 import xstartup.feature.cors.XCorsFeature;
 import xstartup.feature.mybatis.XMybatisFeature;
 import xstartup.feature.rpc.XRpcFeature;
@@ -27,7 +27,7 @@ public class DeployPpsBaseApplication {
                 .config(new XServiceConf("pps"));
         startup.enable(XApiFeature.class)
                 .config(new XApiCookieConf("%4bH8s9&", 43200));
-        startup.enable(XCloudAlibabaFeature.class);
+        startup.enable(XCloudHuaweiCseFeature.class);
         startup.enable(XMybatisFeature.class);
         startup.enable(XRpcFeature.class);
         startup.enable(XCorsFeature.class);

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

@@ -32,9 +32,11 @@ x.db.password=@x.db.password@
 x.db.naming=@x.db.naming@
 #cors
 x.cors.origin-pattern=*
-#\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@
+#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
+x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@
+#\u6CE8\u518C\u7684\u5E94\u7528\u540D\u79F0\uFF08\u975E\u5FAE\u670D\u52A1\u540D\u79F0\uFF0C\u5FAE\u670D\u52A1\u540D\u79F0\u5728\u4EE3\u7801\u91CC\u8BBE\u7F6E\u4E86\uFF09
+x.cloud.discovery.app-name=pps-application
+#\u7528\u6237\u540D
+x.cloud.discovery.username=@spring.cloud.servicecomb.credentials.account.name@
\ No newline at end of file
+#\u5BC6\u7801
+x.cloud.discovery.password=@spring.cloud.servicecomb.credentials.account.password@
\ No newline at end of file

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

@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>xstartup-cloud</groupId>
-            <artifactId>xstartup-cloud-feature-alibaba</artifactId>
+            <artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>

D03-deploy/deploy-pps-prediction/src/main/java/app/DeployPpsPredictionApplication.java

@@ -7,7 +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.cloud.XCloudHuaweiCseFeature;
 import xstartup.feature.cloud.conf.XCloudBundle;
 import xstartup.feature.cloud.conf.XCloudBundlesConf;
 import xstartup.feature.cors.XCorsFeature;
@@ -31,7 +31,7 @@ public class DeployPpsPredictionApplication {
         startup.enable(XCorsFeature.class);
         startup.enable(XMybatisFeature.class);
         startup.enable(XRpcFeature.class);
-        startup.enable(XCloudAlibabaFeature.class)
+        startup.enable(XCloudHuaweiCseFeature.class)
                 .config(XCloudBundlesConf.with(
                         XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "system"),
                         XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base"),

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

 x.app.env=${env}
 x.app.buildtime=${maven.build.timestamp}
-
 x.session.cache.key-prefix=pps
 #\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 x.log.level=@x.log.level@
@@ -28,9 +27,11 @@ 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@
 pps.core.common.trace-log-config.enabletracelog=true
-#\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@
+#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
+x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@
+#\u6CE8\u518C\u7684\u5E94\u7528\u540D\u79F0\uFF08\u975E\u5FAE\u670D\u52A1\u540D\u79F0\uFF0C\u5FAE\u670D\u52A1\u540D\u79F0\u5728\u4EE3\u7801\u91CC\u8BBE\u7F6E\u4E86\uFF09
+x.cloud.discovery.app-name=pps-application
+#\u7528\u6237\u540D
+x.cloud.discovery.username=@spring.cloud.servicecomb.credentials.account.name@
\ No newline at end of file
+#\u5BC6\u7801
+x.cloud.discovery.password=@spring.cloud.servicecomb.credentials.account.password@
\ No newline at end of file

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

@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>xstartup-cloud</groupId>
-            <artifactId>xstartup-cloud-feature-alibaba</artifactId>
+            <artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>

D03-deploy/deploy-pps-space/src/main/java/app/DeployPpsSpaceApplication.java

@@ -7,7 +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.cloud.XCloudHuaweiCseFeature;
 import xstartup.feature.cloud.conf.XCloudBundle;
 import xstartup.feature.cloud.conf.XCloudBundlesConf;
 import xstartup.feature.mybatis.XMybatisFeature;
@@ -31,7 +31,7 @@ public class DeployPpsSpaceApplication {
         startup.enable(XSwaggerFeature.class);
         startup.enable(XMybatisFeature.class);
         startup.enable(XRpcFeature.class);
-        startup.enable(XCloudAlibabaFeature.class)
+        startup.enable(XCloudHuaweiCseFeature.class)
                 .config(XCloudBundlesConf.with(
                                 XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base"),
                                 XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "system"),

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

@@ -27,9 +27,11 @@ 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@
 pps.core.common.trace-log-config.enabletracelog=true
-#\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@
+#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
+x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@
+#\u6CE8\u518C\u7684\u5E94\u7528\u540D\u79F0\uFF08\u975E\u5FAE\u670D\u52A1\u540D\u79F0\uFF0C\u5FAE\u670D\u52A1\u540D\u79F0\u5728\u4EE3\u7801\u91CC\u8BBE\u7F6E\u4E86\uFF09
+x.cloud.discovery.app-name=pps-application
+#\u7528\u6237\u540D
+x.cloud.discovery.username=@spring.cloud.servicecomb.credentials.account.name@
\ No newline at end of file
+#\u5BC6\u7801
+x.cloud.discovery.password=@spring.cloud.servicecomb.credentials.account.password@
\ No newline at end of file

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

@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>xstartup-cloud</groupId>
-            <artifactId>xstartup-cloud-feature-alibaba</artifactId>
+            <artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
         </dependency>
         <dependency>
             <groupId>xstartup</groupId>

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

@@ -9,7 +9,7 @@ import xstartup.boot.XStartupApplication;
 import xstartup.feature.XSwaggerDocFeature;
 import xstartup.feature.api.XApiFeature;
 import xstartup.feature.api.conf.XApiCookieConf;
-import xstartup.feature.cloud.XCloudAlibabaFeature;
+import xstartup.feature.cloud.XCloudHuaweiCseFeature;
 import xstartup.feature.cors.XCorsFeature;
 import xstartup.feature.mybatis.XMybatisFeature;
 import xstartup.feature.rpc.XRpcFeature;
@@ -28,7 +28,7 @@ public class DeployPpsSystemApplication {
                 .config(new XServiceConf("pps"));
         startup.enable(XApiFeature.class)
                 .config(new XApiCookieConf("%4bH8s9&", 43200));
-        startup.enable(XCloudAlibabaFeature.class);
+        startup.enable(XCloudHuaweiCseFeature.class);
         startup.enable(XSwaggerDocFeature.class);
         startup.enable(XMybatisFeature.class);
         startup.enable(XRpcFeature.class);

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

@@ -33,9 +33,11 @@ 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@
 pps.core.common.trace-log-config.enabletracelog=true
-#\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@
+#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
+x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@
+#\u6CE8\u518C\u7684\u5E94\u7528\u540D\u79F0\uFF08\u975E\u5FAE\u670D\u52A1\u540D\u79F0\uFF0C\u5FAE\u670D\u52A1\u540D\u79F0\u5728\u4EE3\u7801\u91CC\u8BBE\u7F6E\u4E86\uFF09
+x.cloud.discovery.app-name=pps-application
+#\u7528\u6237\u540D
+x.cloud.discovery.username=@spring.cloud.servicecomb.credentials.account.name@
+#\u5BC6\u7801
+x.cloud.discovery.password=@spring.cloud.servicecomb.credentials.account.password@

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

@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>xstartup-cloud</groupId>
-            <artifactId>xstartup-cloud-feature-alibaba</artifactId>
+            <artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>

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

@@ -10,7 +10,7 @@ import xstartup.boot.XStartupApplication;
 import xstartup.feature.XJobFeature;
 import xstartup.feature.api.XApiFeature;
 import xstartup.feature.api.conf.XApiCookieConf;
-import xstartup.feature.cloud.XCloudAlibabaFeature;
+import xstartup.feature.cloud.XCloudHuaweiCseFeature;
 import xstartup.feature.cloud.conf.XCloudBundle;
 import xstartup.feature.cloud.conf.XCloudBundlesConf;
 import xstartup.feature.cors.XCorsFeature;
@@ -41,7 +41,7 @@ public class DeployPpsTaskApplication {
         startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherReceiveJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));
         startup.enable(XRpcFeature.class);
-        startup.enable(XCloudAlibabaFeature.class)
+        startup.enable(XCloudHuaweiCseFeature.class)
                 .config(XCloudBundlesConf.with(
                         XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "system"),
                         XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base"),

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

@@ -24,9 +24,11 @@ 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@
+#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
+x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@
+#\u6CE8\u518C\u7684\u5E94\u7528\u540D\u79F0\uFF08\u975E\u5FAE\u670D\u52A1\u540D\u79F0\uFF0C\u5FAE\u670D\u52A1\u540D\u79F0\u5728\u4EE3\u7801\u91CC\u8BBE\u7F6E\u4E86\uFF09
+x.cloud.discovery.app-name=pps-application
+#\u7528\u6237\u540D
+x.cloud.discovery.username=@spring.cloud.servicecomb.credentials.account.name@
\ No newline at end of file
+#\u5BC6\u7801
+x.cloud.discovery.password=@spring.cloud.servicecomb.credentials.account.password@
\ No newline at end of file

D03-deploy/filters/filter-dev.properties

@@ -74,12 +74,13 @@ 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
+#huawei-cse config \u4E50\u5F3A\uFF1A10.12.1.98 \u5B66\u71D5\uFF1A10.12.4.102  10.12.0.205 \u5218\u5F3A:10.12.6.213\u4E13\u7EBFcse\u5730\u5740:11.0.25.197
+spring.cloud.servicecomb.discovery.address=http://127.0.0.1:30100
+spring.cloud.servicecomb.config.serverType=kie
+spring.cloud.servicecomb.config.serverAddr=http://127.0.0.1:30110
+spring.cloud.servicecomb.credentials.account.name=
+spring.cloud.servicecomb.credentials.account.password=
+spring.cloud.servicecomb.credentials.account.cipher=
 
 # \u81EA\u5B9A\u4E49\u914D\u7F6E
 #weather.file.temp.path=D:/home/weather/temp/receive