Skip to content

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

Merge remote-tracking branch 'origin/master'

parents d06aa02b 4d411dbf
Hide whitespace changes
Inline Side-by-side
Showing with 618 additions and 1 deletion
C10-task/pps-core-task/src/main/java/pps/core/task/service/TaskService.java
View file @ e37e6c30
package pps.core.task.service; package pps.core.task.service;
import pps.core.task.job.TestJob; import pps.core.task.job.TestJob;
import pps.core.task.job.WeatherJob;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
...@@ -18,7 +19,7 @@ public class TaskService { ...@@ -18,7 +19,7 @@ public class TaskService {
@XApiPost(anonymous = true) @XApiPost(anonymous = true)
@XText("测试") @XText("测试")
public XServiceResult getTaskByTest(XContext context) { public XServiceResult getTaskByTest(XContext context) {
TestJob bean = context.getBean(TestJob.class); WeatherJob bean = context.getBean(WeatherJob.class);
return bean.execute(context); return bean.execute(context);
} }
} }
C12-prediction/pps-core-prediction/pom.xml
View file @ e37e6c30
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
<artifactId>pps-common</artifactId> <artifactId>pps-common</artifactId>
<version>1.0.0-pps</version> <version>1.0.0-pps</version>
</dependency> </dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
<version>1.0.0-pps</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/PredictionService.java
View file @ e37e6c30
package pps.core.prediction.service; package pps.core.prediction.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import pps.cloud.base.service.BasePowerLineCloudService;
import pps.cloud.base.service.BaseWatherCloudService;
import pps.cloud.base.service.data.CrawlBaseWatherInput;
import pps.cloud.base.service.data.GetBasePowerLineInput;
import pps.cloud.base.service.data.GetBasePowerLineViewOutput;
import pps.core.prediction.entity.BaseDataEnt; import pps.core.prediction.entity.BaseDataEnt;
import pps.core.prediction.entity.BaseDataView; import pps.core.prediction.entity.BaseDataView;
import pps.core.prediction.mapper.BaseDataMapper; import pps.core.prediction.mapper.BaseDataMapper;
......
D03-deploy/deploy-pps-prediction/pom.xml 0 → 100644
View file @ e37e6c30
<?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 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>
<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-prediction</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>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>
</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.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<configuration>
<target>
<copy todir="../lib" overwrite="true">
<fileset dir="${project.build.directory}/current/lib/"
erroronmissingdir="false">
<include name="*.jar" />
</fileset>
</copy>
&lt;!&ndash;<move file="${project.build.directory}/current/lib/deploy-pps-analysis.jar"
tofile="../lib/deploy-pps-analysis.jar" />&ndash;&gt;
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>clean</id>
<phase>clean</phase>
<configuration>
<target>
<delete file="../lib/deploy-pps-task.jar" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>-->
<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>
\ No newline at end of file
D03-deploy/deploy-pps-prediction/src/main/java/app/DeployPpsPredictionApplication.java 0 → 100644
View file @ e37e6c30
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.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;
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"))
.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.enable(XCloudHuaweiCseFeature.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")));
startup.run(args);
}
}
D03-deploy/deploy-pps-space/pom.xml 0 → 100644
View file @ e37e6c30
<?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 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>
<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>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>
</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.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<configuration>
<target>
<copy todir="../lib" overwrite="true">
<fileset dir="${project.build.directory}/current/lib/"
erroronmissingdir="false">
<include name="*.jar" />
</fileset>
</copy>
&lt;!&ndash;<move file="${project.build.directory}/current/lib/deploy-pps-analysis.jar"
tofile="../lib/deploy-pps-analysis.jar" />&ndash;&gt;
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>clean</id>
<phase>clean</phase>
<configuration>
<target>
<delete file="../lib/deploy-pps-task.jar" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>-->
<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-space/src/main/java/app/DeployPpsSpaceApplication.java 0 → 100644
View file @ e37e6c30
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.api.XApiFeature;
import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature;
import xstartup.feature.cloud.conf.XCloudBundle;
import xstartup.feature.cloud.conf.XCloudBundlesConf;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.feature.swagger.XSwaggerFeature;
public class DeployPpsSpaceApplication {
public static void main(String... args) {
System.out.println("println--DeployPpsSpaceApplication");
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsSpaceApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22061).naming("pps-base-info"))
.config(new XServiceConf("pps"));
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&",43200));
startup.enable(XSwaggerFeature.class);
// startup.enable(XJobFeature.class).config(new XJobServiceConf(CounterJob.class));
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "base"),
XCloudBundle.naming("pps-base-info").addModule("pps", "cloud", "system"))
);
startup.run(args);
}
}
D03-deploy/deploy-pps-space/src/main/resources/deploy-pps-space.app.properties 0 → 100644
View file @ e37e6c30
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@
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����
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=127.0.0.1
# 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@
#obj
x.storage.type=@x.storage.type@
x.storage.endpoint=@x.storage.endpoint@
x.storage.access-key-id=@x.storage.access-key-id@
x.storage.secret-access-key=@x.storage.secret-access-key@
x.storage.bucket-name=@x.storage.bucket-name@
#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_system
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=
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@
x.db.pps.core.framedata.sharding=@x.db.pps.core.system.sharding@
x.db.pps.core.framedata.driver=@x.db.pps.core.system.driver@
x.db.pps.core.framedata.url=@x.db.pps.core.system.url@
x.db.pps.core.framedata.user=@x.db.pps.core.system.user@
x.db.pps.core.framedata.password=@x.db.pps.core.system.password@
x.db.pps.core.framedata.naming=@x.db.pps.core.system.naming@
pps.core.common.trace-log-config.enabletracelog=true
#huawei cse config
#spring.application.name=pps-base-info
#spring.cloud.servicecomb.discovery.enabled=true
#spring.cloud.servicecomb.discovery.watch=true
#spring.cloud.servicecomb.discovery.address=@spring.cloud.servicecomb.discovery.address@
#spring.cloud.servicecomb.discovery.appName=pps-application
##spring.cloud.servicecomb.discovery.serviceName=pps-base-info
#spring.cloud.servicecomb.discovery.version=@project.version@
#spring.cloud.servicecomb.discovery.healthCheckInterval=30
#spring.cloud.servicecomb.config.serverType=@spring.cloud.servicecomb.config.serverType@
#spring.cloud.servicecomb.config.serverAddr=@spring.cloud.servicecomb.config.serverAddr@
#spring.cloud.servicecomb.credentials.account.name=@spring.cloud.servicecomb.credentials.account.name@
#spring.cloud.servicecomb.credentials.account.password=@spring.cloud.servicecomb.credentials.account.password@
#spring.cloud.servicecomb.credentials.account.cipher=@spring.cloud.servicecomb.credentials.account.cipher@
#注册中心地址
x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@
#注册的应用名称（非微服务名称，微服务名称在代码里设置了）
x.cloud.discovery.app-name=pps-application
#用户名
x.cloud.discovery.username=@spring.cloud.servicecomb.credentials.account.name@
#密码
x.cloud.discovery.password=@spring.cloud.servicecomb.credentials.account.password@
#配置中心地址
#x.cloud.config.server-addr=@spring.cloud.servicecomb.config.serverAddr@
D03-deploy/filters/filter-dev.properties
View file @ e37e6c30
...@@ -15,6 +15,8 @@ x.server.port.analysis=10092 ...@@ -15,6 +15,8 @@ x.server.port.analysis=10092
x.server.port.signature=10093 x.server.port.signature=10093
x.server.port.third-interface=10094 x.server.port.third-interface=10094
x.server.port.report=10095 x.server.port.report=10095
x.server.port.space=10096
x.server.port.prdiction=10097
x.server.host=127.0.0.1 x.server.host=127.0.0.1
#\u81EA\u5B9A\u4E49\u914D\u7F6E #\u81EA\u5B9A\u4E49\u914D\u7F6E
......
D03-deploy/pom.xml
View file @ e37e6c30
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
<module>deploy-pps-system</module> <module>deploy-pps-system</module>
<module>deploy-pps-task</module> <module>deploy-pps-task</module>
<module>deploy-pps-gateway</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