Skip to content

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

feat(吉林演示): 松原 

1.修改风电站运行状态接口,增加模拟实际发电功率处理逻辑,完成接口冒烟测试;
2.修改天气数据处理定时任务,解决晚上十一点半天气预报数据处理异常问题,修改风资源预测数据和光伏资源预测数据时间处理逻辑,完成接口冒烟测试;
3.修改风机预测数据模块相关功能接口,增加判断当前部署环境逻辑,解决查询全量数据问题;
4.修改风机预测数据生成模块第三方风力发电数据生成功能,增加数据拆分逻辑,区分15分数据层级,完成功能冒烟测试;
5.修改风机预测监控页面历史风速统计接口,统计数据不显示问题及小数位过多问题;
6.修改天气预报数据爬取定时任务,解决8:00-11:00期间没有数据问题,完成功能验证;
7,修改风资源预测历史数据处理定时任务,修改查询逻辑,解决未保存历史预测数据问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 643579e4
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 821 deletions
D03-deploy/deploy-pps-gateway/Dockerfile deleted 100644 → 0
View file @ 643579e4
FROM java:8
EXPOSE 10079
VOLUME /tmp
ADD deploy-pps-gateway.jar /app.jar
RUN bash -c 'touch /app.jar'
ENTRYPOINT ["java","-jar","/app.jar"]
D03-deploy/deploy-pps-gateway/pom.xml deleted 100644 → 0
View file @ 643579e4
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-parent-gateway</artifactId>
<version>1.15.169-xstartup-cloud</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0.0</version>
<groupId>gf</groupId>
<artifactId>deploy-pps-gateway</artifactId>
<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>
</profiles>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- 定义main.class属性，值为你的主类全限定名 -->
<main.class>app.DeployPpsGatewayApplication</main.class>
</properties>
<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>
</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-gateway/src/main/java/app/DeployPpsGatewayApplication.java deleted 100644 → 0
View file @ 643579e4
package app;
import xstartup.base.XStartup;
import xstartup.base.conf.XServerConf;
import xstartup.boot.XStartupApplication;
public class DeployPpsGatewayApplication {
public static void main(String... args) {
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22068).naming("pps-gateway"));
startup.run(args);
}
}
D03-deploy/deploy-pps-gateway/src/main/resources/application.yaml deleted 100644 → 0
View file @ 643579e4
server:
port: 10079
spring:
cloud:
gateway:
routes:
- id: pps-system
uri: lb://pps-base-info
filters:
- name: governance
predicates:
- Path=/api/pps/system/**
- id: pps-base
uri: lb://pps-base-info
filters:
- name: governance
predicates:
- Path=/api/pps/base/**
\ No newline at end of file
D03-deploy/deploy-pps-gateway/src/main/resources/deploy-pps-gateway.app.properties deleted 100644 → 0
View file @ 643579e4
x.app.env=${env}
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=x.server.host=@x.server.host@
# 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@
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@
#cors
x.cors.origin-pattern=*
D03-deploy/deploy-pps-prediction/pom.xml deleted 100644 → 0
View file @ 643579e4
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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-prediction</artifactId>
<packaging>jar</packaging>
<version>1.0.0</version>
<properties>
<project.mainClass>app.DeployPpsPredictionApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-prediction</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</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>
</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>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
</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>
\ No newline at end of file
D03-deploy/deploy-pps-prediction/src/main/java/app/DeployPpsPredictionApplication.java deleted 100644 → 0
View file @ 643579e4
package app;
//import pps.core.common.job.CounterJob;
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.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
public class DeployPpsPredictionApplication {
public static void main(String... args) {
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22062).naming("pps-prediction"))
.config(new XServiceConf("pps"));
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCorsFeature.class);
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.run(args);
}
}
D03-deploy/deploy-pps-prediction/src/main/resources/deploy-pps-prediction.app.properties deleted 100644 → 0
View file @ 643579e4
x.app.env=${env}
x.app.buildtime=${maven.build.timestamp}
x.log.level=@x.log.level@
x.log.directory=@x.log.directory@
x.server.port=@x.server.port.prediction@
x.server.host=@x.server.host@
# 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@
D03-deploy/deploy-pps-space/pom.xml deleted 100644 → 0
View file @ 643579e4
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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-space</artifactId>
<packaging>jar</packaging>
<version>1.0.0</version>
<properties>
<project.mainClass>app.DeployPpsSpaceApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-space</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</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>
</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>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
</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-space/src/main/java/app/DeployPpsSpaceApplication.java deleted 100644 → 0
View file @ 643579e4
package app;
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.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.feature.swagger.XSwaggerFeature;
public class DeployPpsSpaceApplication {
public static void main(String... args) {
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22061).naming("pps-space"))
.config(new XServiceConf("pps"));
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XSwaggerFeature.class);
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.run(args);
}
}
\ No newline at end of file
D03-deploy/deploy-pps-space/src/main/resources/deploy-pps-space.app.properties deleted 100644 → 0
View file @ 643579e4
x.app.env=${env}
x.app.buildtime=${maven.build.timestamp}
x.log.level=@x.log.level@
x.log.directory=@x.log.directory@
x.server.port=@x.server.port.space@
x.server.host=@x.server.host@
# 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@
D03-deploy/deploy-pps-system/Dockerfile deleted 100644 → 0
View file @ 643579e4
FROM java:8
EXPOSE 10087
VOLUME /tmp
ADD deploy-pps-system.jar /app.jar
RUN bash -c 'touch /app.jar'
ENTRYPOINT ["java","-jar","/app.jar"]
D03-deploy/deploy-pps-system/pom.xml deleted 100644 → 0
View file @ 643579e4
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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-system</artifactId>
<packaging>jar</packaging>
<version>1.0.0</version>
<properties>
<project.mainClass>app.DeployPpsSystemApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-system</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</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>
</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>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
</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-system/src/main/java/app/DeployPpsSystemApplication.java deleted 100644 → 0
View file @ 643579e4
package app;
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.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.feature.swagger.XSwaggerFeature;
public class DeployPpsSystemApplication {
public static void main(String... args) {
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22061).naming("pps-system"))
.config(new XServiceConf("pps"));
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XSwaggerFeature.class);
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.run(args);
}
}
D03-deploy/deploy-pps-system/src/main/resources/deploy-pps-system.app.properties deleted 100644 → 0
View file @ 643579e4
x.app.env=${env}
x.app.buildtime=${maven.build.timestamp}
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@
#session
x.session.cache.key-prefix=pps
x.log.level=@x.log.level@
x.log.directory=@x.log.directory@
x.server.port=@x.server.port.system@
x.server.host=@x.server.host@
# 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@
\ No newline at end of file
D03-deploy/deploy-pps-task/Dockerfile deleted 100644 → 0
View file @ 643579e4
FROM java:8
EXPOSE 10088
VOLUME /tmp
ADD deploy-pps-task.jar /app.jar
RUN bash -c 'touch /app.jar'
ENTRYPOINT ["java","-jar","/app.jar"]
D03-deploy/deploy-pps-task/pom.xml deleted 100644 → 0
View file @ 643579e4
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://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-task</artifactId>
<packaging>jar</packaging>
<version>1.0.0</version>
<properties>
<project.mainClass>app.DeployPpsSystemApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-task</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</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>
</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>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
</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>
\ No newline at end of file
D03-deploy/deploy-pps-task/src/main/java/app/DeployPpsTaskApplication.java deleted 100644 → 0
View file @ 643579e4
package app;
import pps.core.task.job.*;
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.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.service.job.conf.XJobServiceConf;
public class DeployPpsTaskApplication {
public static void main(String... args) {
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22062).naming("pps-task"))
.config(new XServiceConf("pps"));
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCorsFeature.class);
startup.enable(XMybatisFeature.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(SpaceOptimizeUltraJob.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(PlantPredictedPowerLongTermDataJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(WindPredictionHistoryJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdWindPowerGenerationJob.class));
startup.enable(XRpcFeature.class);
startup.run(args);
}
}
D03-deploy/deploy-pps-task/src/main/resources/deploy-pps-task.app.properties deleted 100644 → 0
View file @ 643579e4
x.app.env=${env}
x.app.buildtime=${maven.build.timestamp}
x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
pps.core.task.job.SpaceOptimizeMidJob,\
pps.core.task.job.SpaceOptimizeUltraJob,\
pps.core.task.job.SpaceCalibrationJob,\
pps.core.task.job.SpaceOptimizeShortJob,\
pps.core.task.job.WindPredictionHistoryJob,\
pps.core.task.job.ThirdWindPowerGenerationJob,\
pps.core.task.job.PlantPredictedPowerLongTermDataJob
x.log.level=@x.log.level@
x.log.directory=@x.log.directory@
x.server.port=@x.server.port.task@
x.server.host=@x.server.host@
# 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@
\ No newline at end of file
D03-deploy/pom.xml
View file @ dd26dbb4
...@@ -9,11 +9,6 @@ ...@@ -9,11 +9,6 @@
<version>1.0.0-pps</version> <version>1.0.0-pps</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>deploy-pps-system</module>
<module>deploy-pps-task</module>
<module>deploy-pps-gateway</module>
<module>deploy-pps-space</module>
<module>deploy-pps-prediction</module>
<module>deploy-pps-all</module> <module>deploy-pps-all</module>
</modules> </modules>
<repositories> <repositories>
......
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