From 847da9b0c6f0719cf2b4acb17dbff122feb6c508 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 04 十二月 2019 18:05:51 +0800
Subject: [PATCH] fix
---
controllers/cluster.go | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/controllers/cluster.go b/controllers/cluster.go
index 7ac903d..3536041 100644
--- a/controllers/cluster.go
+++ b/controllers/cluster.go
@@ -40,6 +40,7 @@
Password string `json:"password"`
ClusterName string `json:"clusterName"`
ClusterId string `json:"clusterId"`
+ VirtualIp string `json:"virtualIp"`
}
type ClusterSearchVo struct {
@@ -53,6 +54,22 @@
NodeIps []string `json:"nodeIps"`
}
+type ClusterDb struct {
+ ClusterId string `json:"clusterId"`
+ ClusterName string `json:"clusterName"`
+ Nodes []NodeDb `json:"nodes"`
+}
+type NodeDb struct {
+ Id string `json:"id"`
+ ClusterId string `json:"cluster_id"`
+ NodeName string `json:"node_name"`
+ NodeId string `json:"node_id"`
+ NodeIp string `json:"node_ip"`
+ CreateTime string `json:"create_time"`
+ IsDelete bool `json:"isDelete"`
+}
+
+// @Security ApiKeyAuth
// @Summary 鍒涘缓闆嗙兢
// @Description 鍒涘缓闆嗙兢
// @Accept json
@@ -70,7 +87,7 @@
return
}
var api dbapi.ClusterApi
- b, d := api.Create(clusterVo.ClusterName, clusterVo.Password)
+ b, d := api.Create(clusterVo.ClusterName, clusterVo.Password, clusterVo.VirtualIp)
if b {
util.ResponseFormat(c,code.Success, d)
} else {
@@ -78,6 +95,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鐢熸垚闆嗙兢6浣嶉殢鏈哄瘑鐮�
// @Description 鐢熸垚闆嗙兢6浣嶉殢鏈哄瘑鐮�
// @Produce json
@@ -90,6 +108,7 @@
util.ResponseFormat(c,code.Success,pwd)
}
+// @Security ApiKeyAuth
// @Summary 鏌ヨ鏈湴闆嗙兢
// @Description 鏌ヨ鏈湴闆嗙兢
// @Produce json
@@ -107,6 +126,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鎼滅储闆嗙兢
// @Description 鎼滅储闆嗙兢
// @Accept json
@@ -132,6 +152,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 閫氳繃searchNum寮傛鑾峰彇闆嗙兢鑺傜偣淇℃伅
// @Description 閫氳繃searchNum寮傛鑾峰彇闆嗙兢鑺傜偣淇℃伅
// @Accept json
@@ -150,22 +171,17 @@
}
}
+// @Security ApiKeyAuth
// @Summary 閫氳繃searchNum鍋滄鎼滅储
// @Description 閫氳繃searchNum鍋滄鎼滅储
// @Produce json
// @Tags cluster
-// @Param searchNum query string true "鎼滅储缂栧彿"
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
// @Router /data/api-v/cluster/stopSearching [post]
func (cc ClusterController) StopSearching(c *gin.Context) {
- searchNum := c.Query("searchNum")
- if searchNum == "" {
- util.ResponseFormat(c,code.RequestParamError, "鍙傛暟鏈夎")
- return
- }
var api dbapi.ClusterApi
- b, d := api.StopSearching(searchNum)
+ b, d := api.StopSearching("")
if b {
util.ResponseFormat(c,code.Success, d)
} else {
@@ -173,13 +189,13 @@
}
}
-
+// @Security ApiKeyAuth
// @Summary 鍔犲叆闆嗙兢
// @Description 鍔犲叆闆嗙兢
// @Accept json
// @Produce json
// @Tags cluster
-// @Param clusterArg body controllers.ClusterCreateVo true "闆嗙兢鍒涘缓鍙傛暟"
+// @Param clusterArg body controllers.ClusterJoinVo true "闆嗙兢鍒涘缓鍙傛暟"
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
// @Router /data/api-v/cluster/joinCluster [post]
@@ -200,11 +216,14 @@
}
}
+// @Security ApiKeyAuth
// @Summary 淇濆瓨闆嗙兢鍚嶇О
// @Description 淇濆瓨闆嗙兢鍚嶇О
+// @Accept x-www-form-urlencoded
// @Produce json
// @Tags cluster
-// @Param clusterName query string true "闆嗙兢鍚嶇О"
+// @Param clusterName formData string true "闆嗙兢鍚嶇О"
+// @Param virtualIp formData string false "铏氭嫙ip"
// @Success 200 {string} json "{"code":200, success:true, msg:"", data:""}"
// @Failure 500 {string} json "{"code":500, success:false, msg:"",data:""}"
// @Router /data/api-v/cluster/updateClusterName [post]
@@ -214,8 +233,9 @@
util.ResponseFormat(c,code.RequestParamError, "鍙傛暟鏈夎")
return
}
+ virtualIp := c.PostForm("virtualIp")
var api dbapi.ClusterApi
- b,_ := api.UpdateClusterName(clusterName)
+ b,_ := api.UpdateClusterName(clusterName,virtualIp)
if b {
util.ResponseFormat(c,code.UpdateSuccess,"鏇存柊鎴愬姛")
} else {
@@ -223,6 +243,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 閫�鍑洪泦缇�
// @Description 閫�鍑洪泦缇�
// @Produce json
--
Gitblit v1.8.0