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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -2,11 +2,11 @@ x.app.env=${env}
 x.app.buildtime=${maven.build.timestamp}
 #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.base@
-x.server.host=127.0.0.1
+x.server.host=@x.server.host@
 x.server.name=pps-base
 # redis
 x.cache.type=@x.cache.type@

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@
 #x.cors.origin-pattern=http://localhost:8080
 # redis
 x.cache.type=@x.cache.type@

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.port=@x.server.port.prediction@
+x.server.host=@x.server.host@
 x.server.name=pps-prediction
 # redis
 x.cache.type=@x.cache.type@

D03-deploy/deploy-pps-space/src/main/resources/deploy-pps-space.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.port=@x.server.port.space@
+x.server.host=@x.server.host@
 x.server.name=pps-space
 # redis
 x.cache.type=@x.cache.type@

D03-deploy/deploy-pps-system/src/main/resources/deploy-pps-system.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@
-
-#session\uFFFD\uFFFD\uFFFD\uFFFD
+#session
 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.host=@x.server.host@
 x.server.name=pps-system
 # redis
 x.cache.type=@x.cache.type@
@@ -29,14 +26,12 @@ 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@

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

@@ -35,11 +35,6 @@
             <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>xstartup-cloud</groupId>
             <artifactId>xstartup-cloud-feature-alibaba</artifactId>

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.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
-#\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.host=@x.server.host@
 x.server.name=pps-task
 # redis
 x.cache.type=@x.cache.type@
@@ -23,18 +17,6 @@ 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@
-x.mq.port=@x.mq.port@
-x.mq.vhost=null
-x.mq.username=@x.mq.username@
-x.mq.password=@x.mq.password@
-x.mq.group=group_task
-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@

D03-deploy/filters/filter-dev.properties

@@ -16,7 +16,7 @@ x.server.port.signature=10093
 x.server.port.third-interface=10094
 x.server.port.report=10095
 x.server.port.space=10096
-x.server.port.prdiction=10097
+x.server.port.prediction=10097
 x.server.host=127.0.0.1
 
 pps.core.system.login-config.expiresIn=7200