Merge branch 'dev-zza' into dev

# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
This commit is contained in:
Lemon
2025-09-23 10:46:38 +08:00
29 changed files with 1304 additions and 90 deletions

View File

@@ -249,13 +249,19 @@ parking:
orgId: BTTEST01
# 充电算法平台配置
chargeAlgorithm:
url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
clientId: e488bac5f70b496fa2d82065089e5f81
chargeAlgorithm2pdf:
url: https://wx.btiger.net/jeecg-boot
getTaskIdUrl: /api/docking/api/evaluate
getPdfLinkUrl: /api/docking/report/pdf/
#chargeAlgorithm:
# url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
# clientId: e488bac5f70b496fa2d82065089e5f81
#chargeAlgorithm2pdf:
# url: https://wx.btiger.net/jeecg-boot
# getTaskIdUrl: /api/docking/api/evaluate
# getPdfLinkUrl: /api/docking/report/pdf/
# token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
# dubbo配置

View File

@@ -244,13 +244,19 @@ parking:
orgId: DCWYPROD20250210
# 充电算法平台配置
chargeAlgorithm:
url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
clientId: e488bac5f70b496fa2d82065089e5f81
chargeAlgorithm2pdf:
url: https://wx.btiger.net/jeecg-boot
getTaskIdUrl: /api/docking/api/evaluate
getPdfLinkUrl: /api/docking/report/pdf/
#chargeAlgorithm:
# url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
# clientId: e488bac5f70b496fa2d82065089e5f81
#chargeAlgorithm2pdf:
# url: https://wx.btiger.net/jeecg-boot
# getTaskIdUrl: /api/docking/api/evaluate
# getPdfLinkUrl: /api/docking/report/pdf/
# token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
# dubbo配置

View File

@@ -249,13 +249,19 @@ parking:
orgId: BTTEST01
# 充电算法平台配置
chargeAlgorithm:
url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
clientId: e488bac5f70b496fa2d82065089e5f81
chargeAlgorithm2pdf:
url: https://wx.btiger.net/jeecg-boot
getTaskIdUrl: /api/docking/api/evaluate
getPdfLinkUrl: /api/docking/report/pdf/
#chargeAlgorithm:
# url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
# clientId: e488bac5f70b496fa2d82065089e5f81
#chargeAlgorithm2pdf:
# url: https://wx.btiger.net/jeecg-boot
# getTaskIdUrl: /api/docking/api/evaluate
# getPdfLinkUrl: /api/docking/report/pdf/
# token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
# dubbo配置

View File

@@ -247,9 +247,15 @@ parking:
orgId: BTTEST01
# 充电算法平台配置
chargeAlgorithm:
url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
clientId: e488bac5f70b496fa2d82065089e5f81
#chargeAlgorithm:
# url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
# clientId: e488bac5f70b496fa2d82065089e5f81
batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
# dubbo配置
dubbo:

View File

@@ -144,12 +144,18 @@ wulian:
WuLianSimRenew: api.v2.order.renew
# 充电算法平台配置
chargeAlgorithm:
url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
clientId: e488bac5f70b496fa2d82065089e5f81
chargeAlgorithm2pdf:
getTaskIdUrl: /api/docking/api/evaluate
getPdfLinkUrl: /api/docking/report/pdf/
#chargeAlgorithm:
# url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
# clientId: e488bac5f70b496fa2d82065089e5f81
#chargeAlgorithm2pdf:
# getTaskIdUrl: /api/docking/api/evaluate
# getPdfLinkUrl: /api/docking/report/pdf/
# token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
batteryChargeReport:
webDomainPrefix: https://wx.btiger.net/jeecg-boot
getTaskIdApi: /api/docking/api/evaluate
apiPrefix: /api/docking/report/
token: MTc0NzcyMjgwMzg0NC1xNmFucG96cHR4aQ==
# sms4j