From 9d88c7c467f8d93af4aab9ba0b6d6c01c2ffc546 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 20 八月 2020 20:35:30 +0800
Subject: [PATCH] add get buckets contrl
---
controllers/sdk.go | 160 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 108 insertions(+), 52 deletions(-)
diff --git a/controllers/sdk.go b/controllers/sdk.go
index c2f2cc9..76e1570 100644
--- a/controllers/sdk.go
+++ b/controllers/sdk.go
@@ -4,7 +4,6 @@
"net/http"
"strconv"
"webserver/extend/code"
- "webserver/extend/config"
"webserver/extend/util"
"webserver/middlewares/auth"
"webserver/service"
@@ -48,7 +47,7 @@
// @Description 绠楁硶淇濆瓨
// @Accept json
// @Produce json
-// @Tags sdk
+// @Tags 绠楁硶
// @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}"
@@ -74,16 +73,18 @@
// @Summary 鏌ユ壘鎵�鏈夌畻娉�
// @Description 鏌ユ壘鎵�鏈夌畻娉�
// @Produce json
-// @Tags sdk
+// @Tags 绠楁硶
// @Param sdkName query string false "鍙�夊弬鏁�"
+// @Param installed query bool 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/findAllSdk [GET]
func (sc SdkController) FindAllSdk(c *gin.Context) {
sdkName := c.Query("sdkName")
+ installed, _ := strconv.ParseBool(c.Query("installed"))
logger.Debug("FindAllSdk sdkName:", sdkName)
- sdks := service.GetSdkList("") //鏈満宸插畨瑁呯殑绠楁硶
+ sdks := service.GetSdkList("", installed) //鏈満宸插畨瑁呯殑绠楁硶
util.ResponseFormat(c, code.Success, sdks)
}
@@ -92,7 +93,7 @@
// @Summary 鏍规嵁id鑾峰彇绠楁硶淇℃伅
// @Description 鏍规嵁id鑾峰彇绠楁硶淇℃伅
// @Produce json
-// @Tags sdk
+// @Tags 绠楁硶
// @Param id query string true "绠楁硶id锛屽繀濉�"
// @Success 200 {string} json "{"code":200, msg:"璇锋眰澶勭悊鎴愬姛",data:"绠楁硶淇℃伅",success:true}"
// @Failure 500 {string} json "{"code":500, msg:"璇锋眰澶辫触",data:"",success:false}"
@@ -135,7 +136,7 @@
// @Summary 鏍规嵁taskId鑾峰彇绠楁硶淇℃伅
// @Description 鏍规嵁taskId鑾峰彇绠楁硶淇℃伅
// @Produce json
-// @Tags sdk
+// @Tags 绠楁硶
// @Param taskId query string true "taskId锛屽繀濉�"
// @Success 200 {string} json "{"code":200, msg:"璇锋眰澶勭悊鎴愬姛",data:"绠楁硶淇℃伅",success:true}"
// @Failure 500 {string} json "{"code":500, msg:"璇锋眰澶辫触",data:"",success:false}"
@@ -159,7 +160,7 @@
// @Description 绠楁硶瀹夎鍖呬笂浼�(鍒嗗潡妫�鏌�)
// @Accept multipart/form-data
// @Produce json
-// @Tags sdk
+// @Tags 绠楁硶
// @Param chunkNumber formData int true "褰撳墠鏄鍑犱釜鍒嗗潡"
// @Param chunkSize formData int true "姣忎竴鍧楃殑澶у皬"
// @Param currentChunkSize formData int true "褰撳墠鍧楃殑澶у皬"
@@ -211,7 +212,7 @@
// @Description 绠楁硶瀹夎鍖呬笂浼�
// @Accept multipart/form-data
// @Produce json
-// @Tags sysset
+// @Tags 绠楁硶
// @Param chunkNumber formData int true "褰撳墠鏄鍑犱釜鍒嗗潡"
// @Param chunkSize formData int true "姣忎竴鍧楃殑澶у皬"
// @Param currentChunkSize formData int true "褰撳墠鍧楃殑澶у皬"
@@ -258,59 +259,114 @@
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, "")
}
}
-func (sc SdkController) SdkDownLoad(c *gin.Context) {
- var soApi dbapi.SdkApi
- var sdkConfig map[string]interface{}
+// @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/showInstallInfo [post]
+func (sc SdkController) ShowInstallInfo(c *gin.Context) {
+ identifier := c.Request.FormValue("identifier")
+ filename := c.Request.FormValue("filename")
+ var sv service.SdkInstallService
+ b,d, err := sv.ShowInstallInfo(identifier, filename)
+ if b {
+ util.ResponseFormat(c,code.Success, d)
+ } else {
+ util.ResponseFormat(c,&code.Code{http.StatusInternalServerError, false, err.Error()}, err.Error())
+ }
+}
+// @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
+ }
+}
+
+// @Security ApiKeyAuth
+// @Summary 浠庡晢鍩庝笅杞芥垨鍗囩骇绠楁硶
+// @Description 浠庡晢鍩庝笅杞芥垨鍗囩骇绠楁硶
+// @Produce json
+// @Tags 绠楁硶
+// @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) {
sdkId, exist := c.GetQuery("path")
if !exist {
- util.ResponseFormat(c, code.ComError, "涓嬭浇鐨勭畻娉曞弬鏁版湁璇�")
+ util.ResponseFormat(c, code.RequestParamError, "涓嬭浇鐨勭畻娉曞弬鏁版湁璇�")
+ return
}
- logger.Info(sdkId)
-
- // 鍏堟煡鎵炬湰鍦扮洰褰曞唴鏄惁宸插瓨鍦ㄧ畻娉晄o, 娌℃湁璧颁簯绔笅杞�
- if sdkConfig = service.FindLocalSdkSoById(sdkId); sdkConfig == nil {
- sdkConfig = service.DownSdk(sdkId)
+ 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())
}
-
- 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, "绠楁硶涓嬭浇澶辫触,璇烽噸璇�")
}
+
+// @Security ApiKeyAuth
+// @Summary 浣跨敤婵�娲荤爜婵�娲诲畨瑁呯畻娉�
+// @Description 浣跨敤婵�娲荤爜婵�娲诲畨瑁呯畻娉�
+// @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")
+ sdkId := c.GetString("sdkId")
+ if cod == "" || sdkId == "" {
+ util.ResponseFormat(c, code.RequestParamError, "婵�娲荤爜鍜岀畻娉昳d涓嶈兘涓虹┖")
+ return
+ }
+ var sv service.SdkInstallService
+ d, err := sv.Active(cod, sdkId)
+ if err == nil {
+ util.ResponseFormat(c,code.Success, d)
+ } else {
+ util.ResponseFormat(c,code.ComError, err.Error())
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0