Skip to content

Commit c7a603c

Browse files
authored
fix(115): fix get 115 app version (#1137)
1 parent a28d6d5 commit c7a603c

File tree

1 file changed

+32
-15
lines changed

1 file changed

+32
-15
lines changed

drivers/115/appver.go

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,60 @@
11
package _115
22

33
import (
4+
"errors"
45
"github.com/OpenListTeam/OpenList/v4/drivers/base"
6+
"github.com/OpenListTeam/OpenList/v4/pkg/utils"
57
driver115 "github.com/SheltonZhu/115driver/pkg/driver"
68
log "github.com/sirupsen/logrus"
79
)
810

911
var (
1012
md5Salt = "Qclm8MGWUv59TnrR0XPg"
11-
appVer = "27.0.5.7"
13+
appVer = "35.6.0.3"
1214
)
1315

14-
func (d *Pan115) getAppVersion() ([]driver115.AppVersion, error) {
15-
result := driver115.VersionResp{}
16-
resp, err := base.RestyClient.R().Get(driver115.ApiGetVersion)
17-
18-
err = driver115.CheckErr(err, &result, resp)
16+
func (d *Pan115) getAppVersion() (string, error) {
17+
result := VersionResp{}
18+
res, err := base.RestyClient.R().Get(driver115.ApiGetVersion)
1919
if err != nil {
20-
return nil, err
20+
return "", err
2121
}
22-
23-
return result.Data.GetAppVersions(), nil
22+
err = utils.Json.Unmarshal(res.Body(), &result)
23+
if err != nil {
24+
return "", err
25+
}
26+
if len(result.Error) > 0 {
27+
return "", errors.New(result.Error)
28+
}
29+
return result.Data.Win.Version, nil
2430
}
2531

2632
func (d *Pan115) getAppVer() string {
27-
// todo add some cache?
28-
vers, err := d.getAppVersion()
33+
ver, err := d.getAppVersion()
2934
if err != nil {
3035
log.Warnf("[115] get app version failed: %v", err)
3136
return appVer
3237
}
33-
for _, ver := range vers {
34-
if ver.AppName == "win" {
35-
return ver.Version
36-
}
38+
if len(ver) > 0 {
39+
return ver
3740
}
3841
return appVer
3942
}
4043

4144
func (d *Pan115) initAppVer() {
4245
appVer = d.getAppVer()
46+
log.Debugf("use app version: %v", appVer)
47+
}
48+
49+
type VersionResp struct {
50+
Error string `json:"error,omitempty"`
51+
Data Versions `json:"data"`
52+
}
53+
54+
type Versions struct {
55+
Win Version `json:"win"`
56+
}
57+
58+
type Version struct {
59+
Version string `json:"version_code"`
4360
}

0 commit comments

Comments
 (0)