From 74f3a264f3cb2f53f6b176bcb66736b1705ffc14 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期日, 28 六月 2020 20:15:55 +0800
Subject: [PATCH] update dbapi
---
controllers/sdk.go | 264 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 185 insertions(+), 79 deletions(-)
diff --git a/controllers/sdk.go b/controllers/sdk.go
index f44cd0d..d314a68 100644
--- a/controllers/sdk.go
+++ b/controllers/sdk.go
@@ -1,43 +1,45 @@
package controllers
import (
- "basic.com/dbapi.git"
- uuid "github.com/satori/go.uuid"
+ "net/http"
+ "strconv"
"webserver/extend/code"
- "webserver/extend/config"
- "basic.com/valib/logger.git"
"webserver/extend/util"
- "github.com/gin-gonic/gin"
+ "webserver/middlewares/auth"
"webserver/service"
+
+ "basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
+ "github.com/gin-gonic/gin"
)
type SdkController struct {
}
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"` //绠楁硶鍙傛暟
- 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"`//閫昏緫鍒犻櫎
+ 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"` //鏄惁蹇呭～
- Unit string `json:"unit"`
- Range string `json:"range"` //鍊肩殑鑼冨洿锛宔g锛�0,100琛ㄧず浠�0鍒�100
+ 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"` //鍙傛暟椤哄簭
+ Sort int `json:"sort"` //鍙傛暟椤哄簭
}
// @Security ApiKeyAuth
@@ -54,13 +56,13 @@
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)
@@ -77,10 +79,11 @@
// @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)
+ logger.Debug("FindAllSdk sdkName:", sdkName)
+
+ sdks := service.GetSdkList("") //鏈満宸插畨瑁呯殑绠楁硶
+
util.ResponseFormat(c, code.Success, sdks)
}
@@ -96,17 +99,17 @@
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)
}
}
@@ -114,16 +117,16 @@
func (sc SdkController) GetSdkArgs(c *gin.Context) {
sdkId := c.Query("sdkId")
scope := c.Query("scope")
- if sdkId== "" || scope == ""{
- util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ 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)
+ b, d := api.GetSdkArgs(sdkId, scope)
+ if b {
+ util.ResponseFormat(c, code.Success, d)
} else {
- util.ResponseFormat(c,code.ComError,"鏌ヨ澶辫触")
+ util.ResponseFormat(c, code.ComError, "鏌ヨ澶辫触")
}
}
@@ -140,53 +143,156 @@
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)
}
}
+// @Summary 绠楁硶瀹夎鍖呬笂浼�(鍒嗗潡妫�鏌�)
+// @Description 绠楁硶瀹夎鍖呬笂浼�(鍒嗗潡妫�鏌�)
+// @Accept multipart/form-data
+// @Produce json
+// @Tags sdk
+// @Param chunkNumber formData int true "褰撳墠鏄鍑犱釜鍒嗗潡"
+// @Param chunkSize formData int true "姣忎竴鍧楃殑澶у皬"
+// @Param currentChunkSize formData int true "褰撳墠鍧楃殑澶у皬"
+// @Param identifier formData string true "鏁翠釜鏂囦欢鐨勫敮涓�鏍囪瘑锛岀洰鍓嶆槸md5"
+// @Param filename formData string true "鏂囦欢鍚嶇О"
+// @Param relativePath formData string true "鏂囦欢鍦ㄥ鎴风鐢佃剳鐨勮矾寰�"
+// @Param totalChunks formData int true "鏂囦欢鎬诲潡鏁�"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/sdk/upload [get]
+func (sc SdkController) Upload(c *gin.Context) {
+ authDriver := auth.GenerateAuthDriver()
+ userM := (*authDriver).User(c)
+ if userM ==nil {
+ util.ResponseFormat(c,code.TokenNotFound,"鐧诲綍杩囨湡锛岃鐧诲綍")
+ return
+ }
+ chunkNumber, e1 := strconv.Atoi(c.Request.FormValue("chunkNumber"))
+ chunkSize, e2 := strconv.Atoi(c.Request.FormValue("chunkSize"))
+ currentChunkSize, e3 := strconv.Atoi(c.Request.FormValue("currentChunkSize"))
+ identifier := c.Request.FormValue("identifier")
+ filename := c.Request.FormValue("filename")
+ relativePath := c.Request.FormValue("relativePath")
+ totalChunks, e5 := strconv.Atoi(c.Request.FormValue("totalChunks"))
+ if identifier == "" || e1 != nil || e2 != nil || e3 != nil || e5 !=nil {
+ util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
+ return
+ }
+ var arg = service.FileChunkCheckVo {
+ UserId: userM["id"].(string),
+ FileName: filename,
+ Identifier: identifier,
+ RelativePath: relativePath,
+ TotalChunks: totalChunks,
+ ChunkNumber: chunkNumber,
+ ChunkSize: chunkSize,
+ CurrentChunkSize:currentChunkSize,
+ }
+ var sv service.SysService
+ if b := sv.CheckUpdateFile(&arg);b {
+ c.String(http.StatusOK,"found")
+ } else {
+ c.String(http.StatusNoContent,"")
+ }
+}
+
+// @Security ApiKeyAuth
+// @Summary 绠楁硶瀹夎鍖呬笂浼�
+// @Description 绠楁硶瀹夎鍖呬笂浼�
+// @Accept multipart/form-data
+// @Produce json
+// @Tags sysset
+// @Param chunkNumber formData int true "褰撳墠鏄鍑犱釜鍒嗗潡"
+// @Param chunkSize formData int true "姣忎竴鍧楃殑澶у皬"
+// @Param currentChunkSize formData int true "褰撳墠鍧楃殑澶у皬"
+// @Param totalSize formData string true "鏂囦欢鎬诲ぇ灏�"
+// @Param identifier formData string true "鏁翠釜鏂囦欢鐨勫敮涓�鏍囪瘑锛岀洰鍓嶆槸md5"
+// @Param filename formData string true "鏂囦欢鍚嶇О"
+// @Param relativePath formData string true "鏂囦欢鍦ㄥ鎴风鐢佃剳鐨勮矾寰�"
+// @Param totalChunks formData int true "鏂囦欢鎬诲潡鏁�"
+// @Param file formData file true "鏂囦欢鍒嗙墖鍐呭"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/sdk/upload [post]
+func (sc SdkController) UploadPack(c *gin.Context) {
+ authDriver := auth.GenerateAuthDriver()
+ userM := (*authDriver).User(c)
+ if userM == nil {
+ util.ResponseFormat(c, code.TokenNotFound, "鐧诲綍杩囨湡锛岃鐧诲綍")
+ return
+ }
+ chunkNumber, e1 := strconv.Atoi(c.Request.FormValue("chunkNumber"))
+ chunkSize, e2 := strconv.Atoi(c.Request.FormValue("chunkSize"))
+ currentChunkSize, e3 := strconv.Atoi(c.Request.FormValue("currentChunkSize"))
+ totalSize, e4 := strconv.ParseInt(c.Request.FormValue("totalSize"), 10, 64)
+ identifier := c.Request.FormValue("identifier")
+ filename := c.Request.FormValue("filename")
+ relativePath := c.Request.FormValue("relativePath")
+ totalChunks, e5 := strconv.Atoi(c.Request.FormValue("totalChunks"))
+ file, header, e6 := c.Request.FormFile("file")
+ if identifier == "" || e1 != nil || e2 != nil || e3 != nil || e4 != nil || e5 != nil || e6 != nil {
+ util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ var arg = service.FileUploadVo{
+ UserId: userM["id"].(string),
+ FileName: filename,
+ Identifier: identifier,
+ RelativePath: relativePath,
+ TotalSize: totalSize,
+ TotalChunks: totalChunks,
+ ChunkNumber: chunkNumber,
+ ChunkSize: chunkSize,
+ CurrentChunkSize: currentChunkSize,
+ File: &file,
+ Header: header,
+ }
+ var sv service.SysService
+ if b,isComplete := sv.PatchUpload(&arg); b {
+ if isComplete { //涓婁紶瀹屾瘯闇�瑕佽嚜鍔ㄨЕ鍙戝畨瑁�
+ var sv service.SdkInstallService
+ if b,err := sv.SdkInstall(identifier, filename);b {
+ util.ResponseFormat(c,&code.Code{http.StatusOK, true, "绠楁硶瀹夎鎴愬姛"},"绠楁硶瀹夎鎴愬姛")
+ return
+ } else {
+ util.ResponseFormat(c,&code.Code{http.StatusBadRequest, false, "绠楁硶瀹夎澶辫触"},err.Error())
+ return
+ }
+ }
+ util.ResponseFormat(c, code.Success, "")
+ } else {
+ util.ResponseFormat(c, code.ComError, "")
+ }
+}
+
+// @Security ApiKeyAuth
+// @Summary 浠庡晢鍩庝笅杞芥垨鍗囩骇绠楁硶
+// @Description 浠庡晢鍩庝笅杞芥垨鍗囩骇绠楁硶
+// @Produce json
+// @Tags sysset
+// @Param path query string true "绠楁硶id"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/sdk/sdkDownload [get]
func (sc SdkController) SdkDownLoad(c *gin.Context) {
- path,exist := c.GetQuery("path")
+ sdkId, exist := c.GetQuery("path")
if !exist {
- util.ResponseFormat(c,code.ComError,"涓嬭浇鐨勭畻娉曞弬鏁版湁璇�")
+ util.ResponseFormat(c, code.RequestParamError, "涓嬭浇鐨勭畻娉曞弬鏁版湁璇�")
+ return
}
- 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,"璇烽噸鏂颁笅杞界畻娉�")
- }
+
+ 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())
}
- // 涓嬭浇绠楁硶锛屾牎楠岋紝骞跺啓鍏ュ埌鐩爣鐩綍涓�
- 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