From 9d88c7c467f8d93af4aab9ba0b6d6c01c2ffc546 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:35:30 +0800
Subject: [PATCH] add get buckets contrl
---
service/SdkDownLoad.go | 119 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 73 insertions(+), 46 deletions(-)
diff --git a/service/SdkDownLoad.go b/service/SdkDownLoad.go
index f20918e..db15569 100644
--- a/service/SdkDownLoad.go
+++ b/service/SdkDownLoad.go
@@ -133,61 +133,83 @@
}
}
-func GetSdkList(sdkName string) []SdkInsOrUpgrade {
+//installedFlag 濡傛灉鏄痶rue,琛ㄧず鍙煡鏈湴鐨勶紝涓嶉渶瑕佹瘮瀵规煡鐪嬫湭瀹夎鐨勭畻娉�
+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,
}
- siou.Sdk = Sdk{
- Id: ls.Id,
- IpcId: ls.IpcId,
- SdkType: ls.SdkType,
- SdkName: ls.SdkName,
- Icon: ls.Icon,
- Url: ls.Url,
+ sdk := Sdk{
CreateTime: ls.CreateTime,
CreateBy: ls.CreateBy,
UpdateTime: ls.UpdateTime,
Enable: ls.Enable,
DelFlag: int(ls.DelFlag),
- IconBlob: ls.IconBlob,
- Version: ls.Version,
}
+ var sc SdkCommon
+ sc.copyFromProto(ls)
+ sdk.SdkCommon = sc
+
+ for _,arg := range ls.Args {
+ sdk.Args = append(sdk.Args, SdkArg{
+ Alias: arg.Alias,
+ Name: arg.Name,
+ Type: arg.Type,
+ Must: arg.Must,
+ Unit: arg.Unit,
+ Range: arg.Range,
+ DefaultValue: arg.DefaultValue,
+ DefaultOperator: arg.DefaultOperator,
+ Sort: int(arg.Sort),
+ })
+ }
+ 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) {
@@ -222,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)
@@ -249,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{} {
@@ -304,7 +323,7 @@
type downOrUpResp struct {
Url string `json:"url"`
- md5 string `json:"md5"`
+ Md5 string `json:"md5"`
}
//涓嬭浇鎴栬�呭崌绾х畻娉�
@@ -332,13 +351,18 @@
logger.Debug("unmarshal err:", err)
return false, err
}
+ if !res.Success {
+ logger.Debug("res.Data:", res.Data)
+ return false, errors.New("璇锋眰鍟嗗煄澶辫触")
+ }
bytes, _ := json.Marshal(res.Data)
var resp downOrUpResp
if err := json.Unmarshal(bytes, &resp);err != nil {
logger.Debug("unmarshal err:", err)
return false, err
}
- if resp.Url == "" || resp.md5 == "" {
+ logger.Debug("res.Data:", res.Data, "resp:", resp)
+ if resp.Url == "" || resp.Md5 == "" {
return false, errors.New("鑾峰彇涓嬭浇瀹夎鍖呭け璐�")
}
@@ -356,13 +380,16 @@
ext := path.Ext(filenameWithSuffix)
downUrl := "http://"+config.ShopConf.Url+"/files/"+resp.Url
- gzFilePath := configPatchPath + "/" + resp.md5+ext
+ gzFilePath := configPatchPath + "/" + resp.Md5+ext
err = reqUtil.DownloadFile(gzFilePath, downUrl)
if err != nil {
logger.Debug("DownloadFile err:", err)
return false, err
}
- b, err := installSdk(resp.md5, ext)
+ if unPackB,unPackErr := unPackPatchPackage(resp.Md5, ext); !unPackB { //瑙ｅ帇澶辫触
+ return false, unPackErr
+ }
+ b, err := installSdk(resp.Md5, ext)
if b {
return true, nil
}
--
Gitblit v1.8.0