Skip to content

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

feat(零碳): 长庆演示系统新增功能 

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent b105f99f
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 222 deletions
C02-system/pps-core-system/src/main/java/pps/core/system/service/LoginService.java
View file @ 3a4d022a
...@@ -31,6 +31,7 @@ import xstartup.core.base.provider.data.XToken; ...@@ -31,6 +31,7 @@ import xstartup.core.base.provider.data.XToken;
import xstartup.data.XFileResult; import xstartup.data.XFileResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult; import xstartup.data.XSingleResult;
import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.api.conf.XApiCookieConf; import xstartup.feature.api.conf.XApiCookieConf;
...@@ -89,6 +90,17 @@ public class LoginService { ...@@ -89,6 +90,17 @@ public class LoginService {
return XSingleResult.success(output); return XSingleResult.success(output);
} }
@XText("检测token是否有效")
@XApiPost
public XServiceResult testToken(XContext context) {
try {
context.getSession(PpsUserSession.class);
} catch (XServiceException e) {
return XServiceResult.error(context, XError.NotAuth);
}
return XServiceResult.OK;
}
/** /**
* 通过模拟登录 * 通过模拟登录
* *
......
C10-task/pps-core-task/src/main/java/pps/core/task/job/WeatherJob.java deleted 100644 → 0
View file @ b105f99f
package pps.core.task.job;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
@XText("天气数据，每8小时执行一次")
@XService
public class WeatherJob implements XJob {
// @XCronTrigger(value = "0 0/30 * * * ?")
@Override
public XServiceResult execute(XContext context) {
context.getLogger().info("---WeatherJob-----");
// BaseWatherCloudService cloudService = context.getBean(BaseWatherCloudService.class);
// cloudService.crawlPlantBaseWatherData(context);
return XServiceResult.OK;
}
}
\ No newline at end of file
D03-deploy/deploy-pps-all/src/main/resources/deploy-pps-all.app.properties
View file @ 3a4d022a
...@@ -5,7 +5,6 @@ pps.core.system.login-config.rsaPrivateKey=@pps.core.system.login-config.rsaPriv ...@@ -5,7 +5,6 @@ pps.core.system.login-config.rsaPrivateKey=@pps.core.system.login-config.rsaPriv
pps.core.system.login-config.userRsaPrivateKey=@pps.core.system.login-config.userRsaPrivateKey@ 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.userRsaPublicKey=@pps.core.system.login-config.userRsaPublicKey@
pps.core.system.login-config.adminRoles=@pps.core.system.login-config.adminRoles@ 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.base-config.predictedUrl=@pps.core.common.base-config.predictedUrl@ pps.core.common.base-config.predictedUrl=@pps.core.common.base-config.predictedUrl@
#session #session
x.session.cache.key-prefix=pps x.session.cache.key-prefix=pps
...@@ -28,8 +27,7 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\ ...@@ -28,8 +27,7 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
pps.core.task.job.ThirdWellAvgActivePowerJob,\ pps.core.task.job.ThirdWellAvgActivePowerJob,\
pps.core.task.job.ThirdDailyAccumulationJob,\ pps.core.task.job.ThirdDailyAccumulationJob,\
pps.core.task.job.EnergyConsumptionAnalysisJob,\ pps.core.task.job.EnergyConsumptionAnalysisJob,\
pps.core.task.job.PlantPredictedPowerLongTermDataJob,\ pps.core.task.job.PlantPredictedPowerLongTermDataJob
pps.core.task.job.WeatherJob
# redis # redis
x.cache.type=@x.cache.type@ x.cache.type=@x.cache.type@
x.cache.host=@x.cache.host@ x.cache.host=@x.cache.host@
......
D03-deploy/deploy-pps-gateway/src/main/resources/deploy-pps-gateway.app.properties
View file @ 3a4d022a
...@@ -11,19 +11,6 @@ x.cache.host=@x.cache.host@ ...@@ -11,19 +11,6 @@ x.cache.host=@x.cache.host@
x.cache.port=@x.cache.port@ x.cache.port=@x.cache.port@
x.cache.auth=@x.cache.auth@ x.cache.auth=@x.cache.auth@
x.cache.db=@x.cache.db@ x.cache.db=@x.cache.db@
# datasource
#x.db.sharding=1
#x.db.driver=com.mysql.cj.jdbc.Driver
#x.db.url=jdbc:mysql://81.70.29.235:3306/pps_demo?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
#x.db.user=pps
#x.db.password=_X2csclhj1QIh7OU1ta6iw==
#x.db.naming=snake-case
#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@
x.db.sharding=@x.db.sharding@ x.db.sharding=@x.db.sharding@
x.db.driver=@x.db.driver@ x.db.driver=@x.db.driver@
x.db.url=@x.db.url@ x.db.url=@x.db.url@
...@@ -32,27 +19,3 @@ x.db.password=@x.db.password@ ...@@ -32,27 +19,3 @@ x.db.password=@x.db.password@
x.db.naming=@x.db.naming@ x.db.naming=@x.db.naming@
#cors #cors
x.cors.origin-pattern=* 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@
#\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@
D03-deploy/deploy-pps-space/src/main/resources/deploy-pps-space.app.properties
View file @ 3a4d022a
x.app.env=${env} x.app.env=${env}
x.app.buildtime=${maven.build.timestamp} 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.expiresIn=@pps.core.system.login-config.expiresIn@
pps.core.system.login-config.rsaPrivateKey=@pps.core.system.login-config.rsaPrivateKey@ 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.userRsaPrivateKey=@pps.core.system.login-config.userRsaPrivateKey@
pps.core.system.login-config.userRsaPublicKey=@pps.core.system.login-config.userRsaPublicKey@ 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.adminRoles=@pps.core.system.login-config.adminRoles@
pps.core.system.login-config.iamToLoginUrl=@pps.core.system.login-config.iamToLoginUrl@ #session
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\uFFFD\uFFFD\uFFFD\uFFFD
x.session.cache.key-prefix=pps 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.level=@x.log.level@
x.log.directory=@x.log.directory@ x.log.directory=@x.log.directory@
x.server.port=@x.server.port.system@ x.server.port=@x.server.port.system@
...@@ -32,58 +24,9 @@ x.db.url=@x.db.url@ ...@@ -32,58 +24,9 @@ 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@
#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.sharding=@x.db.pps.core.system.sharding@
x.db.pps.core.system.driver=@x.db.pps.core.system.driver@ 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.url=@x.db.pps.core.system.url@
x.db.pps.core.system.user=@x.db.pps.core.system.user@ 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@
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@
#\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@
D03-deploy/deploy-pps-system/src/main/resources/deploy-pps-system.app.properties
View file @ 3a4d022a
x.app.env=${env} x.app.env=${env}
x.app.buildtime=${maven.build.timestamp} 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.expiresIn=@pps.core.system.login-config.expiresIn@
pps.core.system.login-config.rsaPrivateKey=@pps.core.system.login-config.rsaPrivateKey@ 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.userRsaPrivateKey=@pps.core.system.login-config.userRsaPrivateKey@
pps.core.system.login-config.userRsaPublicKey=@pps.core.system.login-config.userRsaPublicKey@ 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.adminRoles=@pps.core.system.login-config.adminRoles@
pps.core.system.login-config.iamToLoginUrl=@pps.core.system.login-config.iamToLoginUrl@ #session
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\uFFFD\uFFFD\uFFFD\uFFFD
x.session.cache.key-prefix=pps 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.level=@x.log.level@
x.log.directory=@x.log.directory@ x.log.directory=@x.log.directory@
x.server.port=@x.server.port.system@ x.server.port=@x.server.port.system@
...@@ -32,58 +24,9 @@ x.db.url=@x.db.url@ ...@@ -32,58 +24,9 @@ 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@
#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.sharding=@x.db.pps.core.system.sharding@
x.db.pps.core.system.driver=@x.db.pps.core.system.driver@ 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.url=@x.db.pps.core.system.url@
x.db.pps.core.system.user=@x.db.pps.core.system.user@ 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@
x.db.pps.core.framedata.sharding=@x.db.pps.core.system.sharding@ \ No newline at end of file
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@
#\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@
D03-deploy/deploy-pps-task/src/main/java/app/DeployPpsTaskApplication.java
View file @ 3a4d022a
...@@ -24,7 +24,6 @@ public class DeployPpsTaskApplication { ...@@ -24,7 +24,6 @@ public class DeployPpsTaskApplication {
.config(new XApiCookieConf("%4bH8s9&", 43200)); .config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCorsFeature.class); startup.enable(XCorsFeature.class);
startup.enable(XMybatisFeature.class); startup.enable(XMybatisFeature.class);
startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherJob.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));
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeUltraJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeUltraJob.class));
......
D03-deploy/deploy-pps-task/src/main/resources/deploy-pps-task.app.properties
View file @ 3a4d022a
x.app.env=${env} x.app.env=${env}
x.app.buildtime=${maven.build.timestamp} x.app.buildtime=${maven.build.timestamp}
#\uFFFD\u0536\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
pps.core.common.mq-config.accessLogMq=@pps.core.common.mq-config.accessLogMq@
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.ackImsMq=@pps.core.common.mq-config.ackImsMq@
x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
pps.core.task.job.SpaceOptimizeMidJob,\ pps.core.task.job.SpaceOptimizeMidJob,\
pps.core.task.job.SpaceOptimizeUltraJob,\ pps.core.task.job.SpaceOptimizeUltraJob,\
...@@ -21,7 +16,6 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\ ...@@ -21,7 +16,6 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
pps.core.task.job.ThirdDailyAccumulationJob,\ pps.core.task.job.ThirdDailyAccumulationJob,\
pps.core.task.job.EnergyConsumptionAnalysisJob,\ pps.core.task.job.EnergyConsumptionAnalysisJob,\
pps.core.task.job.PlantPredictedPowerLongTermDataJob pps.core.task.job.PlantPredictedPowerLongTermDataJob
#\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
x.log.level=@x.log.level@ x.log.level=@x.log.level@
x.log.directory=@x.log.directory@ x.log.directory=@x.log.directory@
x.server.port=@x.server.port.task@ x.server.port=@x.server.port.task@
...@@ -32,47 +26,10 @@ x.cache.host=@x.cache.host@ ...@@ -32,47 +26,10 @@ x.cache.host=@x.cache.host@
x.cache.port=@x.cache.port@ x.cache.port=@x.cache.port@
x.cache.auth=@x.cache.auth@ x.cache.auth=@x.cache.auth@
x.cache.db=@x.cache.db@ x.cache.db=@x.cache.db@
#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_task
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=
# datasource # datasource
x.db.sharding=@x.db.sharding@ x.db.sharding=@x.db.sharding@
x.db.driver=@x.db.driver@ x.db.driver=@x.db.driver@
x.db.url=@x.db.url@ 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@
#huawei cse config \ No newline at end of file
#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@
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