Skip to content

G
gf_back
Commit 0503860e authored by ZWT's avatar ZWT
Browse files
Options

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 4c6db354
Show whitespace changes
Inline Side-by-side
Showing with 243 additions and 2 deletions
D03-deploy/deploy-pps-base/Dockerfile 0 → 100644
View file @ 0503860e
FROM java:8
EXPOSE 10086
VOLUME /tmp
ADD deploy-pps-base.jar /app.jar
RUN bash -c 'touch /app.jar'
ENTRYPOINT ["java","-jar","/app.jar"]
D03-deploy/deploy-pps-base/pom.xml 0 → 100644
View file @ 0503860e
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-parent-app</artifactId>
<version>1.15.169-xstartup-cloud</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>gf</groupId>
<artifactId>deploy-pps-base</artifactId>
<version>1.0.0</version>
<properties>
<project.mainClass>app.DeployPpsBaseApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<docker.plugin.version>1.1.1</docker.plugin.version>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-space</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-dependency-all</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</dependency>
<dependency>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-alibaba</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>
</dependencies>
<profiles>
<!-- 开发环境，默认激活 -->
<profile>
<id>dev</id>
<properties>
<env>dev</env>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<!-- 生产环境 -->
<profile>
<id>prod</id>
<properties>
<env>prod</env>
</properties>
</profile>
<!--开发测试环境 -->
<profile>
<id>test</id>
<properties>
<env>test</env>
</properties>
</profile>
<!--xcd开发环境 -->
<profile>
<id>sit</id>
<properties>
<env>sit</env>
</properties>
</profile>
<!--xcd测试环境 -->
<profile>
<id>uat</id>
<properties>
<env>uat</env>
</properties>
</profile>
<!--vpn连接开发环境 -->
<profile>
<id>vpn</id>
<properties>
<env>vpn</env>
</properties>
</profile>
<!--xcd开发环境 -->
<profile>
<id>stg</id>
<properties>
<env>stg</env>
</properties>
</profile>
</profiles>
<build>
<filters>
<filter>../filters/filter-${env}.properties</filter>
</filters>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.6.7</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>${main.class}</mainClass>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
<name>aliyun maven</name>
<url>https://maven.aliyun.com/repository/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>xstartup-hz</id>
<url>http://dev.sunboxauto.com/HZ/_packaging/xstartup-hz/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
</project>
D03-deploy/deploy-pps-base/src/main/java/app/DeployPpsBaseApplication.java 0 → 100644
View file @ 0503860e
package app;
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.api.XApiFeature;
import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudAlibabaFeature;
import xstartup.feature.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
/**
* 基础信息配置模块启动程序
*
* @author ZWT
* @date 2023/11/29
*/
public class DeployPpsBaseApplication {
public static void main(String[] args) {
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsBaseApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22061).naming("pps-base"))
.config(new XServiceConf("pps"));
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCloudAlibabaFeature.class);
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.enable(XCorsFeature.class);
startup.run(args);
}
}
D03-deploy/deploy-pps-base/src/main/resources/deploy-pps-base.app.properties 0 → 100644
View file @ 0503860e
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.name=pps-base
# 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
D03-deploy/deploy-pps-gateway/src/main/java/app/DeployPpsGatewayApplication.java
View file @ 0503860e
......@@ -5,6 +5,12 @@ import xstartup.base.conf.XServerConf;
import xstartup.boot.XStartupApplication;
import xstartup.feature.cloud.XCloudHuaweiCseGatewayFeature;
/**
* 网关模块启动程序
*
* @author ZWT
* @date 2023/11/29
*/
public class DeployPpsGatewayApplication {
public static void main(String... args) {
XStartup startup = new XStartupApplication("pps");
......
D03-deploy/deploy-pps-prediction/src/main/java/app/DeployPpsPredictionApplication.java
View file @ 0503860e
......@@ -24,7 +24,7 @@ public class DeployPpsPredictionApplication {
public static void main(String... args) {
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsPredictionApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22062).naming("pps-prediction"))
startup.config(new XServerConf(22061).naming("pps-prediction"))
.config(new XServiceConf("pps"));
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
......
D03-deploy/deploy-pps-task/src/main/java/app/DeployPpsTaskApplication.java
View file @ 0503860e
......@@ -28,7 +28,7 @@ public class DeployPpsTaskApplication {
public static void main(String... args) {
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsTaskApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22062).naming("pps-task"))
startup.config(new XServerConf(22061).naming("pps-task"))
.config(new XServiceConf("pps"));
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
......
D03-deploy/pom.xml
View file @ 0503860e
......@@ -9,6 +9,7 @@
<packaging>pom</packaging>
<modules>
<module>deploy-pps-system</module>
<module>deploy-pps-base</module>
<module>deploy-pps-task</module>
<module>deploy-pps-gateway</module>
<module>deploy-pps-space</module>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment