From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 六月 2020 18:29:41 +0800
Subject: [PATCH] add refresh token to resp
---
controllers/dbtablesCon.go | 83 ++++-------------------------------------
1 files changed, 9 insertions(+), 74 deletions(-)
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index 7b588a9..6be81ba 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -2,17 +2,11 @@
import (
"basic.com/dbapi.git"
- "encoding/json"
- "fmt"
+ "basic.com/valib/logger.git"
"github.com/gin-gonic/gin"
"github.com/satori/go.uuid"
- "strconv"
"time"
- "webserver/cache"
"webserver/extend/code"
- "webserver/extend/config"
- "webserver/extend/esutil"
- "basic.com/valib/logger.git"
"webserver/extend/util"
"webserver/models"
)
@@ -20,6 +14,7 @@
type DbTableController struct {
}
+// @Security ApiKeyAuth
// @Summary 鏄剧ず搴曞簱鍒楄〃
// @Description 鏄剧ず鍚屾鎴栨湰鍦板簱鍒楄〃
// @Accept x-www-form-urlencoded
@@ -40,6 +35,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鏌ヨ鏈満鎵�鏈夊簳搴撳垪琛�
// @Description 鏌ヨ鏈満鎵�鏈夊簳搴撳垪琛�
// @Accept x-www-form-urlencoded
@@ -63,20 +59,7 @@
}
}
-// 渚濇嵁搴曞簱id 鏌ヨ鏁版嵁
-func QueryDbTableInfo(tableId string) map[string]interface{} {
- localConf, err2 := cache.GetServerInfo()
- if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
- logger.Debug("localConfig is wrong!!!")
- return nil
- }
- url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
- "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + tableId
- logger.Debug("璇锋眰url:%s;", url)
- data := esutil.GetEsDataInfo(url, true)
- return data
-}
-
+// @Security ApiKeyAuth
// @Summary 淇敼搴曞簱
// @Description 淇敼鍚屾鎴栨湰鍦板簱
// @Accept json
@@ -89,29 +72,11 @@
func (dbt DbTableController) UpdateDbTables(c *gin.Context) {
dbtable := new(models.Dbtables)
err := c.BindJSON(&dbtable)
- if err !=nil || dbtable.Id == "" || dbtable.TableName == "" {
+ if err !=nil || dbtable.Id == "" || dbtable.TableName == "" || (dbtable.Enable !=0 && dbtable.Enable !=1) {
util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎")
return
}
- currentTime := time.Now()
- startTime := dbtable.StartTime
- endTime := ""
- if dbtable.EndTime != "" {
- endTime = dbtable.EndTime
- }
- st, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local)
- if endTime != "" {
- et, _ := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local)
- if et.After(currentTime) && st.Before(currentTime) {
- dbtable.Enable = 1
- } else {
- dbtable.Enable = 0
- }
- } else if st.Before(currentTime) && endTime == "" {
- dbtable.Enable = 1
- } else {
- dbtable.Enable = 0
- }
+
paramBody := util.Struct2Map(dbtable)
var tApi dbapi.DbTableApi
b, data := tApi.UpdateDbTables(paramBody)
@@ -143,6 +108,7 @@
Enable int `json:"enable"`
}
+// @Security ApiKeyAuth
// @Summary 淇敼搴曞簱鐘舵��
// @Description 淇敼鍚屾鎴栨湰鍦板簱搴曞簱鐘舵��
// @Accept json
@@ -197,39 +163,7 @@
}
}
-func UpdateEndTime(id string) (flag bool) {
- flag = false
- localConf, err2 := cache.GetServerInfo()
- if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
- logger.Debug("localConfig is wrong!!!")
- return false
- }
- url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
- "/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + id + "/_update?refresh=wait_for"
- prama := "{\"script\":\"ctx._source.remove(\\\"endTime\\\")\"}"
- buf, err := esutil.EsReq("POST", url, []byte(prama))
- if err != nil {
- fmt.Println("http request info is err!")
- return
- }
- var info interface{}
- json.Unmarshal(buf, &info)
- out, ok := info.(map[string]interface{})
- if !ok {
- fmt.Println("http response interface can not change map[string]interface{}")
- return
- }
- middle, ok := out["result"].(string)
- if !ok {
- fmt.Println("first result change error!")
- return
- }
- if middle == "updated" {
- flag = true
- }
- return flag
-}
-
+// @Security ApiKeyAuth
// @Summary 娣诲姞搴曞簱
// @Description 娣诲姞鍚屾鎴栨湰鍦板簱
// @Accept json
@@ -296,6 +230,7 @@
}
}
+// @Security ApiKeyAuth
// @Summary 鍒犻櫎搴曞簱
// @Description 鍒犻櫎鍚屾鎴栨湰鍦板簱
// @Accept x-www-form-urlencoded
--
Gitblit v1.8.0