From 263c7b18ce7f18f1222318f6e0e499e907895a52 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:33:39 +0800
Subject: [PATCH] fix
---
service/EnableStatusControlService.go | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/service/EnableStatusControlService.go b/service/EnableStatusControlService.go
index c9e1ff5..a0439b1 100644
--- a/service/EnableStatusControlService.go
+++ b/service/EnableStatusControlService.go
@@ -1,24 +1,26 @@
package service
import (
- "basic.com/dbapi.git"
- "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/logger.git"
"encoding/json"
"fmt"
"strconv"
"strings"
"time"
- "webserver/discovery"
+ "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 := `{
"query": {
"bool": {
@@ -29,7 +31,7 @@
},
{
"terms": {
- "analyServerId": ["` + sysconf.ServerId + `",""]
+ "analyServerId": ["` + localConf.ServerId + `",""]
}
}
]
@@ -85,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 := `
{
@@ -119,23 +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,
- })
- }
+ //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