From 1ca4109013bb07f7f55093357bf68fcfe435e0f2 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 27 七月 2020 14:57:13 +0800
Subject: [PATCH] fix string array unmarshal and config hikUrl
---
controllers/sys.go | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/controllers/sys.go b/controllers/sys.go
index 953a0ae..c4844f0 100644
--- a/controllers/sys.go
+++ b/controllers/sys.go
@@ -36,17 +36,14 @@
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
- } else {
- fmt.Println("unmarshal err:", e1)
- }
+ var msgArr []string
+ if e1 := json.Unmarshal([]byte(sv.Msg), &msgArr);e1 ==nil {
+ result.Msg = msgArr
} else {
- fmt.Println("marshal err:", e1)
+ fmt.Println("unmarshal err:", e1)
+ result.Msg = []string{}
}
+
} else {
result.IsUpgrade = false
}
--
Gitblit v1.8.0