Skip to content

G
gf_back
Commit 4e714e80 authored by ZWT's avatar ZWT
Browse files
Options

feat(吉林演示): 松原 

1.天气数据接收定时任务,解决代码扫描问题,修改文件读取相关代码,解决资源未关流问题;
2.修改登录验证码生成工具类,解决代码扫描问题,修复随机数不安全问题;
3.删除除主程序启动类外其他启动类模块,解决代码扫描问题;
4.删除自定义httputlis类,解决代码扫描问题,替换部分代码远程调用方法;
5.重构光伏预测模块下载电站实际发电数据导入模板接口,解决代码扫描问题;
6.重构光伏预测模块导入电站实际发电数据接口,解决代码扫描问题;
7.删除公用excel导入导出工具类及poi相关pom依赖,解决代码扫描问题;
8.光伏功率预测模块,增加查询线路列表接口,解决页面接口报错问题;
9.增加测试用历史数据导入接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c0ee34a6
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 2 deletions
D03-deploy/deploy-pps-all/pom.xml
View file @ 4e714e80
...@@ -80,13 +80,20 @@ ...@@ -80,13 +80,20 @@
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
</profile> </profile>
<!-- 生产环境 --> <!-- 长庆生产环境 -->
<profile> <profile>
<id>prod</id> <id>prod</id>
<properties> <properties>
<env>prod</env> <env>prod</env>
</properties> </properties>
</profile> </profile>
<!-- 长庆生产环境 -->
<profile>
<id>jilin</id>
<properties>
<env>jilin</env>
</properties>
</profile>
<!--开发测试环境 --> <!--开发测试环境 -->
<profile> <profile>
<id>test</id> <id>test</id>
......
D03-deploy/filters/filter-dev.properties
View file @ 4e714e80
...@@ -17,7 +17,7 @@ pps.core.system.login-config.appid=mEvc ...@@ -17,7 +17,7 @@ pps.core.system.login-config.appid=mEvc
pps.core.common.base-config.predictedUrl=http://121.36.43.217:8098/ pps.core.common.base-config.predictedUrl=http://121.36.43.217:8098/
#\u65E5\u5FD7\u7EA7\u522B\u914D\u7F6E #\u65E5\u5FD7\u7EA7\u522B\u914D\u7F6E
x.log.level=debug x.log.level=debug
x.log.directory=/home/pps/log x.log.directory=/home/gf-jar/log
# redis # redis
x.cache.type=redis x.cache.type=redis
x.cache.host=127.0.0.1 x.cache.host=127.0.0.1
......
D03-deploy/filters/filter-jilin.properties 0 → 100644
View file @ 4e714e80
x.server.port.all=10078
x.server.host=127.0.0.1
#\u81EA\u5B9A\u4E49\u914D\u7F6E
pps.core.system.login-config.expiresIn=900
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=
pps.core.system.login-config.userRsaPublicKey=t1vlR1n_TeraMrene4m4b7vz2yWEyKby73lu4MRLgGIeygn4c8M6XCEvxMHSBAK1Js7uJ5knJytE6OP31X3g5_NjSlnWRQeqtGuQTnODLBEJ1vF7_IgCTXtkH_9gRK1PhcwH8Cgv064ydIfP--muZjz2p_XMxuVtgql4QiFaZ_xTofmtDpG8lMgj-QqsU4wyWAUxza-1S8O_wjS6tuGzlPUWwVROAmfSOHbT20sxgHu1JEsdkQTmjgo2gyRMVke56Q-VNeeIICyWL_KEnrCCqDpAOv_m7lFk3ix-ipURkW0=
pps.core.system.login-config.adminRoles=638dc709-7b21-4139-bf27-56ac9390168b
pps.core.common.base-config.predictedUrl=http://121.36.43.217:8098/
pps.core.system.login-config.ukeyUrl=https://mfstest-iam.pipechina.com.cn/verify_signature
pps.core.system.login-config.appid=mEvc
#\u65E5\u5FD7\u7EA7\u522B\u914D\u7F6E
x.log.level=info
x.log.directory=/home/gf-jar/log
# redis
x.cache.type=redis
x.cache.host=127.0.0.1
x.cache.port=6379
x.cache.auth=FUfSuaYH8dQAlzk0U-vvQQ==
x.cache.db=0
# datasource
x.db.sharding=1
x.db.driver=com.mysql.jdbc.Driver
x.db.url=jdbc:mysql://127.0.0.1:3306/zero_carbon?characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai&useSSL=false
x.db.user=root
x.db.password=FUfSuaYH8dQAlzk0U-vvQQ==
x.db.naming=snake-case
x.db.pps.core.system.sharding=1
x.db.pps.core.system.driver=com.mysql.jdbc.Driver
x.db.pps.core.system.url=jdbc:mysql://127.0.0.1:3306/zero_carbon?characterEncoding=utf8&allowEncodingChanges=true&serverTimezone=Asia/Shanghai&useSSL=false
x.db.pps.core.system.user=root
x.db.pps.core.system.password=FUfSuaYH8dQAlzk0U-vvQQ==
x.db.pps.core.system.naming=snake-case
# \u81EA\u5B9A\u4E49\u914D\u7F6E
weather.file.temp.path=/home/weather-jar/temp/receive
weather.file.icon=/home/weather-jar/icon
#weather.file.temp.path=/home/weather-jar/temp/receive
weather.mail.host=mail.petrochina
weather.mail.username=lingtanproject@petrochina.com.cn
weather.mail.password=Cppeilingtan2024
weather.mail.protocol=pop3
#\u9996\u9875
home.image.path=/home/gf-jar/homeImg
#\u7B2C\u4E09\u65B9\u63A5\u53E3\u5730\u5740(\u957F\u5E86)
third-party.chang-qing.url=http://10.78.7.253
feature.swagger.enable=false
\ 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