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

1.修改架构添加nacos;
2.修改间开模块启动程序,使其能独立启动并注册到nacos;
3.修改光伏预测模块启动程序,使其能独立启动并注册到nacos;

BREAKING CHANGE: 无

Closes 无

[skip ci]

D03-deploy/deploy-pps-gateway/src/main/resources/application.yaml

@@ -126,4 +126,9 @@ spring:
             - name: governance
           predicates:
             - Path=/api/pps/prediction/**
-
+        - id: pps-space
+          uri: lb://pps-space
+          filters:
+            - name: governance
+          predicates:
+            - Path=/api/pps/space/**

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

@@ -34,23 +34,9 @@
             <groupId>xstartup</groupId>
             <artifactId>xstartup-feature-mybatis</artifactId>
         </dependency>
-        <dependency>
-            <groupId>huawei-gauss-db</groupId>
-            <artifactId>huawei-gauss-db</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>pps</groupId>-->
-        <!--            <artifactId>pps-core-framedata</artifactId>-->
-        <!--            <version>${pps.version}</version>-->
-        <!--        </dependency>-->
-        <dependency>
-            <groupId>xstartup</groupId>
-            <artifactId>xstartup-toolkit-kafka</artifactId>
-        </dependency>
         <dependency>
             <groupId>xstartup-cloud</groupId>
-            <artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
+            <artifactId>xstartup-cloud-feature-alibaba</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>

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

 package app;
 
-//import pps.core.common.job.CounterJob;
 import pps.core.common.utils.CounterBuilder;
 import xstartup.base.XStartup;
 import xstartup.base.conf.XServerConf;
 import xstartup.base.conf.XServiceConf;
 import xstartup.boot.XStartupApplication;
-import xstartup.feature.XJobFeature;
 import xstartup.feature.api.XApiFeature;
 import xstartup.feature.api.conf.XApiCookieConf;
-import xstartup.feature.cloud.XCloudHuaweiCseFeature;
+import xstartup.feature.cloud.XCloudAlibabaFeature;
 import xstartup.feature.cloud.conf.XCloudBundle;
 import xstartup.feature.cloud.conf.XCloudBundlesConf;
 import xstartup.feature.cors.XCorsFeature;
 import xstartup.feature.mybatis.XMybatisFeature;
 import xstartup.feature.rpc.XRpcFeature;
-import xstartup.service.job.conf.XJobServiceConf;
 
+/**
+ * 光伏预测模块启动程序
+ *
+ * @author ZWT
+ * @date 2023/11/28
+ */
 public class DeployPpsPredictionApplication {
     public static void main(String... args) {
-        System.out.println("println--DeployPpsTaskApplication");
         CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsPredictionApplication.class.getSimpleName());
         XStartup startup = new XStartupApplication("pps");
-        startup.config(new XServerConf(22062).naming("pps-task"))
+        startup.config(new XServerConf(22062).naming("pps-prediction"))
                 .config(new XServiceConf("pps"));
         startup.enable(XApiFeature.class)
-                .config(new XApiCookieConf("%4bH8s9&",43200));
+                .config(new XApiCookieConf("%4bH8s9&", 43200));
         startup.enable(XCorsFeature.class);
         startup.enable(XMybatisFeature.class);
-
         startup.enable(XRpcFeature.class);
-        startup.enable(XCloudHuaweiCseFeature.class)
+        startup.enable(XCloudAlibabaFeature.class)
                 .config(XCloudBundlesConf.with(
-//                        XCloudBundle.naming("pps-workflow").addModule("pps", "cloud", "task"),
                         XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "system"),
-                        XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base")));
-
+                        XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base"),
+                        XCloudBundle.naming("pps-space").addModule("pps", "cloud", "space")
+                ));
         startup.run(args);
     }
 }

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

+x.app.env=${env}
+x.app.buildtime=${maven.build.timestamp}
+#\uFFFD\u0536\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
+pps.core.system.login-config.expiresIn=@pps.core.system.login-config.expiresIn@
+pps.core.system.login-config.rsaPrivateKey=@pps.core.system.login-config.rsaPrivateKey@
+pps.core.system.login-config.userRsaPrivateKey=@pps.core.system.login-config.userRsaPrivateKey@
+pps.core.system.login-config.userRsaPublicKey=@pps.core.system.login-config.userRsaPublicKey@
+pps.core.system.login-config.adminRoles=@pps.core.system.login-config.adminRoles@
+pps.core.system.login-config.iamToLoginUrl=@pps.core.system.login-config.iamToLoginUrl@
+pps.core.common.mq-config.accessLogMq=@pps.core.common.mq-config.accessLogMq@
+pps.core.common.mq-config.transferLogMq=@pps.core.common.mq-config.transferLogMq@
+pps.core.common.mq-config.consumeInterval=@pps.core.common.mq-config.consumeInterval@
+pps.core.common.obs-config.urlExpires=@pps.core.common.obs-config.urlExpires@
+pps.core.common.mq-config.sysInformSendMq=@pps.core.common.mq-config.sysInformSendMq@
+#session\uFFFD\uFFFD\uFFFD\uFFFD
+x.session.cache.key-prefix=pps
+#\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
+x.log.level=@x.log.level@
+x.log.directory=@x.log.directory@
+x.server.port=@x.server.port.system@
+x.server.host=127.0.0.1
+x.server.name=pps-prediction
+# redis
+x.cache.type=@x.cache.type@
+x.cache.host=@x.cache.host@
+x.cache.port=@x.cache.port@
+x.cache.auth=@x.cache.auth@
+x.cache.db=@x.cache.db@
+# datasource
+x.db.sharding=@x.db.sharding@
+x.db.driver=@x.db.driver@
+x.db.url=@x.db.url@
+x.db.user=@x.db.user@
+x.db.password=@x.db.password@
+x.db.naming=@x.db.naming@
+x.db.pps.core.system.sharding=@x.db.pps.core.system.sharding@
+x.db.pps.core.system.driver=@x.db.pps.core.system.driver@
+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@
+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@
\ No newline at end of file