From 12ece5e87aeb455290c766705e4a624096c1dd2b Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 23 八月 2019 15:59:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
controllers/sdk.go | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/controllers/sdk.go b/controllers/sdk.go
index b54307c..de1930b 100644
--- a/controllers/sdk.go
+++ b/controllers/sdk.go
@@ -2,9 +2,13 @@
import (
"basic.com/dbapi.git"
+ uuid "github.com/satori/go.uuid"
"webserver/extend/code"
+ "webserver/extend/config"
+ "webserver/extend/logger"
"webserver/extend/util"
"github.com/gin-gonic/gin"
+ "webserver/service"
)
type SdkController struct {
@@ -30,7 +34,9 @@
Name string `json:"name"` //鍙傛暟鍚嶇О
Type string `json:"type"` //鍙傛暟绫诲瀷(鏁存暟锛屽瓧绗︿覆鎴栨暟缁�)
Must bool `json:"must"` //鏄惁蹇呭～
+ Unit string `json:"unit"`
Range string `json:"range"` //鍊肩殑鑼冨洿锛宔g锛�0,100琛ㄧず浠�0鍒�100
+ DefaultValue string `json:"default_value"`
Sort int `json:"sort"` //鍙傛暟椤哄簭
}
@@ -138,4 +144,44 @@
} else {
util.ResponseFormat(c,code.ComError,sdks)
}
+}
+
+func (sc SdkController) SdkDownLoad(c *gin.Context) {
+ path,exist := c.GetQuery("path")
+ if !exist {
+ util.ResponseFormat(c,code.ComError,"涓嬭浇鐨勭畻娉曞弬鏁版湁璇�")
+ }
+ logger.Info(path)
+ 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,"璇烽噸鏂颁笅杞界畻娉�")
+ }
+ }
+ // 涓嬭浇绠楁硶锛屾牎楠岋紝骞跺啓鍏ュ埌鐩爣鐩綍涓�
+ flag2,err2 := service.DownSo(path)
+ if err2 != nil {
+ logger.Info(err2)
+ }
+ if !flag2 {
+ util.ResponseFormat(c,code.ComError,"璇烽噸鏂颁笅杞界畻娉�")
+ }
+ // 灏嗙畻娉曞拰so鍚嶇О瀛樺埌瑙勫垯绉佹湁鐨勬敞鍐岃〃
+ var soApi dbapi.SoApi
+ param := make(map[string]interface{})
+ param["id"] = uuid.NewV4().String()
+ sdkId := uuid.NewV4().String()
+ param["sdkId"] = sdkId
+ param["soName"] = service.GetFileNameFromUrl(path,true)
+ flag3,_ := soApi.Add(param)
+ if flag3 {
+ util.ResponseFormat(c,code.Success,"涓嬭浇绠楁硶鎴愬姛锛�")
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0