From 2a4041f16c6588921c87df93927e9076c2cc309d Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期一, 08 六月 2020 18:21:19 +0800 Subject: [PATCH] add sdk download impl --- controllers/sdk.go | 39 ++++++--------------------------------- 1 files changed, 6 insertions(+), 33 deletions(-) diff --git a/controllers/sdk.go b/controllers/sdk.go index c2f2cc9..238e47a 100644 --- a/controllers/sdk.go +++ b/controllers/sdk.go @@ -4,7 +4,6 @@ "net/http" "strconv" "webserver/extend/code" - "webserver/extend/config" "webserver/extend/util" "webserver/middlewares/auth" "webserver/service" @@ -276,41 +275,15 @@ } func (sc SdkController) SdkDownLoad(c *gin.Context) { - var soApi dbapi.SdkApi - var sdkConfig map[string]interface{} - sdkId, exist := c.GetQuery("path") if !exist { - util.ResponseFormat(c, code.ComError, "涓嬭浇鐨勭畻娉曞弬鏁版湁璇�") + util.ResponseFormat(c, code.RequestParamError, "涓嬭浇鐨勭畻娉曞弬鏁版湁璇�") + return } - logger.Info(sdkId) - - // 鍏堟煡鎵炬湰鍦扮洰褰曞唴鏄惁宸插瓨鍦ㄧ畻娉晄o, 娌℃湁璧颁簯绔笅杞� - if sdkConfig = service.FindLocalSdkSoById(sdkId); sdkConfig == nil { - sdkConfig = service.DownSdk(sdkId) + if b,err := service.DownloadOrUpgrade(sdkId);b { + util.ResponseFormat(c, code.Success, "绠楁硶瀹夎鎴愬姛") + } else { + util.ResponseFormat(c, &code.Code{http.StatusBadRequest, false, err.Error()}, err.Error()) } - - if sdkConfig != nil { - if regSdkSuccess, _ := soApi.Register(sdkConfig); regSdkSuccess { - util.ResponseFormat(c, code.Success, "涓嬭浇绠楁硶鎴愬姛锛�") - return - } - } - - flag := c.Query("needUpdateMiddle") - // 涓嬭浇绠楁硶锛堟湁鏃跺�欎篃闇�瑕佹妸涓棿浠朵竴璧蜂笅杞戒笅鏉ワ級 - if flag == "true" { - // 涓嬭浇骞舵洿鏂颁腑闂翠欢,甯︿笂MD5鏍¢獙 - flag1, err := service.DownSo("http://" + config.SoPath.Ip + ":" + config.SoPath.Port + "/" + "middleware.so") - logger.Debug("涓棿浠惰矾寰勶細", "http://"+config.SoPath.Ip+":"+config.SoPath.Port+"/"+"middleware.so") - if err != nil { - logger.Info(err) - } - if !flag1 { - util.ResponseFormat(c, code.ComError, "璇烽噸鏂颁笅杞界畻娉�") - } - } - - util.ResponseFormat(c, code.ComError, "绠楁硶涓嬭浇澶辫触,璇烽噸璇�") } -- Gitblit v1.8.0