From cfeba2dea02c1de54cde6c95f2a3f46c121d34aa Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 16 八月 2019 15:16:14 +0800
Subject: [PATCH] dev add publicDomain
---
controllers/dbtablesCon.go | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/controllers/dbtablesCon.go b/controllers/dbtablesCon.go
index 831437f..82daabe 100644
--- a/controllers/dbtablesCon.go
+++ b/controllers/dbtablesCon.go
@@ -7,6 +7,7 @@
"github.com/gin-gonic/gin"
"github.com/satori/go.uuid"
"log"
+ "time"
"webserver/extend/code"
"webserver/extend/config"
"webserver/extend/esutil"
@@ -97,8 +98,30 @@
data := esutil.GetEsDataReq(url, params, false)
//c.JSON(200, changeEsRespData(data, "淇敼鎴愬姛"))
result := changeEsRespData(data, "淇敼鎴愬姛")
+ if dbtable.Enable == 0 {
+ res := UpdateDbPersonsOfDbTable(dbtable.Id)
+ //fmt.Println("鍚屾淇敼浜哄憳鐘舵�佹垚鍔�----",res)
+ logger.Debug("鍚屾淇敼浜哄憳鐘舵�佹垚鍔�----", res)
+ }
if result["success"].(bool) {
//code.Success.Message = "淇敼搴曞簱鎴愬姛"
+ //if dbtable.Enable ==1 {
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTable,
+ // PersonId: "",
+ // TableId: []string{ dbtable.Id },
+ // Feature: "",
+ // Action: protomsg.DbAction_Insert,
+ // })
+ //} else {
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTable,
+ // PersonId: "",
+ // TableId: []string{ dbtable.Id },
+ // Feature: "",
+ // Action: protomsg.DbAction_Delete,
+ // })
+ //}
util.ResponseFormat(c, code.Success, result["data"])
} else {
//code.ServiceInsideError.Message += result["msg"].(string)
@@ -159,6 +182,26 @@
url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/" + config.EsInfo.EsIndex.DbTables.IndexType + "/" + tableId + "?refresh=wait_for"
dbtable.PriInsert() // 娣诲姞鏃堕棿鍜屽垱寤轰汉
+
+ 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
+ }
dbTableByte, err := json.Marshal(dbtable)
if err != nil {
log.Fatalf("Json marshaling failed锛�%s", err)
--
Gitblit v1.8.0