Northern_Lights/ZeroBot-Plugin
1
0
Fork 0
mirror of https://github.com/FloatTech/ZeroBot-Plugin.git synced 2025-12-20 06:20:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wfapi 锁问题修复，设置TLS请求为1.2 (#663)

Browse Source 
Co-authored-by: GenesisAN <501946815@qq.com>
This commit is contained in:
GenesisAN 2023-04-12 14:02:49 +08:00 committed by GitHub
parent 3e15754031
commit c5c63d0b64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugin/warframeapi/api.go
View File

@ -1,6 +1,7 @@
package warframeapi package warframeapi
import ( import (
"crypto/tls"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
@ -30,7 +31,11 @@ func newwfapi() (w wfapi, err error) {
// 获取Warframe市场的售价表，并进行排序,cn_name为物品中文名称，onlyMaxRank表示只取最高等级的物品，返回物品售价表，物品信息，物品英文 // 获取Warframe市场的售价表，并进行排序,cn_name为物品中文名称，onlyMaxRank表示只取最高等级的物品，返回物品售价表，物品信息，物品英文
func getitemsorder(cnName string, onlyMaxRank bool) (od orders, it *itemsInSet, n string, err error) { func getitemsorder(cnName string, onlyMaxRank bool) (od orders, it *itemsInSet, n string, err error) {
var wfapiio wfAPIItemsOrders var wfapiio wfAPIItemsOrders
data, err := web.RequestDataWithHeaders(&http.Client{}, fmt.Sprintf("https://api.warframe.market/v1/items/%s/orders?include=item", cnName), "GET", func(request *http.Request) error { data, err := web.RequestDataWithHeaders(&http.Client{Transport: &http.Transport{
TLSClientConfig: &tls.Config{
MinVersion: tls.VersionTLS12,
},
}}, fmt.Sprintf("https://api.warframe.market/v1/items/%s/orders?include=item", cnName), "GET", func(request *http.Request) error {
request.Header.Add("Accept", "application/json") request.Header.Add("Accept", "application/json")
request.Header.Add("Platform", "pc") request.Header.Add("Platform", "pc")
return nil return nil
@ -87,7 +92,11 @@ var (
func newwm() (*wmdata, error) { func newwm() (*wmdata, error) {
var itemapi wfAPIItem // WarFrame市场的数据实例 var itemapi wfAPIItem // WarFrame市场的数据实例
var wd wmdata var wd wmdata
data, err := web.RequestDataWithHeaders(&http.Client{}, wfitemurl, "GET", func(request *http.Request) error { data, err := web.RequestDataWithHeaders(&http.Client{Transport: &http.Transport{
TLSClientConfig: &tls.Config{
MinVersion: tls.VersionTLS12,
},
}}, wfitemurl, "GET", func(request *http.Request) error {
request.Header.Add("Accept", "application/json") request.Header.Add("Accept", "application/json")
request.Header.Add("Language", "zh-hans") request.Header.Add("Language", "zh-hans")
return nil return nil

3
plugin/warframeapi/world.go
View File

@ -81,6 +81,9 @@ func (w *world) refresh(api *wfapi) {
w.w[2].NextTime = api.CambionCycle.Expiry.Local() w.w[2].NextTime = api.CambionCycle.Expiry.Local()
w.w[2].IsDay = api.CambionCycle.Active == "fass" w.w[2].IsDay = api.CambionCycle.Active == "fass"
for _, t := range w.w {
t.Unlock()
}
} }
// 游戏时间更新 // 游戏时间更新