修复编译

zhangzengfei

2023-09-05 63645d248c765244488cd34dbc1bb6528ca6b7c7

 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 {
}

//在系统配置app中，给页面调用，判断提醒有没有程序是否需要升级
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 {

}



//在系统配置app中，给页面调用，判断提醒有没有程序是否需要升级

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,

   }

}