From 71ce16cb6eba7898b6e555e6b29c3608b39e2892 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期日, 28 六月 2020 20:04:43 +0800
Subject: [PATCH] fix DeleteGroup
---
controllers/sdk.go | 180 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 142 insertions(+), 38 deletions(-)
diff --git a/controllers/sdk.go b/controllers/sdk.go
index 3f3fd33..d314a68 100644
--- a/controllers/sdk.go
+++ b/controllers/sdk.go
@@ -1,9 +1,11 @@
package controllers
import (
+ "net/http"
+ "strconv"
"webserver/extend/code"
- "webserver/extend/config"
"webserver/extend/util"
+ "webserver/middlewares/auth"
"webserver/service"
"basic.com/dbapi.git"
@@ -59,7 +61,7 @@
return
}
paramBody := util.Struct2Map(sdk)
- flag, data := api.Save(paramBody)
+ flag, data := api.Register(paramBody)
if flag {
util.ResponseFormat(c, code.Success, data)
} else {
@@ -78,8 +80,10 @@
// @Router /data/api-v/sdk/findAllSdk [GET]
func (sc SdkController) FindAllSdk(c *gin.Context) {
sdkName := c.Query("sdkName")
+ logger.Debug("FindAllSdk sdkName:", sdkName)
- sdks := service.GetSdkList(sdkName)
+ sdks := service.GetSdkList("") //鏈満宸插畨瑁呯殑绠楁硶
+
util.ResponseFormat(c, code.Success, sdks)
}
@@ -150,45 +154,145 @@
}
}
-func (sc SdkController) SdkDownLoad(c *gin.Context) {
- var soApi dbapi.SoApi
- var sdkConfig map[string]interface{}
+// @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) {
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 {
- regSdkSuccess, _ := soApi.Add(sdkConfig)
- regArgsSuccess, _ := soApi.Add(sdkConfig)
-
- if regSdkSuccess && regArgsSuccess {
- 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