From 63645d248c765244488cd34dbc1bb6528ca6b7c7 Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期二, 05 九月 2023 09:58:13 +0800 Subject: [PATCH] 修复编译 --- version-control/controller/controller-bus.go | 112 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/version-control/controller/controller-bus.go b/version-control/controller/controller-bus.go index 4007c9d..8615b54 100644 --- a/version-control/controller/controller-bus.go +++ b/version-control/controller/controller-bus.go @@ -1,56 +1,56 @@ -package controller - -import ( - "net/http" - "vamicro/version-control/service" - - "basic.com/valib/bhomeclient.git" -) - -type VersionController struct { -} - -//鍦ㄧ郴缁熼厤缃產pp涓紝缁欓〉闈㈣皟鐢紝鍒ゆ柇鎻愰啋鏈夋病鏈夌▼搴忔槸鍚﹂渶瑕佸崌绾� -func (vc VersionController) VersionCheck(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply { - _, version, intro := service.CheckVersion() - curVersion := service.GetCurVersion() - hasNewVersion := version != curVersion - if version == "" { - hasNewVersion = false - version = curVersion - } - return &bhomeclient.Reply{Success: true, Data: map[string]interface{}{ - "hasNewVersion": hasNewVersion, - "newVersion": version, - "newVersionInfo": intro, - "curVersion": curVersion, - "curVersionPath": curVersion, - }} -} - -func (vc VersionController) UpgradeVersion(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply { - apps, err := service.OnlineUpgrade() - if nil != err { - return &bhomeclient.Reply{Success: true, Data: map[string]interface{}{ - "code": http.StatusOK, - "msg": err.Error(), - "data": apps, - }} - - } else { - killApp(apps) - return &bhomeclient.Reply{Success: true, Data: map[string]interface{}{ - "code": http.StatusOK, - "msg": "ok", - "data": apps, - }} - } -} - -func (vc VersionController) SnWithBus(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply { - data := sn() - return &bhomeclient.Reply{ - Data: data, - Success: true, - } -} +package controller + +import ( + "net/http" + "vamicro/version-control/service" + + "basic.com/valib/bhomeclient.git" +) + +type VersionController struct { +} + +//鍦ㄧ郴缁熼厤缃產pp涓紝缁欓〉闈㈣皟鐢紝鍒ゆ柇鎻愰啋鏈夋病鏈夌▼搴忔槸鍚﹂渶瑕佸崌绾� +func (vc VersionController) VersionCheck(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply { + _, version, intro := service.CheckVersion() + curVersion := service.GetCurVersion() + hasNewVersion := version != curVersion + if version == "" { + hasNewVersion = false + version = curVersion + } + return &bhomeclient.Reply{Success: true, Data: map[string]interface{}{ + "hasNewVersion": hasNewVersion, + "newVersion": version, + "newVersionInfo": intro, + "curVersion": curVersion, + "curVersionPath": curVersion, + }} +} + +func (vc VersionController) UpgradeVersion(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply { + apps, err := service.OnlineUpgrade() + if nil != err { + return &bhomeclient.Reply{Success: true, Data: map[string]interface{}{ + "code": http.StatusOK, + "msg": err.Error(), + "data": apps, + }} + + } else { + killApp(apps) + return &bhomeclient.Reply{Success: true, Data: map[string]interface{}{ + "code": http.StatusOK, + "msg": "ok", + "data": apps, + }} + } +} + +func (vc VersionController) SnWithBus(h *bhomeclient.WrapperHandler, c *bhomeclient.Request) *bhomeclient.Reply { + data := sn() + return &bhomeclient.Reply{ + Data: data, + Success: true, + } +} -- Gitblit v1.8.0