Commit 6b9652f7 authored by ZWT's avatar ZWT

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

1.修改架构添加cse;
2.修改各微服务服务名,启动验证,完成cse注册;
3.修改各模块pom及配置文件,解决服务间无法调用问题;
4.修改各服务配置,解决gateway模块跨域问题;
5.暂时删除部分编译错误代码,完成本地登录流程等基础功能测试,验证改造后链路是否正常;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 82e79ac4
...@@ -175,34 +175,6 @@ ...@@ -175,34 +175,6 @@
<version>2.2</version> <version>2.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<!-- 打包jar文件时,配置manifest文件,加入lib包的jar依赖 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration combine.self="override">
<archive>
<manifestEntries>
<Component-Group-Name>${project.groupId}</Component-Group-Name>
<Component-Artifactid>${project.artifactId}</Component-Artifactid>
<Component-Version>${project.version}</Component-Version>
<Component-Build-Time>${maven.build.timestamp}</Component-Build-Time>
<Component-Description>${project.description}</Component-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories> <repositories>
<repository> <repository>
<id>central</id> <id>central</id>
......
...@@ -10,7 +10,6 @@ import xstartup.feature.api.conf.XApiCookieConf; ...@@ -10,7 +10,6 @@ import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature; import xstartup.feature.cloud.XCloudHuaweiCseFeature;
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;
...@@ -33,7 +32,6 @@ public class DeployPpsBaseApplication { ...@@ -33,7 +32,6 @@ 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(XCorsFeature.class);
startup.enable(XCloudHuaweiCseFeature.class) startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with( .config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-system").addModule("pps", "cloud", "system"), XCloudBundle.naming("pps-system").addModule("pps", "cloud", "system"),
......
...@@ -19,7 +19,7 @@ x.db.user=@x.db.user@ ...@@ -19,7 +19,7 @@ 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@
#cors #cors
x.cors.origin-pattern=http://localhost:10079 x.cors.origin-pattern=*
#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740 #\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@ x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@
#\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 #\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
......
...@@ -10,7 +10,6 @@ import xstartup.feature.api.conf.XApiCookieConf; ...@@ -10,7 +10,6 @@ import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature; import xstartup.feature.cloud.XCloudHuaweiCseFeature;
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;
...@@ -29,7 +28,6 @@ public class DeployPpsPredictionApplication { ...@@ -29,7 +28,6 @@ public class DeployPpsPredictionApplication {
.config(new XServiceConf("pps")); .config(new XServiceConf("pps"));
startup.enable(XApiFeature.class) startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200)); .config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCorsFeature.class);
startup.enable(XSwaggerFeature.class); startup.enable(XSwaggerFeature.class);
startup.enable(XMybatisFeature.class); startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class); startup.enable(XRpcFeature.class);
......
...@@ -9,7 +9,6 @@ import xstartup.feature.api.conf.XApiCookieConf; ...@@ -9,7 +9,6 @@ import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature; import xstartup.feature.cloud.XCloudHuaweiCseFeature;
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;
...@@ -30,7 +29,6 @@ public class DeployPpsSpaceApplication { ...@@ -30,7 +29,6 @@ public class DeployPpsSpaceApplication {
startup.enable(XSwaggerFeature.class); startup.enable(XSwaggerFeature.class);
startup.enable(XMybatisFeature.class); startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class); startup.enable(XRpcFeature.class);
startup.enable(XCorsFeature.class);
startup.enable(XCloudHuaweiCseFeature.class) startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with( .config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-base").addModule("pps", "cloud", "base"), XCloudBundle.naming("pps-base").addModule("pps", "cloud", "base"),
......
...@@ -10,7 +10,6 @@ import xstartup.feature.XSwaggerDocFeature; ...@@ -10,7 +10,6 @@ import xstartup.feature.XSwaggerDocFeature;
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.XCloudHuaweiCseFeature;
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;
...@@ -32,7 +31,6 @@ public class DeployPpsSystemApplication { ...@@ -32,7 +31,6 @@ public class DeployPpsSystemApplication {
startup.enable(XSwaggerDocFeature.class); startup.enable(XSwaggerDocFeature.class);
startup.enable(XMybatisFeature.class); startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class); startup.enable(XRpcFeature.class);
startup.enable(XCorsFeature.class);
startup.run(args); startup.run(args);
} }
} }
...@@ -13,7 +13,6 @@ import xstartup.feature.api.conf.XApiCookieConf; ...@@ -13,7 +13,6 @@ import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature; import xstartup.feature.cloud.XCloudHuaweiCseFeature;
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;
...@@ -32,7 +31,6 @@ public class DeployPpsTaskApplication { ...@@ -32,7 +31,6 @@ public class DeployPpsTaskApplication {
.config(new XServiceConf("pps")); .config(new XServiceConf("pps"));
startup.enable(XApiFeature.class) startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200)); .config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCorsFeature.class);
startup.enable(XMybatisFeature.class); startup.enable(XMybatisFeature.class);
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeLongJob.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(SpaceOptimizeMidJob.class));
......
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