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

1.修改架构添加nacos;
2.修改间开模块启动程序,使其能独立启动并注册到nacos;
3.修改光伏预测模块启动程序,使其能独立启动并注册到nacos;
4.修改系统用户模块启动程序,使其能独立启动并注册到nacos;
5.修改定时任务模块启动程序,使其能独立启动并注册到nacos;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -40,18 +40,9 @@
             <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-task/src/main/java/app/DeployPpsTaskApplication.java

 package app;
 
-//import pps.core.common.job.CounterJob;
 
 import pps.core.common.utils.CounterBuilder;
 import pps.core.task.job.*;
@@ -11,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.XCloudHuaweiCseFeature;
+import xstartup.feature.cloud.XCloudAlibabaFeature;
 import xstartup.feature.cloud.conf.XCloudBundle;
 import xstartup.feature.cloud.conf.XCloudBundlesConf;
 import xstartup.feature.cors.XCorsFeature;
@@ -19,9 +18,14 @@ import xstartup.feature.mybatis.XMybatisFeature;
 import xstartup.feature.rpc.XRpcFeature;
 import xstartup.service.job.conf.XJobServiceConf;
 
+/**
+ * 定时任务模块启动程序
+ *
+ * @author ZWT
+ * @date 2023/11/29
+ */
 public class DeployPpsTaskApplication {
     public static void main(String... args) {
-        System.out.println("println--DeployPpsTaskApplication");
         CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsTaskApplication.class.getSimpleName());
         XStartup startup = new XStartupApplication("pps");
         startup.config(new XServerConf(22062).naming("pps-task"))
@@ -30,23 +34,20 @@ public class DeployPpsTaskApplication {
                 .config(new XApiCookieConf("%4bH8s9&", 43200));
         startup.enable(XCorsFeature.class);
         startup.enable(XMybatisFeature.class);
-        startup.enable(XJobFeature.class).config(new XJobServiceConf(TestJob.class));
-        startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeLongJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeMidJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceCalibrationJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherReceiveJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.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-prediction").addModule("pps", "cloud", "prediction"),
-                        XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base")));
-
+                        XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base"),
+                        XCloudBundle.naming("pps-prediction").addModule("pps", "cloud", "prediction"),
+                        XCloudBundle.naming("pps-space").addModule("pps", "cloud", "space")
+                ));
         startup.run(args);
     }
 }

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

 x.app.env=${env}
 x.app.buildtime=${maven.build.timestamp}
-
 #\uFFFD\u0536\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 pps.core.common.mq-config.accessLogMq=@pps.core.common.mq-config.accessLogMq@
 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.ackImsMq=@pps.core.common.mq-config.ackImsMq@
-
-x.job.service=pps.core.task.job.TestJob,\
-  pps.core.task.job.SpaceOptimizeLongJob,\
+x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
   pps.core.task.job.SpaceOptimizeMidJob,\
   pps.core.task.job.SpaceCalibrationJob,\
   pps.core.task.job.SpaceOptimizeShortJob,\
   pps.core.task.job.WeatherReceiveJob,\
-  pps.core.task.job.PlantPredictedPowerLongTermDataJob,\
-  pps.core.task.job.WeatherJob
-
+  pps.core.task.job.PlantPredictedPowerLongTermDataJob
 #\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.task@
 x.server.host=127.0.0.1
-
+x.server.name=pps-task
 # 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@
-
 #mqs
 x.mq.factory=@x.mq.factory@
 x.mq.host=@x.mq.host@
@@ -42,7 +35,6 @@ x.mq.consumer-type=pull
 x.mq.ssl-truststore-location=@x.mq.ssl-truststore-location@
 x.mq.sasl-mechanism=@x.mq.sasl-mechanism@
 x.mq.ssl-endpoint-identification-algorithm=
-
 # datasource
 x.db.sharding=@x.db.sharding@
 x.db.driver=@x.db.driver@
@@ -50,7 +42,6 @@ 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@