From aa91d7884e7fef55b47d6a4905596f72a5ef1ac3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期六, 30 五月 2020 17:43:03 +0800
Subject: [PATCH] fix sdkType unTar
---
controllers/syssetcont.go | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/controllers/syssetcont.go b/controllers/syssetcont.go
index 12f0593..396b781 100644
--- a/controllers/syssetcont.go
+++ b/controllers/syssetcont.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "basic.com/valib/logger.git"
"net/http"
"regexp"
"strconv"
@@ -176,6 +177,8 @@
} else {
resData["server_id"] = sysconf.GetServerId()
resData["server_name"] = sysconf.GetServerName()
+ resData["server_port"] = sys.GetNginxListenPort()
+
ipv4, mask, _ := sys.GetLocalIP(config.Server.NetworkAdapter)
gateway, _ := sys.GetDefaultRoute(config.Server.NetworkAdapter)
dns, _ := sys.GetDnsServer()
@@ -216,19 +219,17 @@
// @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}"
// @Router /data/api-v/sysset/saveDevInfo [POST]
func (sset SysSetController) SaveDevInfo(c *gin.Context) {
- dev_name := c.PostForm("server_name")
var api dbapi.SysSetApi
- paramBody := make(map[string]interface{}, 0)
- paramBody["serverName"] = dev_name
-
- // 璁剧疆ip
- isOk, msg := sys.SetNetworkConfig(c.PostForm("ip"), c.PostForm("subMask"), c.PostForm("gateway"), c.PostForm("dns"))
- if !isOk {
- util.ResponseFormat(c, code.ComError, msg)
- return
+ paramBody := map[string]interface{}{
+ "serverName": c.PostForm("server_name"),
+ "ip": c.PostForm("ip"),
+ "subMask": c.PostForm("subMask"),
+ "gateway": c.PostForm("gateway"),
+ "dns": c.PostForm("dns"),
}
b, data := api.SaveServerInfo(paramBody)
+ logger.Debug("isOk b:",b, "data:", data)
if b { // 鏌ヨ鏄惁瀛樺湪
util.ResponseFormat(c, code.Success, data)
} else { // 瀛樺湪鍙婁慨鏀� 涓嶅瓨鍦� 鍗虫坊鍔�
@@ -633,4 +634,30 @@
} else {
util.ResponseFormat(c,code.UpgradeFail,err.Error())
}
-}
\ No newline at end of file
+}
+
+// @Security ApiKeyAuth
+// @Summary 绠楁硶瀹夎鍖呭紑濮嬪畨瑁�
+// @Description 绠楁硶瀹夎鍖呭紑濮嬪畨瑁�
+// @Accept multipart/form-data
+// @Produce json
+// @Tags sysset
+// @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/sysset/sdkInstall [post]
+func (sset SysSetController) SdkInstall(c *gin.Context) {
+ identifier := c.Request.FormValue("identifier")
+ filename := c.Request.FormValue("filename")
+ if identifier == "" || filename == "" {
+ util.ResponseFormat(c,code.RequestParamError,"")
+ return
+ }
+ var sv service.SysService
+ if b,err := sv.SdkInstall(identifier, filename);b {
+ util.ResponseFormat(c,code.UpgradeSuccess,"绠楁硶瀹夎鎴愬姛")
+ } else {
+ util.ResponseFormat(c,code.UpgradeFail,err.Error())
+ }
+}
--
Gitblit v1.8.0