From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:33:39 +0800
Subject: [PATCH] fix
---
controllers/sdk.go | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 5 deletions(-)
diff --git a/controllers/sdk.go b/controllers/sdk.go
index cbd1ebb..dda196f 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"
+ "basic.com/valib/logger.git"
"webserver/extend/util"
"github.com/gin-gonic/gin"
+ "webserver/service"
)
type SdkController struct {
@@ -14,14 +18,14 @@
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"` //绠楁硶涓嬭浇鍦板潃
+ 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"`
- Enabled int `json:"enabled"`//鏄惁鍚敤
- DelFlag int `json:"del_flag"`//閫昏緫鍒犻櫎
+ Enable bool `json:"enable"`//鏄惁鍚敤
+ DelFlag bool `json:"del_flag"`//閫昏緫鍒犻櫎
}
//绠楁硶鍙傛暟瀹氫箟
@@ -30,18 +34,24 @@
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 "浜鸿劯妫�娴�"
// @Success 200 {string} json "{"code":200, msg:"璇锋眰澶勭悊鎴愬姛",data:"",success:true}"
// @Failure 500 {string} json "{"code":500, msg:"璇锋眰澶辫触",data:"",success:false}"
// @Router /data/api-v/sdk/save [POST]
+*/
func (sc SdkController) Save(c *gin.Context) {
var sdk SdkVo
var api dbapi.SdkApi
@@ -59,6 +69,8 @@
}
}
+/*
+// @Security ApiKeyAuth
// @Summary 鏌ユ壘鎵�鏈夌畻娉�
// @Description 鏌ユ壘鎵�鏈夌畻娉�
// @Produce json
@@ -67,6 +79,7 @@
// @Success 200 {string} json "{"code":200, msg:"璇锋眰澶勭悊鎴愬姛",data:"绠楁硶鍒楄〃",success:true}"
// @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
@@ -75,6 +88,8 @@
util.ResponseFormat(c, code.Success, sdks)
}
+/*
+// @Security ApiKeyAuth
// @Summary 鏍规嵁id鑾峰彇绠楁硶淇℃伅
// @Description 鏍规嵁id鑾峰彇绠楁硶淇℃伅
// @Produce json
@@ -83,6 +98,7 @@
// @Success 200 {string} json "{"code":200, msg:"璇锋眰澶勭悊鎴愬姛",data:"绠楁硶淇℃伅",success:true}"
// @Failure 500 {string} json "{"code":500, msg:"璇锋眰澶辫触",data:"",success:false}"
// @Router /data/api-v/sdk/getById [GET]
+*/
func (sc SdkController) GetById(c *gin.Context) {
var api dbapi.SdkApi
sdkId := c.Query("id")
@@ -92,6 +108,7 @@
}
flag, sdk := api.GetById(sdkId)
+
if flag {
util.ResponseFormat(c,code.Success,sdk)
} else {
@@ -99,6 +116,27 @@
}
}
+/*
+// @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
@@ -107,6 +145,7 @@
// @Success 200 {string} json "{"code":200, msg:"璇锋眰澶勭悊鎴愬姛",data:"绠楁硶淇℃伅",success:true}"
// @Failure 500 {string} json "{"code":500, msg:"璇锋眰澶辫触",data:"",success:false}"
// @Router /data/api-v/sdk/findByTaskId [GET]
+*/
func (sc SdkController) FindByTaskId(c *gin.Context) {
var api dbapi.SdkApi
taskId := c.Query("taskId")
@@ -120,4 +159,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