From 71ce16cb6eba7898b6e555e6b29c3608b39e2892 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期日, 28 六月 2020 20:04:43 +0800
Subject: [PATCH] fix DeleteGroup
---
service/SdkDownLoad.go | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/service/SdkDownLoad.go b/service/SdkDownLoad.go
index 1acd4c2..a79d1d0 100644
--- a/service/SdkDownLoad.go
+++ b/service/SdkDownLoad.go
@@ -141,7 +141,7 @@
siou := SdkInsOrUpgrade{
Installed: true,
}
- siou.Sdk = Sdk{
+ sdk := Sdk{
Id: ls.Id,
IpcId: ls.IpcId,
SdkType: ls.SdkType,
@@ -156,6 +156,20 @@
IconBlob: ls.IconBlob,
Version: ls.Version,
}
+ 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
}
@@ -304,7 +318,7 @@
type downOrUpResp struct {
Url string `json:"url"`
- md5 string `json:"md5"`
+ Md5 string `json:"md5"`
}
//涓嬭浇鎴栬�呭崌绾х畻娉�
@@ -342,7 +356,8 @@
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("鑾峰彇涓嬭浇瀹夎鍖呭け璐�")
}
@@ -360,13 +375,13 @@
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)
+ b, err := installSdk(resp.Md5, ext)
if b {
return true, nil
}
--
Gitblit v1.8.0