From 3d4ad299c10c6bd0347ac7511c15cc059338362e Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 27 七月 2020 11:13:00 +0800
Subject: [PATCH] fix orm orderBy
---
controllers/sys.go | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/controllers/sys.go b/controllers/sys.go
index 133de75..23c6e08 100644
--- a/controllers/sys.go
+++ b/controllers/sys.go
@@ -2,6 +2,8 @@
import (
"car-service/models"
+ "car-service/vo"
+ "encoding/json"
"fmt"
"github.com/astaxie/beego"
"strconv"
@@ -15,22 +17,37 @@
// @Title 姣斿鐗堟湰鍙凤紝鐪嬫槸鍚︽湁鍗囩骇
// @Description 姣斿鐗堟湰鍙凤紝鐪嬫槸鍚︽湁鍗囩骇
// @Param curVersion query string true "褰撳墠鐗堟湰鍙�"
-// @Success 200 {object} models.SysVersion
+// @Success 200 {object} models.SysUpgrade
// @Failure 403 {string} json ""
// @router /version [get]
func (c *AppController) Version() {
curV := c.GetString("curVersion")
- latestV := beego.AppConfig.String("latestVersion")
- fmt.Println("curV:", curV, "latestV:", latestV)
- result := models.SysVersion{
- LatestVersion: latestV,
- }
- if shouldVersionBeUpgrade(curV, latestV) {
- result.IsUpgrade = true
- result.Url = beego.AppConfig.String("latestUrl")
+ fmt.Println("curV:", curV)
+ result := vo.Upgrade{}
+ var sv models.SysUpgrade
+ err := sv.GetLatest()
+ if err != nil {
+ result.Msg = []string{}
} else {
- result.IsUpgrade = false
+ latestV := sv.LatestVersion
+ if shouldVersionBeUpgrade(curV, latestV) {
+ result.IsUpgrade = true
+ result.Url = sv.Url
+ 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 {
+ result.IsUpgrade = false
+ }
}
+
c.Data["json"] = result
c.ServeJSON()
}
--
Gitblit v1.8.0