Commit 761c5a24 authored by ZWT's avatar ZWT

都删了

parent c5050e57
package app; package app;
import pps.core.common.utils.CounterBuilder;
import xstartup.base.XStartup; import xstartup.base.XStartup;
import xstartup.base.conf.XServerConf; import xstartup.base.conf.XServerConf;
import xstartup.base.conf.XServiceConf; import xstartup.base.conf.XServiceConf;
...@@ -24,7 +23,6 @@ import xstartup.feature.swagger.XSwaggerFeature; ...@@ -24,7 +23,6 @@ import xstartup.feature.swagger.XSwaggerFeature;
public class DeployPpsBaseApplication { public class DeployPpsBaseApplication {
public static void main(String[] args) { public static void main(String[] args) {
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsBaseApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps"); XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22061).naming("pps-base")) startup.config(new XServerConf(22061).naming("pps-base"))
.config(new XServiceConf("pps")); .config(new XServiceConf("pps"));
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>xstartup-cloud</groupId> <groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-parent-app</artifactId> <artifactId>xstartup-cloud-parent-app</artifactId>
<version>1.15.169-xstartup-cloud</version> <version>1.16.69-xstartup-v3-cloud</version>
<relativePath/> <relativePath/>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -35,15 +35,15 @@ ...@@ -35,15 +35,15 @@
<groupId>xstartup</groupId> <groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId> <artifactId>xstartup-feature-mybatis</artifactId>
</dependency> </dependency>
<dependency>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
</dependency>
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
<version>2.0.1.Final</version> <version>2.0.1.Final</version>
</dependency> </dependency>
<dependency>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-alibaba</artifactId>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>
......
package app; package app;
import pps.core.common.utils.CounterBuilder;
import pps.core.task.job.*; import pps.core.task.job.*;
import xstartup.base.XStartup; import xstartup.base.XStartup;
import xstartup.base.conf.XServerConf; import xstartup.base.conf.XServerConf;
...@@ -10,9 +9,10 @@ import xstartup.boot.XStartupApplication; ...@@ -10,9 +9,10 @@ import xstartup.boot.XStartupApplication;
import xstartup.feature.XJobFeature; import xstartup.feature.XJobFeature;
import xstartup.feature.api.XApiFeature; import xstartup.feature.api.XApiFeature;
import xstartup.feature.api.conf.XApiCookieConf; 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.XCloudBundle;
import xstartup.feature.cloud.conf.XCloudBundlesConf; import xstartup.feature.cloud.conf.XCloudBundlesConf;
import xstartup.feature.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature; import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature; import xstartup.feature.rpc.XRpcFeature;
import xstartup.service.job.conf.XJobServiceConf; import xstartup.service.job.conf.XJobServiceConf;
...@@ -25,7 +25,6 @@ import xstartup.service.job.conf.XJobServiceConf; ...@@ -25,7 +25,6 @@ import xstartup.service.job.conf.XJobServiceConf;
*/ */
public class DeployPpsTaskApplication { public class DeployPpsTaskApplication {
public static void main(String... args) { public static void main(String... args) {
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsTaskApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps"); XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22061).naming("pps-task")) startup.config(new XServerConf(22061).naming("pps-task"))
.config(new XServiceConf("pps")); .config(new XServiceConf("pps"));
...@@ -39,7 +38,8 @@ public class DeployPpsTaskApplication { ...@@ -39,7 +38,8 @@ public class DeployPpsTaskApplication {
startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherReceiveJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherReceiveJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));
startup.enable(XRpcFeature.class); startup.enable(XRpcFeature.class);
startup.enable(XCloudHuaweiCseFeature.class) startup.enable(XCorsFeature.class);
startup.enable(XCloudAlibabaFeature.class)
.config(XCloudBundlesConf.with( .config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-system").addModule("pps", "cloud", "system"), XCloudBundle.naming("pps-system").addModule("pps", "cloud", "system"),
XCloudBundle.naming("pps-base").addModule("pps", "cloud", "base"), XCloudBundle.naming("pps-base").addModule("pps", "cloud", "base"),
......
...@@ -24,11 +24,16 @@ x.db.url=@x.db.url@ ...@@ -24,11 +24,16 @@ x.db.url=@x.db.url@
x.db.user=@x.db.user@ x.db.user=@x.db.user@
x.db.password=@x.db.password@ x.db.password=@x.db.password@
x.db.naming=@x.db.naming@ x.db.naming=@x.db.naming@
#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740 #\u6CE8\u518C\u4E2D\u5FC3
x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@ x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
#\u6CE8\u518C\u7684\u5E94\u7528\u540D\u79F0\uFF08\u975E\u5FAE\u670D\u52A1\u540D\u79F0\uFF0C\u5FAE\u670D\u52A1\u540D\u79F0\u5728\u4EE3\u7801\u91CC\u8BBE\u7F6E\u4E86\uFF09 x.cloud.discovery.namespace=@x.cloud.discovery.namespace@
x.cloud.discovery.app-name=pps-application x.cloud.discovery.group=@x.cloud.discovery.group@
#\u7528\u6237\u540D x.cloud.discovery.username=@x.cloud.discovery.username@
x.cloud.discovery.username=@spring.cloud.servicecomb.credentials.account.name@ x.cloud.discovery.password=@x.cloud.discovery.password@
#\u5BC6\u7801 #\u914D\u7F6E\u4E2D\u5FC3
x.cloud.discovery.password=@spring.cloud.servicecomb.credentials.account.password@ x.cloud.config.server-addr=@x.cloud.config.server-addr@
\ No newline at end of file x.cloud.config.namespace=@x.cloud.config.namespace@
x.cloud.config.group=@x.cloud.config.group@
x.cloud.config.file-extension=@x.cloud.config.file-extension@
x.cloud.config.username=@x.cloud.config.username@
x.cloud.config.password=@x.cloud.config.password@
\ No newline at end of file
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