From d9e01c51a525adf4f2393a95f87604e3b6e79ad2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 19 十一月 2019 15:57:19 +0800
Subject: [PATCH] fix all
---
service/EnableStatusControlService.go | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/service/EnableStatusControlService.go b/service/EnableStatusControlService.go
index a7dae12..a0439b1 100644
--- a/service/EnableStatusControlService.go
+++ b/service/EnableStatusControlService.go
@@ -1,23 +1,27 @@
package service
import (
- "basic.com/dbapi.git"
+ "basic.com/valib/logger.git"
"encoding/json"
"fmt"
"strconv"
"strings"
"time"
+ "webserver/cache"
"webserver/extend/config"
"webserver/extend/esutil"
- "webserver/extend/logger"
)
func GetVerificationData() []map[string]interface{} {
- url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
+ 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 + "/_search"
- var setApi dbapi.SysSetApi
- _, sysconf := setApi.GetServerInfo()
- jsonDsl := `{
+
+ jsonDSL := `{
"query": {
"bool": {
"filter": [{
@@ -27,7 +31,7 @@
},
{
"terms": {
- "analyServerId": ["` + sysconf.ServerId + `",""]
+ "analyServerId": ["` + localConf.ServerId + `",""]
}
}
]
@@ -36,7 +40,7 @@
"size": 10000
}
`
- buf, err := esutil.EsReq("POST", url, []byte(jsonDsl))
+ buf, err := esutil.EsReq("POST", url, []byte(jsonDSL))
if err != nil {
logger.Debug(err)
}
@@ -83,7 +87,12 @@
status = 1
}
enable := strconv.Itoa(status)
- url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport +
+ localConf, err2 := cache.GetServerInfo()
+ if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
+ logger.Debug("localConfig is wrong!!!")
+ return "localConf wrong"
+ }
+ url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
"/" + config.EsInfo.EsIndex.DbTables.IndexName + "/_update_by_query?refresh"
jsonDsl := `
{
@@ -117,6 +126,23 @@
}
if middle > 0 {
logger.Debug("淇敼鎴愬姛")
+ //if flag {//鐢熸晥鐨�
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTable,
+ // PersonId: "",
+ // TableId: id,
+ // Feature: "",
+ // Action: protomsg.DbAction_Insert,
+ // })
+ //} else {//澶辨晥鐨�
+ // discovery.AddDbMessage(&protomsg.EsPersonCacheChange{
+ // Type: protomsg.EsCacheChanged_T_DbTable,
+ // PersonId: "",
+ // TableId: id,
+ // Feature: "",
+ // Action: protomsg.DbAction_Insert,
+ // })
+ //}
message = "淇敼鎴愬姛"
}
return message
--
Gitblit v1.8.0