Skip to content

G
gf_back
Commit 738659ba authored by ZWT's avatar ZWT
Browse files
Options

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

1.修改架构添加nacos

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c32a4342
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 90 deletions
D03-deploy/deploy-pps-system/src/main/resources/deploy-pps-system.app.properties
View file @ 738659ba
......@@ -7,11 +7,7 @@ pps.core.system.login-config.userRsaPrivateKey=@pps.core.system.login-config.use
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.iamToLoginUrl=@pps.core.system.login-config.iamToLoginUrl@
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
#\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
......@@ -33,36 +29,14 @@ 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@
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.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
#\u6CE8\u518C\u4E2D\u5FC3
x.cloud.discovery.server-addr=@x.cloud.discovery.server-addr@
......
D03-deploy/filters/filter-dev.properties
View file @ 738659ba
......@@ -19,25 +19,6 @@ x.server.port.space=10096
x.server.port.prdiction=10097
x.server.host=127.0.0.1
#\u81EA\u5B9A\u4E49\u914D\u7F6E
#\uFF01\uFF01\uFF01\uFF01\u7531\u4E8E\u534E\u4E3A\u4E91\u5E73\u53F0\u8C03\u6574\uFF0C \u5F00\u53D1\uFF0825-test\uFF09\u548C\u6D4B\u8BD5\uFF08150-uat\uFF09\u73AF\u5883\u5171\u7528\u4E00\u4E2Amq \uFF0C\u6545\u5F00\u53D1\u73AF\u5883 \u4F7F\u7528\u7684topic \u6DFB\u52A0dev_ \u524D\u7F00 \uFF01\uFF01\uFF01\uFF01
#\uFF01\uFF01\uFF01\uFF01\u7531\u4E8E\u534E\u4E3A\u4E91\u5E73\u53F0\u8C03\u6574\uFF0C \u5F00\u53D1\uFF0825-test\uFF09\u548C\u6D4B\u8BD5\uFF08150-uat\uFF09\u73AF\u5883\u5171\u7528\u4E00\u4E2Amq \uFF0C\u6545\u5F00\u53D1\u73AF\u5883 \u4F7F\u7528\u7684topic \u6DFB\u52A0dev_ \u524D\u7F00 \uFF01\uFF01\uFF01\uFF01
#\uFF01\uFF01\uFF01\uFF01\u7531\u4E8E\u534E\u4E3A\u4E91\u5E73\u53F0\u8C03\u6574\uFF0C \u5F00\u53D1\uFF0825-test\uFF09\u548C\u6D4B\u8BD5\uFF08150-uat\uFF09\u73AF\u5883\u5171\u7528\u4E00\u4E2Amq \uFF0C\u6545\u5F00\u53D1\u73AF\u5883 \u4F7F\u7528\u7684topic \u6DFB\u52A0dev_ \u524D\u7F00 \uFF01\uFF01\uFF01\uFF01
pps.core.common.mq-config.accessLogMq=dev_pps_base_sys_log
pps.core.common.mq-config.newToOldFormMq=dev_pps_data_defined_from_new
pps.core.common.mq-config.oldToNewMq=dev_pps_dispatch_rzd_from_old
pps.core.common.mq-config.toAnalysisMq=dev_pps_analysis_from_frame
pps.core.common.mq-config.removeAnalysisMq=dev_pps_analysis_from_frame_remove
pps.core.common.mq-config.createPDFMq=dev_pps_create_pdf
pps.core.common.mq-config.pushMeasureDataMq=dev_pps_push_measure_data
pps.core.common.mq-config.pushScheduleDataMq=dev_pps_push_schedul_data
pps.core.common.mq-config.transferLogMq=dev_pps_transfer_log
pps.core.common.mq-config.sysInformSendMq=dev_sys_inform_send
pps.core.common.mq-config.ackImsMq=dev_pps_ack_ims
pps.core.common.mq-config.toAnalysisMqSwitch=1
pps.core.common.mq-config.newToOldFormMqSwitch=1
pps.core.common.mq-config.consumeInterval=1000
pps.core.common.obs-config.urlExpires=1800
pps.core.system.login-config.expiresIn=7200
pps.core.system.login-config.rsaPrivateKey=TW9aR-s_1MQ_EZEpv5PSAJfvAvsLHRZigRaLj8u_dxt2D29GjXAEZEPHXupkKv_Nj2WVRw76SKxyIOFcfhSyS_M-zrv3-qlWfpDWEFAwUczeuOcLQ2zmE9soQTe30dKn7I2LHlWYxWdLpOOuJzEEJvN7SwWPPuEz-58AQ8IGTvU9GWaQEN7bd75vK81lB_dg0_mZ63lIr1dyQR6xQIoKORf0e_sQcP6pRO8OhaEB-otiQ1MqJBYNKpDlT5O84B3ZsXOo2iaXa-uTiiWVb9EGmS9wHJCiwWM0ReBsqdf7-SfXam5n18_6VkIURQTJDonD-tIyCgaD55_clXJlSutS2v4cOVJQLNjnJ7SNMXZO-fktbi5zJBQzCec1lqJd6AWztwZXFGszMj_yW0h4RAmrzp_qXch9e_ET8ZfYv3G3qM3HN-okjtEKKT2tsjIe_o33dLdXfXHLOxwXcvAToc06oNUCraPoHXjwqjjI0XcrWe1RH2i1m2SUl4FR8n1t6gSiFw0RGlI3MCuuAEYD9sjx37zMWjaY7O1YEOFYDj0hFb7jWU0UEykULBZXhUyTJB4trHXxZ6RHfNPlryApJDQaexrLRw-c6LBdza_dw_NX3XRw12Jg4cV6y4ZgiB5NfozHXSil7egroV88e3CF_4zYKapYwiDe9nPGjcmRrpWQwwqQbrQsWBT0EDtkeyUHK_WKAof7l7qZ9Ful9Oo1ErXPCR-0T5NNICEYl_lnKylqIj10w_vGa5XfuNHTcXE_EuMsfpzqTbgxeC5DF0UtJYJ4yrGgLa2jSBvQRwOkf3xBoeyiTR991HqmeA_R6l0QBaBJ6LFsgG3K7HOMpQOaqnw79EUt___u-4VYICOCgbG5YU2CVqh9GT-zyQmCvM57AFSxIdeL3pQbsPyrgwmctNcRX71q5dVqUs_E-03upI3PjWC0EyQaCRXcKqM66mGvUCIv1ULc2Z5vnfvJFz9fHKrfGvI3oxR3MM2i1yH3mezIXQJxAqhggjEtgcq09UB4byB7C9XcrHjOEFPG44P48nqEqlPRJ_XM5ne2LPWpCPzcBlGYGnCNCBfgyX0c5JqrX2vOLakCi0krPJzAt0WHhoT2_XFDyL8McCKYoFFZNik8kPQyGoTXG5TrUd0UyvNW0O_jS0zF0X8B0DnAOVkqCeg2IchWO2HqxkDJDGOEd-fPEE4AFgTGQcUm62BuFEPV-Nl5sSowRGObtK6PLzB1E9_DDdNpyPN34JgXM8hOjv8F-9RJdjdXm9Ncz4EUDl5mnUyqMMyijvvH2d5GiaScYGFuXrQpOX7a9E0x5zj4W_3k7RWwDodAiWCNhga60t2GezZ3FU_A7U4Y3BknSWlqXUNfxzGwaerP-rNlVYQT9ZXsYZJUaL49wy0n1rsLaHzHkJOnpHFgW-w6pgu-JD8rAGvOHEHbK5fp4IJIrMCQP3bDQlMkkSBcv9Aj6bCJoWdV3kB0hLPGr9pbF_jLVpR5DnrJwtJYmwTF9RYn3hccCHWPxgZpLZl2JDy-03ixfypRIz2CHEdFnNLBqz0iS1kQSjt0UFzwKnTuPxZoes3ai0ajPJD_kWVSEBZ3UCJrbho1e19LLqYt1IhBIgQQUmE08xr6focC_NB82PJ9GfhEn2b19WzqqN86CNQ_wjGEhSTF9_ddttH2ays1W9IFb6hu-OIS5zOzGuWd0MG1x3jLMf7N9xmHtqZ3wSJMSKYvN6pLsJZA07R2CYcpICdsYQbuVMQVV0ObU5yW0KyW5Hhzsi9HR3W9tQ72Vb4fkw6RVJ1H5ZDyTtEkk6jEKLYSU9gxJ-03fSuIUBtcNFLrtzWziABohUMz4EdDV8csExBp2S9dMYkAs_MU7NEoaJbgVFSGYLS_NChwcxIVzpzrhTBX2kITJhwXYR9M_7IpEUGTZThPEIaQkdI5Uz6VOkMbACXREvNSIFf70lqb2tMZ1JPSVuWrHVRE9sksG-lYBZm4efe9pDVDivD5J6QawhvvZIofhs7bi0QkLVqAcnfJtBErdwKeUlBY2po2TfuimTUKHEe6wMfR9pP6RLptLAPs5kO-8Us0MfQftkY1g7jjNqEeJOIqhCXzo9O8uVxcOvH7tlQkDoWv03oZKq2WhiKoEoPLRVjR-2BA9qd7NjEjwW4K0zs9gcAifbMSjJZeZt4sfoqVEZFt
pps.core.system.login-config.userRsaPrivateKey=opXzVeUw1KE_EZEpv5PSAJfvAvsLHRZigRaLj8u_dxt4GfcWS23d-yxl7csnf94L28SVJEnSFxXbjqGOig9BuRPNVHmNBGAWzw9gt6DmdCvJiiXAfGi7VgY66EUldIzFGL5Q64TrhZFqGLNpjFiNybk3Q6RcczlsNywikFnyCTVfSRyvA5GrrQhqmOsvxosjPECyHbcSxFoZoE5mTF6pp3w2kcAbO90OyvE92ztYz9OCFrQE4RO78yo5KzRFvlSJECHsMoDkcfAf-NERO7yejqY1Cu9FgrDYeMpy06NW7wjsUqrDrkeWIpqOdVg3pq5ecEqPVUN0yR2_KFp4RI3jxs1AWIK9ggITQO8AL6WyilA6-bcMDg1OTE82GC5uC1DXpcRKkqZxZwy3RCXk2F9J7J96VASfHZfRn2r9DJjQ9XCk6Xtd8kfXL7XLXqqYlrtGUBXl9RCVAuSCn_k2h2dRIwYtr2BFWTwPm1UiV4FWuwjUukum1yJrrUWPwawXLkbV71gtqgTQJXd_00NqNvgIWD1DCaqlGfQmZ47SYCnsMmLCox7zdyPEAZ15TBAoyqZU5OAozbS2cXWkvO6Yt02CexYcHIdZfeOXlbv-ukONOCRXLSfp1qnrlrYx4bpcKi4StegJ3zsoiLCwIAeb9CeO-nhRH9QVOp033B-m7T2_MLCW8_8zrqlRQxJPy_y7kyUeRG_OGUwPEl-SNgQrONrqFahvlbvn_CjDiudzkoXHVrlfOcFRTLZAp4dMXonrk_QI27kpKwxrLUmDIhaKLnBGsRVQpiYECJSgLY4Mz9pon4DDKMCHxQ3k5R7dNnTeTR7INEeVW3IP24w_H-bDzrXKSupl_6TvQiIqvsRwvKvuyXCscQSG4u9bajSJjfxwPsABkVnTrMR5yfGwiQB2IG3ZQoZzDnnV0zVvc4XQsANAEhcYIxH3zhDydzcx75oXygBF2JvklWuuB7-BO3KPwSAg2p2ag3B1-u4-kD5ybEsTevipqIqdUZfRu36K-E3dQ_-fe0ijvnPLIs1I2pRuZiPo-9fZHvym2YQOv1xSw15X6-_nex1k2rDYHf-nQ-2xA3o9yNHpwOw4sq-dVCCQGMEIYEhR7QDZUg0nEjjVhDhOWy0=
......@@ -53,14 +34,6 @@ pps.core.system.login-config.appid=mEvc
pps.core.transfer.transfer-config.oldPPSAddress=http://10.20.89.75
pps.core.task.task-config.ackImsUrl=https://test-ims.pipechina.com.cn/api/maintenance/weekPlan/updatePPS
pps.core.primbpm.bps-config.bpsAddress=http://10.37.19.112:48084
pps.core.primbpm.bps-config.bpsVirtualAddress=http://10.37.19.7:8762
pps.core.primbpm.bps-config.bpsGraphAddress=http://10.37.19.173
pps.core.primbpm.bps-config.bpsPartyAddress=http://10.37.120.119:8090
pps.core.primbpm.bps-config.userId=sysadmin
pps.core.primbpm.bps-config.userName=sysadmin
pps.core.primbpm.bps-config.tenantId=PPS
pps.core.iam.iam-config.clientId=gwxpps
pps.core.iam.iam-config.iamUrl=http://10.20.144.9
pps.core.iam.iam-config.redirectUrl=http://10.21.140.150/api/pps/system/login/iam-to-login
......@@ -73,15 +46,6 @@ pps.core.measure.si-config.siUrl=http://10.20.89.75/interface/
#\u8C03\u7528\u8BA1\u7B97\u538B\u7F29\u56E0\u5B50\u670D\u52A1\u5730\u5740\u914D\u7F6E
pps.core.scadapi.scada-pi-config.calculateFactorUrl = http://localhost:50936/Factor/GetCalculateFactorByavgPT
#pps.core.primbpm.bps-config.bpsAddress=http://10.21.128.43:48084
#pps.core.primbpm.bps-config.userId=sysadmin
#pps.core.primbpm.bps-config.userName=sysadmin
#pps.core.primbpm.bps-config.tenantId=PPS-DEV
#\u65E5\u5FD7\u7EA7\u522B\u914D\u7F6E
x.log.level=debug
x.log.directory=/home/pps/log
......@@ -95,31 +59,6 @@ x.cache.port=6379
x.cache.auth=BJ8HiKUS_Rg=
x.cache.db=0
#obs pps-obs-02.obsv3.gw-beijing-1.bjcloud.pipechina.com.cn
x.storage.type=obs
x.storage.endpoint=obsv3.gw-beijing-1.bjcloud.pipechina.com.cn
x.storage.access-key-id=ZZT1D5TQBMQ1C72OY3Y6
x.storage.secret-access-key=u5o2eW942TVgYo6O9vJTJKovcz3z5BoZsY3oCAY0
x.storage.bucket-name=pps-obs-02
#mqs
#x.mq.factory=xstartup.toolkit.mq.kafka.KafkaMqFactory
#x.mq.host=81.70.29.235
#x.mq.port=9092
#x.mq.group=group001
#x.mq.username=
#x.mq.password=
x.mq.factory=xstartup.toolkit.mq.kafka.SaslSslKafkaMqFactory
x.mq.host=10.21.140.83,10.21.140.83,10.21.140.83
x.mq.port=9096,9097,9095
x.mq.username=f6c1da49-f0c8-4cac-ba89-0c53bde9cbf6
x.mq.password=-O2j/6/d3T-0+Jo7ICP5-@v3khRA$5V0OUS-WRItD8.#zN2I.eqi8yC41g/q@1!L
x.mq.group=group002
x.mq.sasl-mechanism=PLAIN
x.mq.ssl-endpoint-identification-algorithm=
x.mq.ssl-truststore-location=classpath:kafka/truststore-uat.jks
# datasource
x.db.sharding=1
x.db.driver=com.mysql.jdbc.Driver
......
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