From f64dd9f191dff341b4eb430d7bacc44a3db9a279 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 04 三月 2022 10:12:45 +0800
Subject: [PATCH] fix nil
---
controllers/sys.go | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/controllers/sys.go b/controllers/sys.go
index 23c6e08..1b2051d 100644
--- a/controllers/sys.go
+++ b/controllers/sys.go
@@ -22,10 +22,20 @@
// @router /version [get]
func (c *AppController) Version() {
curV := c.GetString("curVersion")
- fmt.Println("curV:", curV)
+ platform := c.GetString("platform")
+ fmt.Println("platform:",platform,"curV:", curV)
+ if platform == "" {
+ platform = "android"
+ }
+ pType := -1 //鏈煡鐨勫钩鍙�
+ if platform == "android" {
+ pType = models.PlatType_Android
+ } else if platform == "ios" {
+ pType = models.PlatType_Ios
+ }
result := vo.Upgrade{}
var sv models.SysUpgrade
- err := sv.GetLatest()
+ err := sv.GetLatest(pType)
if err != nil {
result.Msg = []string{}
} else {
@@ -36,15 +46,18 @@
result.LatestVersion = sv.LatestVersion
result.Time = sv.Time
result.ForceUpgrade = sv.ForceUpgrade
- mb, e1 := json.Marshal(sv.Msg)
- if e1 == nil {
- var msgArr []string
- if e1 = json.Unmarshal(mb, &msgArr);e1 ==nil {
- result.Msg = msgArr
- }
+ var msgArr []string
+ if e1 := json.Unmarshal([]byte(sv.Msg), &msgArr);e1 ==nil {
+ result.Msg = msgArr
+ } else {
+ fmt.Println("unmarshal err:", e1)
+ result.Msg = []string{}
}
+ result.Size = sv.Size
+
} else {
result.IsUpgrade = false
+ result.Msg = []string{}
}
}
--
Gitblit v1.8.0