From cc962c1b6ffabd9d41e6db0571efbcc1a4568ce7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 29 七月 2019 11:39:56 +0800
Subject: [PATCH] use mangos req instead of deliver,add recv timeout
---
controllers/dbtablesCon.go | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index 2eb472c..f47c7d8 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -1,14 +1,15 @@
package controllers
import (
+ "basic.com/dbapi.git"
"encoding/json"
- "fmt"
"github.com/gin-gonic/gin"
"github.com/satori/go.uuid"
"log"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
+ "webserver/extend/logger"
"webserver/extend/util"
"webserver/models"
)
@@ -29,16 +30,21 @@
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/_search"
isSync := c.Params.ByName("isSync")
- syncTerm := ""
+ var setApi dbapi.SysSetApi
+ _, sysconf := setApi.GetServerInfo()
+ analyServerFilterStr := ""
if isSync == "1" {
- syncTerm = ",{\"term\":{\"isSync\":\"1\"}}" // 鍚屾搴�
+ analyServerFilterStr = "{\"term\":{\"analyServerId\":\"\"}}" // / 鍚屾搴�
} else if isSync == "2" {
- syncTerm = ",{\"term\":{\"isSync\":\"2\"}}" // / 鏈湴搴�
+ analyServerFilterStr = "{\"term\":{\"analyServerId\":\"" + sysconf.ServerId + "\"}}" // 鏈湴搴�
+ }
+ if analyServerFilterStr !="" {
+ analyServerFilterStr = ","+ analyServerFilterStr
}
params := "{\"query\":{\"bool\":{\"must\":[" +
- "{\"term\":{\"isDelete\":\"0\"}}" + syncTerm + "]}}," +
- "\"from\":0,\"size\":100,\"sort\":{\"id\":{\"order\":\"asc\"}}}"
- fmt.Print("璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
+ "{\"term\":{\"isDelete\":\"0\"}}" + analyServerFilterStr + "]}}," +
+ "\"from\":0,\"size\":1000,\"sort\":{\"id\":{\"order\":\"asc\"}}}"
+ logger.Debug("璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
data := esutil.GetEsDataReq(url, params, true)
//c.JSON(200, data)
@@ -49,7 +55,7 @@
func QueryDbTableInfo(tableId string) map[string]interface{} {
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + tableId
- fmt.Print("璇锋眰url:%s;", url)
+ logger.Debug("璇锋眰url:%s;", url)
data := esutil.GetEsDataInfo(url, true)
return data
}
@@ -69,18 +75,18 @@
uuid := c.Params.ByName("id")
if uuid == "" {
uuid = dbtable.Id
- fmt.Println("body涓幏鍙栧簳搴搃d")
+ logger.Debug("body涓幏鍙栧簳搴搃d")
}
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
- "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + uuid + "/_update"
+ "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + uuid + "/_update?refresh=wait_for"
dbtable.PriUpdate()
dbTableByte, err := json.Marshal(dbtable)
if err != nil {
log.Fatalf("Json marshaling failed锛�%s", err)
}
- fmt.Printf("%s\n", dbTableByte)
+ logger.Debug("%s\n", dbTableByte)
params := "{\"doc\":" + string(dbTableByte) + "}"
- fmt.Print("璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
+ logger.Debug("璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
data := esutil.GetEsDataReq(url, params, false)
//c.JSON(200, changeEsRespData(data, "淇敼鎴愬姛"))
result := changeEsRespData(data, "淇敼鎴愬姛")
@@ -107,16 +113,24 @@
c.BindJSON(&dbtable)
tableId := uuid.NewV4().String()
dbtable.Id = tableId
+ if dbtable.AnalyServerId == "sync" {
+ dbtable.AnalyServerId = ""
+ }
+ if dbtable.AnalyServerId == "local" {
+ var setApi dbapi.SysSetApi
+ _, sysconf := setApi.GetServerInfo()
+ dbtable.AnalyServerId = sysconf.ServerId
+ }
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
- "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + tableId
+ "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + tableId + "?refresh=wait_for"
dbtable.PriInsert() // 娣诲姞鏃堕棿鍜屽垱寤轰汉
dbTableByte, err := json.Marshal(dbtable)
if err != nil {
log.Fatalf("Json marshaling failed锛�%s", err)
}
- //fmt.Printf("%s\n", dbTableByte)
+ //logger.Debugf("%s\n", dbTableByte)
params := string(dbTableByte)
- fmt.Print("璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
+ logger.Debug("璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
data, _ := esutil.PutEsDataReq(url, params)
//c.JSON(200, changeEsRespData(data, "娣诲姞鎴愬姛"))
result := changeEsRespData(data, "娣诲姞鎴愬姛")
@@ -137,13 +151,13 @@
// @Param uuid path 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/dbtable/deleteDBtablesById/{uuid} [POST]
+// @Router /data/api-v/dbtable/deleteDBtablesById/{id} [POST]
func (dbt DbTableController) DeleteDbTables(c *gin.Context) {
uuid := c.Params.ByName("id")
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
- "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + uuid + "/_update"
+ "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + uuid + "/_update?refresh=wait_for"
params := "{\"doc\":{\"isDelete\":\"1\"}}"
- fmt.Print("鍒犻櫎璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
+ logger.Debug("鍒犻櫎璇锋眰url:%s;\n 璇锋眰鍙傛暟params:%s", url, params)
data := esutil.GetEsDataReq(url, params, false)
//c.JSON(200, changeEsRespData(data, "鍒犻櫎鎴愬姛"))
result := changeEsRespData(data, "鍒犻櫎鎴愬姛")
--
Gitblit v1.8.0