From aaa7697d6ec77e03d96ce36ca66abcbbcf2bb7a3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 14 七月 2020 12:03:33 +0800
Subject: [PATCH] add ruleSo
---
service/SdkDownLoad.go | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/service/SdkDownLoad.go b/service/SdkDownLoad.go
index f20918e..47c2c3e 100644
--- a/service/SdkDownLoad.go
+++ b/service/SdkDownLoad.go
@@ -141,21 +141,31 @@
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
}
@@ -304,7 +314,7 @@
type downOrUpResp struct {
Url string `json:"url"`
- md5 string `json:"md5"`
+ Md5 string `json:"md5"`
}
//涓嬭浇鎴栬�呭崌绾х畻娉�
@@ -332,13 +342,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 +371,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