Skip to content

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

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

1.修改架构添加nacos

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d0983d84
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 167 deletions
D03-deploy/deploy-pps-gateway/src/main/resources/deploy-pps-gateway.app.properties
View file @ 8aa06766
......@@ -39,28 +39,17 @@ x.db.naming=@x.db.naming@
#cors
x.cors.origin-pattern=*
#huawei cse config
#spring.application.name=pps-gateway-service
#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-gateway-service
#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@
#\u6CE8\u518C\u4E2D\u5FC3
x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
x.cloud.discovery.namespace=@x.cloud.discovery.namespace@
x.cloud.discovery.group=@x.cloud.discovery.group@
x.cloud.discovery.username=@x.cloud.discovery.username@
x.cloud.discovery.password=@x.cloud.discovery.password@
#\u914D\u7F6E\u4E2D\u5FC3
x.cloud.config.server-addr=@x.cloud.config.server-addr@
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@
D03-deploy/deploy-pps-space/src/main/resources/deploy-pps-space.app.properties
View file @ 8aa06766
x.app.env=${env}
x.app.buildtime=${maven.build.timestamp}
#�Զ�������
#\uFFFD\u0536\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
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@
......@@ -14,10 +14,10 @@ pps.core.common.mq-config.consumeInterval=@pps.core.common.mq-config.consumeInte
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����
#session\uFFFD\uFFFD\uFFFD\uFFFD
x.session.cache.key-prefix=pps
#��־��������
#\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
x.log.level=@x.log.level@
x.log.directory=@x.log.directory@
......@@ -76,29 +76,17 @@ 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@
#\u6CE8\u518C\u4E2D\u5FC3
x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
x.cloud.discovery.namespace=@x.cloud.discovery.namespace@
x.cloud.discovery.group=@x.cloud.discovery.group@
x.cloud.discovery.username=@x.cloud.discovery.username@
x.cloud.discovery.password=@x.cloud.discovery.password@
#注册中心地址
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@
#\u914D\u7F6E\u4E2D\u5FC3
x.cloud.config.server-addr=@x.cloud.config.server-addr@
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@
D03-deploy/deploy-pps-system/pom.xml
View file @ 8aa06766
......@@ -12,7 +12,7 @@
<groupId>gf</groupId>
<artifactId>deploy-pps-system</artifactId>
<packaging>jar</packaging>
<version>1.0.0</version>
<version>1.0.0</version>
<properties>
<project.mainClass>app.DeployPpsSystemApplication</project.mainClass>
<pps.version>1.0.0-pps</pps.version>
......@@ -47,24 +47,15 @@
</dependency>
<dependency>
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
<artifactId>xstartup-cloud-feature-alibaba</artifactId>
</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>
<artifactId>xstartup-feature-swagger-doc</artifactId>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-toolkit-kafka</artifactId>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-toolkit-obs</artifactId>
<artifactId>xstartup-feature-mybatis</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
......
D03-deploy/deploy-pps-system/src/main/java/app/DeployPpsSystemApplication.java
View file @ 8aa06766
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.base.util.XEncryptUtils;
import xstartup.boot.XStartupApplication;
import xstartup.feature.XJobFeature;
import xstartup.feature.XSwaggerDocFeature;
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.cloud.XCloudAlibabaFeature;
import xstartup.feature.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.feature.swagger.XSwaggerFeature;
import xstartup.service.job.conf.XJobServiceConf;
public class DeployPpsSystemApplication {
public static void main(String... args) {
System.out.println("println--DeployPpsSystemApplication");
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsSystemApplication.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));
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCloudAlibabaFeature.class);
startup.enable(XSwaggerDocFeature.class);
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-workflow").addModule("pps", "cloud", "primbpm"),
XCloudBundle.naming("pps-interface").addModule("pps", "cloud", "fiybook"),
XCloudBundle.naming("pps-interface").addModule("pps", "cloud", "sms"),
XCloudBundle.naming("pps-interface").addModule("pps", "cloud", "ihd"),
XCloudBundle.naming("pps-interface").addModule("pps", "cloud", "scadapi"),
XCloudBundle.naming("pps-dispatch").addModule("pps", "cloud", "dispatch"),
XCloudBundle.naming("pps-base-frame").addModule("pps", "cloud", "baseframe"),
XCloudBundle.naming("pps-interface").addModule("pps", "cloud", "iam"),
XCloudBundle.naming("pps-interface").addModule("pps", "cloud", "ukey")));
startup.enable(XCorsFeature.class);
startup.run(args);
}
}
D03-deploy/deploy-pps-system/src/main/resources/deploy-pps-system.app.properties
View file @ 8aa06766
x.app.env=${env}
x.app.buildtime=${maven.build.timestamp}
#�Զ�������
#\uFFFD\u0536\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
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@
......@@ -13,24 +12,20 @@ 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����
#session\uFFFD\uFFFD\uFFFD\uFFFD
x.session.cache.key-prefix=pps
#��־��������
#\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
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
x.server.name=pps-system
# 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@
......@@ -38,14 +33,12 @@ 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@
......@@ -58,47 +51,29 @@ 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@
#\u6CE8\u518C\u4E2D\u5FC3
x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
x.cloud.discovery.namespace=@x.cloud.discovery.namespace@
x.cloud.discovery.group=@x.cloud.discovery.group@
x.cloud.discovery.username=@x.cloud.discovery.username@
x.cloud.discovery.password=@x.cloud.discovery.password@
#\u914D\u7F6E\u4E2D\u5FC3
x.cloud.config.server-addr=@x.cloud.config.server-addr@
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@
D03-deploy/deploy-pps-task/src/main/resources/deploy-pps-task.app.properties
View file @ 8aa06766
......@@ -51,32 +51,17 @@ x.db.user=@x.db.user@
x.db.password=@x.db.password@
x.db.naming=@x.db.naming@
#\u6CE8\u518C\u4E2D\u5FC3
x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
x.cloud.discovery.namespace=@x.cloud.discovery.namespace@
x.cloud.discovery.group=@x.cloud.discovery.group@
x.cloud.discovery.username=@x.cloud.discovery.username@
x.cloud.discovery.password=@x.cloud.discovery.password@
#huawei cse config
#spring.application.name=pps-task
#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-task
#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@
#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
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
x.cloud.discovery.app-name=pps-application
#\u7528\u6237\u540D
x.cloud.discovery.username=@spring.cloud.servicecomb.credentials.account.name@
#\u5BC6\u7801
x.cloud.discovery.password=@spring.cloud.servicecomb.credentials.account.password@
#\u914D\u7F6E\u4E2D\u5FC3\u5730\u5740
#x.cloud.config.server-addr=@spring.cloud.servicecomb.config.serverAddr@
#feature.swagger.enable=@feature.swagger.enable@
#\u914D\u7F6E\u4E2D\u5FC3
x.cloud.config.server-addr=@x.cloud.config.server-addr@
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@
D03-deploy/filters/filter-dev.properties
View file @ 8aa06766
......@@ -135,13 +135,20 @@ x.db.pps.core.system.user=root
x.db.pps.core.system.password=vwy69PQDfShqozf4ISXEoQ==
x.db.pps.core.system.naming=snake-case
#huawei-cse config \u4E50\u5F3A\uFF1A10.12.1.98 \u5B66\u71D5\uFF1A10.12.4.102 10.12.0.205 \u5218\u5F3A:10.12.6.213\u4E13\u7EBFcse\u5730\u5740:11.0.25.197
spring.cloud.servicecomb.discovery.address=http://127.0.0.1:30100
spring.cloud.servicecomb.config.serverType=kie
spring.cloud.servicecomb.config.serverAddr=http://127.0.0.1:30110
spring.cloud.servicecomb.credentials.account.name=
spring.cloud.servicecomb.credentials.account.password=
spring.cloud.servicecomb.credentials.account.cipher=
#nacos-\u6CE8\u518C\u4E2D\u5FC3
x.cloud.discovery.server-addr=192.168.0.128:8848
x.cloud.discovery.namespace=public
x.cloud.discovery.group=DEFAULT_GROUP
x.cloud.discovery.username=nacos
x.cloud.discovery.password=nacos
#nacos-\u914D\u7F6E\u4E2D\u5FC3
x.cloud.config.server-addr=192.168.0.128:8848
x.cloud.config.namespace=public
x.cloud.config.group=DEFAULT_GROUP
x.cloud.config.file-extension=properties
x.cloud.config.username=nacos
x.cloud.config.password=nacos
# \u81EA\u5B9A\u4E49\u914D\u7F6E
#weather.file.temp.path=D:/home/weather/temp/receive
......
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