From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:33:39 +0800
Subject: [PATCH] fix
---
controllers/cluster.go | 132 ++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 47 deletions(-)
diff --git a/controllers/cluster.go b/controllers/cluster.go
index 3344bb9..5a780a9 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,15 +54,22 @@
NodeIps []string `json:"nodeIps"`
}
-// @Summary 鍒涘缓闆嗙兢
-// @Description 鍒涘缓闆嗙兢
-// @Accept json
-// @Produce json
-// @Tags cluster
-// @Param clusterArg body controllers.ClusterCreateVo 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/create [post]
+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"`
+}
+
+
func (cc ClusterController) Create(c *gin.Context) {
var clusterVo ClusterCreateVo
err := c.BindJSON(&clusterVo)
@@ -70,7 +78,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,27 +86,32 @@
}
}
-// @Summary 鐢熸垚闆嗙兢6浣嶉殢鏈哄瘑鐮�
-// @Description 鐢熸垚闆嗙兢6浣嶉殢鏈哄瘑鐮�
-// @Produce json
-// @Tags cluster
-// @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/randomPwd [get]
+
func (cc ClusterController) RandomPwd(c *gin.Context) {
pwd := fmt.Sprintf("%06v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(1000000))
util.ResponseFormat(c,code.Success,pwd)
}
-// @Summary 鎼滅储闆嗙兢
-// @Description 鎼滅储闆嗙兢
-// @Accept json
+/*
+// @Security ApiKeyAuth
+// @Summary 鏌ヨ鏈湴闆嗙兢
+// @Description 鏌ヨ鏈湴闆嗙兢
// @Produce json
// @Tags cluster
-// @Param searchArg body controllers.ClusterSearchVo 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/search [post]
+// @Router /data/api-v/cluster/findCluster [get]
+*/
+func (cc ClusterController) FindCluster(c *gin.Context) {
+ var clusterApi dbapi.ClusterApi
+ b, d := clusterApi.FindCluster()
+ if b {
+ util.ResponseFormat(c,code.Success, d)
+ } else {
+ util.ResponseFormat(c,code.ComError,"闆嗙兢鏌ヨ澶辫触")
+ }
+}
+
func (cc ClusterController) Search(c *gin.Context) {
var csv ClusterSearchVo
err := c.BindJSON(&csv)
@@ -115,14 +128,7 @@
}
}
-// @Summary 閫氳繃searchNum寮傛鑾峰彇闆嗙兢鑺傜偣淇℃伅
-// @Description 閫氳繃searchNum寮傛鑾峰彇闆嗙兢鑺傜偣淇℃伅
-// @Accept json
-// @Produce json
-// @Tags cluster
-// @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/getNodesByNum [get]
+
func (cc ClusterController) GetSearchNodes(c *gin.Context) {
var api dbapi.ClusterApi
b, d := api.GetSearchNodes()
@@ -133,14 +139,7 @@
}
}
-// @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 == "" {
@@ -157,15 +156,6 @@
}
-// @Summary 鍔犲叆闆嗙兢
-// @Description 鍔犲叆闆嗙兢
-// @Accept json
-// @Produce json
-// @Tags cluster
-// @Param clusterArg body controllers.ClusterCreateVo 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]
func (cc ClusterController) JoinCluster(c *gin.Context) {
var arg ClusterJoinVo
err := c.BindJSON(&arg)
@@ -182,3 +172,51 @@
util.ResponseFormat(c,code.ComError,"鍔犲叆澶辫触")
}
}
+
+/*
+// @Security ApiKeyAuth
+// @Summary 淇濆瓨闆嗙兢鍚嶇О
+// @Description 淇濆瓨闆嗙兢鍚嶇О
+// @Accept x-www-form-urlencoded
+// @Produce json
+// @Tags cluster
+// @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]
+*/
+func (cc ClusterController) UpdateClusterName(c *gin.Context) {
+ clusterName := c.PostForm("clusterName")
+ if clusterName == "" {
+ util.ResponseFormat(c,code.RequestParamError, "鍙傛暟鏈夎")
+ return
+ }
+ virtualIp := c.PostForm("virtualIp")
+ var api dbapi.ClusterApi
+ b,_ := api.UpdateClusterName(clusterName,virtualIp)
+ if b {
+ util.ResponseFormat(c,code.UpdateSuccess,"鏇存柊鎴愬姛")
+ } else {
+ util.ResponseFormat(c,code.ComError, "鏇存柊澶辫触")
+ }
+}
+
+/*
+// @Security ApiKeyAuth
+// @Summary 閫�鍑洪泦缇�
+// @Description 閫�鍑洪泦缇�
+// @Produce json
+// @Tags cluster
+// @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/leave [post]
+*/
+func (cc ClusterController) Leave(c *gin.Context) {
+ var api dbapi.ClusterApi
+ if b,_:= api.Leave();b {
+ util.ResponseFormat(c,code.Success,"閫�鍑烘垚鍔�")
+ } else {
+ util.ResponseFormat(c,code.ComError,"閫�鍑哄け璐�")
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0