From ff396526ff1762d6672414dfe5dc241bc0fa8e60 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 22 六月 2019 12:41:53 +0800
Subject: [PATCH] --
---
go.sum | 2 ++
go.mod | 2 +-
ruleserver/ruleToformula.go | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/go.mod b/go.mod
index b581db8..654f554 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@
require (
basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1
- basic.com/pubsub/protomsg.git v0.0.0-20190622023307-97ef3bf336ef
+ basic.com/pubsub/protomsg.git v0.0.0-20190622044013-0d3ee5a9c502
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
github.com/Microsoft/go-winio v0.4.12 // indirect
github.com/ajg/form v1.5.1 // indirect
diff --git a/go.sum b/go.sum
index 3fc98a6..c7e9bed 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@
basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/pubsub/protomsg.git v0.0.0-20190622023307-97ef3bf336ef h1:gUV9FEa23v+2AY4Rvrwh6omHBlV+qyae58GTU8NAv3Y=
basic.com/pubsub/protomsg.git v0.0.0-20190622023307-97ef3bf336ef/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20190622044013-0d3ee5a9c502 h1:H+//LYF4+YwVD2A9GUP0ETL8p5RANgtDHpOgu/421sE=
+basic.com/pubsub/protomsg.git v0.0.0-20190622044013-0d3ee5a9c502/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 h1:9flC2o3kasaM2Y6I+mY+mxmve/pyAY/UzGQZLT3lFHM=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index bfd6dd4..ca5f321 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -110,7 +110,7 @@
type Result struct {
TaskId string // 浠诲姟id
RuleGroupId string // 瑙勫垯缁刬d
- AlarmLevel string // 鎶ヨ绛夌骇
+ AlarmLevel int32 // 鎶ヨ绛夌骇
RuleText string // 鏂囧瓧鐗堣鍒欑粍
}
@@ -347,7 +347,7 @@
if flag {
fmt.Println("瀹氭椂鍣ㄦ姤璀︿簡")
// 杩囧畬瑙勫垯鍚庢墦涓爣绛撅紝鍛婅瘔璋冪敤鑰呮湰甯ф暟鎹拡瀵瑰摢涓换鍔″摢缁勮鍒欐姤璀︿簡
- arg.RuleResult = append(arg.RuleResult, Result{taskId, groupRule.GroupId,groupRule.AlarmLevel,groupRule.RuleText})
+ arg.RuleResult = append(arg.RuleResult, Result{taskId, groupRule.GroupId,groupRule.AlarmLevel,groupRule.GroupText})
return true
} else {
return false
--
Gitblit v1.8.0