Commit c5050e57 authored by ZWT's avatar ZWT

都删了

parent 814ba6f5
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,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>
...@@ -28,10 +28,6 @@ ...@@ -28,10 +28,6 @@
<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>xstartup</groupId> <groupId>xstartup</groupId>
<artifactId>xstartup-feature-swagger-doc</artifactId> <artifactId>xstartup-feature-swagger-doc</artifactId>
...@@ -46,6 +42,10 @@ ...@@ -46,6 +42,10 @@
<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>
......
...@@ -7,9 +7,10 @@ import xstartup.base.conf.XServiceConf; ...@@ -7,9 +7,10 @@ import xstartup.base.conf.XServiceConf;
import xstartup.boot.XStartupApplication; import xstartup.boot.XStartupApplication;
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.feature.swagger.XSwaggerFeature; import xstartup.feature.swagger.XSwaggerFeature;
...@@ -32,7 +33,8 @@ public class DeployPpsBaseApplication { ...@@ -32,7 +33,8 @@ public class DeployPpsBaseApplication {
startup.enable(XMybatisFeature.class); startup.enable(XMybatisFeature.class);
startup.enable(XSwaggerFeature.class); startup.enable(XSwaggerFeature.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-prediction").addModule("pps", "cloud", "prediction"), XCloudBundle.naming("pps-prediction").addModule("pps", "cloud", "prediction"),
......
...@@ -27,11 +27,16 @@ x.db.pps.core.system.user=@x.db.pps.core.system.user@ ...@@ -27,11 +27,16 @@ 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.password=@x.db.pps.core.system.password@
x.db.pps.core.system.naming=@x.db.pps.core.system.naming@ x.db.pps.core.system.naming=@x.db.pps.core.system.naming@
pps.core.common.trace-log-config.enabletracelog=true pps.core.common.trace-log-config.enabletracelog=true
#\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