From 7378befdf16b6cc656c5b2ac82c862dd5228ad55 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期六, 30 五月 2020 16:33:16 +0800
Subject: [PATCH] fix
---
controllers/sdk.go | 136 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 102 insertions(+), 34 deletions(-)
diff --git a/controllers/sdk.go b/controllers/sdk.go
index cbd1ebb..847ec2b 100644
--- a/controllers/sdk.go
+++ b/controllers/sdk.go
@@ -1,9 +1,13 @@
package controllers
import (
- "basic.com/dbapi.git"
"webserver/extend/code"
+ "webserver/extend/config"
"webserver/extend/util"
+ "webserver/service"
+
+ "basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
"github.com/gin-gonic/gin"
)
@@ -11,31 +15,35 @@
}
type SdkVo struct {
- Id string `json:"id"`
- SdkType string `json:"sdk_type"`//浜鸿劯妫�娴嬶細FaceDetect,浜鸿劯鎻愬彇锛欶aceExtract,浜鸿劯姣斿锛欶aceCompare,琛屼负锛歒olo
- SdkName string `json:"sdk_name"` //绠楁硶鍚嶇О
- Args []SdkArgVo `json:"args,omitempty"` //绠楁硶鍙傛暟
- Icon string `json:"icon,omitempty"` //绠楁硶鍥炬爣
- Url string `json:"url,omitempty"` //绠楁硶涓嬭浇鍦板潃
- CreateTime string `json:"create_time"`
- CreateBy string `json:"create_by"`
- UpdateTime string `json:"update_time"`
- Enabled int `json:"enabled"`//鏄惁鍚敤
- DelFlag int `json:"del_flag"`//閫昏緫鍒犻櫎
+ Id string `json:"id"`
+ SdkType string `json:"sdk_type"` //浜鸿劯妫�娴嬶細FaceDetect,浜鸿劯鎻愬彇锛欶aceExtract,浜鸿劯姣斿锛欶aceCompare,琛屼负锛歒olo
+ SdkName string `json:"sdk_name"` //绠楁硶鍚嶇О
+ Args []SdkArgVo `json:"args"` //绠楁硶鍙傛暟
+ Icon string `json:"icon"` //绠楁硶鍥炬爣
+ Url string `json:"url"` //绠楁硶涓嬭浇鍦板潃
+ CreateTime string `json:"create_time"`
+ CreateBy string `json:"create_by"`
+ UpdateTime string `json:"update_time"`
+ Enable bool `json:"enable"` //鏄惁鍚敤
+ DelFlag bool `json:"del_flag"` //閫昏緫鍒犻櫎
}
//绠楁硶鍙傛暟瀹氫箟
type SdkArgVo struct {
- Alias string `json:"alias"` //鍙傛暟鐨勫埆鍚�
- Name string `json:"name"` //鍙傛暟鍚嶇О
- Type string `json:"type"` //鍙傛暟绫诲瀷(鏁存暟锛屽瓧绗︿覆鎴栨暟缁�)
- Must bool `json:"must"` //鏄惁蹇呭～
- Range string `json:"range"` //鍊肩殑鑼冨洿锛宔g锛�0,100琛ㄧず浠�0鍒�100
- Sort int `json:"sort"` //鍙傛暟椤哄簭
+ Alias string `json:"alias"` //鍙傛暟鐨勫埆鍚�
+ 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"` //鍙傛暟椤哄簭
}
+// @Security ApiKeyAuth
// @Summary 绠楁硶淇濆瓨
// @Description 绠楁硶淇濆瓨
+// @Accept json
// @Produce json
// @Tags sdk
// @Param reqMap body controllers.SdkVo true "浜鸿劯妫�娴�"
@@ -46,19 +54,20 @@
var sdk SdkVo
var api dbapi.SdkApi
- if err := c.BindJSON(&sdk);err !=nil {
- util.ResponseFormat(c,code.RequestParamError,"鍙傛暟閿欒")
+ if err := c.BindJSON(&sdk); err != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟閿欒")
return
}
paramBody := util.Struct2Map(sdk)
- flag, data := api.Save(paramBody)
- if flag{
+ flag, data := api.Register(paramBody)
+ if flag {
util.ResponseFormat(c, code.Success, data)
} else {
util.ResponseFormat(c, code.ComError, data)
}
}
+// @Security ApiKeyAuth
// @Summary 鏌ユ壘鎵�鏈夌畻娉�
// @Description 鏌ユ壘鎵�鏈夌畻娉�
// @Produce json
@@ -68,13 +77,13 @@
// @Failure 500 {string} json "{"code":500, msg:"璇锋眰澶辫触",data:"[]",success:false}"
// @Router /data/api-v/sdk/findAllSdk [GET]
func (sc SdkController) FindAllSdk(c *gin.Context) {
- var api dbapi.SdkApi
-
sdkName := c.Query("sdkName")
- sdks := api.FindAll(sdkName)
+
+ sdks := service.GetSdkList(sdkName)
util.ResponseFormat(c, code.Success, sdks)
}
+// @Security ApiKeyAuth
// @Summary 鏍规嵁id鑾峰彇绠楁硶淇℃伅
// @Description 鏍规嵁id鑾峰彇绠楁硶淇℃伅
// @Produce json
@@ -86,19 +95,38 @@
func (sc SdkController) GetById(c *gin.Context) {
var api dbapi.SdkApi
sdkId := c.Query("id")
- if sdkId == ""{
- util.ResponseFormat(c,code.RequestParamError,"sdkId涓嶈兘涓虹┖")
+ if sdkId == "" {
+ util.ResponseFormat(c, code.RequestParamError, "sdkId涓嶈兘涓虹┖")
return
}
flag, sdk := api.GetById(sdkId)
+
if flag {
- util.ResponseFormat(c,code.Success,sdk)
+ util.ResponseFormat(c, code.Success, sdk)
} else {
- util.ResponseFormat(c,code.ComError,sdk)
+ util.ResponseFormat(c, code.ComError, sdk)
}
}
+// @Router /data/api-v/sdkArg/getSdkArgs [get]
+func (sc SdkController) GetSdkArgs(c *gin.Context) {
+ sdkId := c.Query("sdkId")
+ scope := c.Query("scope")
+ if sdkId == "" || scope == "" {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ var api dbapi.SdkApi
+ b, d := api.GetSdkArgs(sdkId, scope)
+ if b {
+ util.ResponseFormat(c, code.Success, d)
+ } else {
+ util.ResponseFormat(c, code.ComError, "鏌ヨ澶辫触")
+ }
+}
+
+// @Security ApiKeyAuth
// @Summary 鏍规嵁taskId鑾峰彇绠楁硶淇℃伅
// @Description 鏍规嵁taskId鑾峰彇绠楁硶淇℃伅
// @Produce json
@@ -111,13 +139,53 @@
var api dbapi.SdkApi
taskId := c.Query("taskId")
if taskId == "" {
- util.ResponseFormat(c,code.ComError,"浠诲姟id涓嶈兘涓虹┖")
+ util.ResponseFormat(c, code.ComError, "浠诲姟id涓嶈兘涓虹┖")
return
}
- flag,sdks := api.FindByTaskId(taskId)
+ flag, sdks := api.FindByTaskId(taskId)
if flag {
- util.ResponseFormat(c,code.Success,sdks)
+ util.ResponseFormat(c, code.Success, sdks)
} else {
- util.ResponseFormat(c,code.ComError,sdks)
+ util.ResponseFormat(c, code.ComError, sdks)
}
-}
\ No newline at end of file
+}
+
+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, "涓嬭浇鐨勭畻娉曞弬鏁版湁璇�")
+ }
+
+ logger.Info(sdkId)
+
+ // 鍏堟煡鎵炬湰鍦扮洰褰曞唴鏄惁宸插瓨鍦ㄧ畻娉晄o, 娌℃湁璧颁簯绔笅杞�
+ if sdkConfig = service.FindLocalSdkSoById(sdkId); sdkConfig == nil {
+ sdkConfig = service.DownSdk(sdkId)
+ }
+
+ 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