From 5f2abf9bdd8c0eb9b584c78b87b89be66a1b177e Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 27 七月 2020 14:39:42 +0800
Subject: [PATCH] use libcffmpeg-capture.so,stable version
---
controllers/sdk.go | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/controllers/sdk.go b/controllers/sdk.go
index 479c16c..d51c02c 100644
--- a/controllers/sdk.go
+++ b/controllers/sdk.go
@@ -257,20 +257,44 @@
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, "")
+ if b,_ := 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 绠楁硶
+// @Param identifier formData string true "鏁翠釜鏂囦欢鐨勫敮涓�鏍囪瘑锛岀洰鍓嶆槸md5"
+// @Param filename formData string true "鏂囦欢鍚嶇О"
+// @Success 200 {string} json "{"code":200, msg:"", success:true}"
+// @Failure 500 {string} json "{"code":500, msg:"", success:false}"
+// @Router /data/api-v/sdk/install [post]
+func (sc SdkController) Install(c *gin.Context) {
+ identifier := c.Request.FormValue("identifier")
+ filename := c.Request.FormValue("filename")
+
+ 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()},err.Error())
+ return
}
}
@@ -303,19 +327,21 @@
// @Produce json
// @Tags 绠楁硶
// @Param code query string true "婵�娲荤爜"
+// @Param sdkId 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/active [get]
func (sc SdkController) Active(c *gin.Context) {
cod := c.GetString("code")
- if cod == "" {
- util.ResponseFormat(c, code.RequestParamError, "婵�娲荤爜涓嶈兘涓虹┖")
+ sdkId := c.GetString("sdkId")
+ if cod == "" || sdkId == "" {
+ util.ResponseFormat(c, code.RequestParamError, "婵�娲荤爜鍜岀畻娉昳d涓嶈兘涓虹┖")
return
}
var sv service.SdkInstallService
- err := sv.Active(cod)
+ d, err := sv.Active(cod, sdkId)
if err == nil {
- util.ResponseFormat(c,code.Success, "婵�娲绘垚鍔�")
+ util.ResponseFormat(c,code.Success, d)
} else {
util.ResponseFormat(c,code.ComError, err.Error())
}
--
Gitblit v1.8.0