|
1 | 1 | package _115
|
2 | 2 |
|
3 | 3 | import (
|
| 4 | + "errors" |
4 | 5 | "github.com/OpenListTeam/OpenList/v4/drivers/base"
|
| 6 | + "github.com/OpenListTeam/OpenList/v4/pkg/utils" |
5 | 7 | driver115 "github.com/SheltonZhu/115driver/pkg/driver"
|
6 | 8 | log "github.com/sirupsen/logrus"
|
7 | 9 | )
|
8 | 10 |
|
9 | 11 | var (
|
10 | 12 | md5Salt = "Qclm8MGWUv59TnrR0XPg"
|
11 |
| - appVer = "27.0.5.7" |
| 13 | + appVer = "35.6.0.3" |
12 | 14 | )
|
13 | 15 |
|
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) |
19 | 19 | if err != nil {
|
20 |
| - return nil, err |
| 20 | + return "", err |
21 | 21 | }
|
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 |
24 | 30 | }
|
25 | 31 |
|
26 | 32 | func (d *Pan115) getAppVer() string {
|
27 |
| - // todo add some cache? |
28 |
| - vers, err := d.getAppVersion() |
| 33 | + ver, err := d.getAppVersion() |
29 | 34 | if err != nil {
|
30 | 35 | log.Warnf("[115] get app version failed: %v", err)
|
31 | 36 | return appVer
|
32 | 37 | }
|
33 |
| - for _, ver := range vers { |
34 |
| - if ver.AppName == "win" { |
35 |
| - return ver.Version |
36 |
| - } |
| 38 | + if len(ver) > 0 { |
| 39 | + return ver |
37 | 40 | }
|
38 | 41 | return appVer
|
39 | 42 | }
|
40 | 43 |
|
41 | 44 | func (d *Pan115) initAppVer() {
|
42 | 45 | 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"` |
43 | 60 | }
|
0 commit comments