add get buckets contrl

sunty

2020-08-20 9d88c7c467f8d93af4aab9ba0b6d6c01c2ffc546

 service/SdkDownLoad.go

@@ -133,11 +133,17 @@
   }
}

func GetSdkList(sdkName string) []SdkInsOrUpgrade {
//installedFlag 如果是true,表示只查本地的，不需要比对查看未安装的算法
func GetSdkList(sdkName string, installedFlag bool) []SdkInsOrUpgrade {
   var api dbapi.SdkApi
   localSdks := api.FindAll(sdkName) //本地已安装所有算法
   localSdks := api.FindAll(sdkName) //本地已安装所有算法,带顺序
   if localSdks == nil {
      return []SdkInsOrUpgrade{}
   }
   installedSdks := make([]SdkInsOrUpgrade, len(localSdks))

   localSdkM := make(map[string]SdkInsOrUpgrade)
   for _,ls :=range localSdks {
   for idx,ls :=range localSdks {
      siou := SdkInsOrUpgrade{
         Installed: true,
      }
@@ -167,37 +173,43 @@
      }
      siou.Sdk = sdk
      localSdkM[siou.Id] = siou
      installedSdks[idx] = siou
   }

   //远端可用的算法
   remoteSdks := findAllMySdk()
   logger.Debug("remoteSdks:", remoteSdks)
   nInsSdks := make([]SdkInsOrUpgrade,0)
   if !installedFlag {
      //远端可用的算法
      remoteSdks := findAllMySdk()
      //logger.Debug("remoteSdks:", remoteSdks)

   for sdkId,sdk := range remoteSdks {
      if v,ok := localSdkM[sdkId];ok { //本地已安装
         ls := v
         if shouldVersionBeUpgrade(ls.Version, sdk.Version) { //判断版本号是否需要升级
            ls.Installed = true
            ls.IsUpgrade = true //需要升级
            ls.RemoteVersion = sdk.Version //远端的版本号
      for _,sdk := range remoteSdks {
         if v,ok := localSdkM[sdk.Id];ok { //本地已安装
            ls := v
            if shouldVersionBeUpgrade(ls.Version, sdk.Version) { //判断版本号是否需要升级
               ls.Installed = true
               ls.IsUpgrade = true //需要升级
               ls.RemoteVersion = sdk.Version //远端的版本号
            }
            localSdkM[sdk.Id] = ls
            for index,es := range installedSdks {
               if es.Id == sdk.Id {
                  installedSdks[index] = ls
                  break
               }
            }
         } else { //本地未安装，需要安装
            bIns := SdkInsOrUpgrade{
               RemoteVersion: sdk.Version,
               IsUpgrade: false,
               Installed: false,
            }
            bIns.Sdk = sdk
            nInsSdks = append(nInsSdks, bIns)
         }
         localSdkM[sdkId] = ls
      } else { //本地未安装，需要安装
         bIns := SdkInsOrUpgrade{
            RemoteVersion: sdk.Version,
            IsUpgrade: false,
            Installed: false,
         }
         bIns.Sdk = sdk
         localSdkM[sdkId] = bIns
      }
   }

   sdks := make([]SdkInsOrUpgrade, 0)
   for _,v := range localSdkM {
      sdks = append(sdks, v)
   }
   return sdks
   return append(installedSdks, nInsSdks...)
}

func queryDatabase(sdkName string) ([]map[string]interface{}, map[string]bool) {
@@ -232,7 +244,7 @@
   token = "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjQ3NDUwMjU5MjMsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcInByb2R1Y3RNYW5nZTpwdWJsaXNoXCIsXCJjb2RlTWFuZ2U6dmlld1wiLFwiZGV2aWNlTWFuYWdlOmFkZFwiLFwiYWRtaW5NYW5hZ2VcIixcIm9yZGVyTWFuZ2VcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJwcm9kdWN0TWFuZ2U6YWRkXCIsXCJhZG1pbk1hbmFnZTp2aWV3XCIsXCJjb2RlTWFuZ2U6YWRkXCIsXCJwcm9kdWN0TWFuZ2U6b2ZmU2FsZVwiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcInByb2R1Y3RDZW50ZXI6ZG93bmxvYWRcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJwcm9kdWN0TWFuZ2U6dmlld1wiLFwiYXBpXCIsXCJob21lXCIsXCJvcmRlck1hbmdlOnBheVwiLFwiYWRtaW5NYW5hZ2U6YWRkXCIsXCJvcmRlck1hbmdlOmRvd25sb2FkXCIsXCJwcm9kdWN0Q2VudGVyXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJvcmRlck1hbmdlOnZpZXdcIixcImFkbWluTWFuYWdlOmVkaXRcIixcImRldmljZU1hbmFnZVwiLFwidmlwTWFuYWdlOmFkZFwiLFwidmlwTWFuYWdlOnZpZXdcIixcInByb2R1Y3RDZW50ZXI6dmlld1wiLFwidmlwTWFuYWdlOmVkaXRcIixcInZpcE1hbmFnZVwiLFwicHJvZHVjdE1hbmdlOmVkaXRcIixcImNvZGVNYW5nZVwiLFwicHJvZHVjdE1hbmdlXCJdLFwidXNlcm5hbWVcIjpcImJhc2ljXCJ9In0.vwjAFkWuEyadRLvIOGK8LFE3MjpY3SQ7j6AlTXnQDG8"
)

func findAllMySdk() map[string]Sdk {
func findAllMySdk() []Sdk {
   url := "http://"+config.ShopConf.Url+"/data/api-s/sdk/findAllMySdk"
   machineCode := licence.GetMachineCode()
   fmt.Println("url:", url, "machineCode:", machineCode)
@@ -259,11 +271,8 @@
      logger.Debug("unmarshal err:", err)
      return nil
   }
   m := make(map[string]Sdk)
   for _,s := range ss.Sdks {
      m[s.Id] = s
   }
   return m

   return ss.Sdks
}

func GetLocalSdks() []map[string]interface{} {
@@ -377,6 +386,9 @@
      logger.Debug("DownloadFile err:", err)
      return false, err
   }
   if unPackB,unPackErr := unPackPatchPackage(resp.Md5, ext); !unPackB { //解压失败
      return false, unPackErr
   }
   b, err := installSdk(resp.Md5, ext)
   if b {
      return true, nil