From 351d03c5ea2ade96c2a796bb6fa3382699c422ee Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 30 十一月 2019 13:49:02 +0800
Subject: [PATCH] ---

---
 algorithm/intrusion/intrusion.go |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/algorithm/intrusion/intrusion.go b/algorithm/intrusion/intrusion.go
index 9a50098..1ac2143 100644
--- a/algorithm/intrusion/intrusion.go
+++ b/algorithm/intrusion/intrusion.go
@@ -2,7 +2,7 @@
 
 import (
 	"basic.com/pubsub/protomsg.git"
-	"basic.com/valib/logger.git"
+	logger "github.com/alecthomas/log4go"
 	"github.com/knetic/govaluate"
 	"ruleprocess/structure"
 	"strconv"
@@ -33,15 +33,16 @@
 		//logger.Debug("鐪嬬湅args锛氾細锛氾細锛�", args)
 		for _, arg := range args {
 			var formula string
-			if rule.SdkArgAlias == "score" {
-				formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
-				logger.Info("褰撳墠鐩镐技搴﹀皬鍏紡锛�", formula)
-			} else if rule.SdkArgAlias == "proportion" {
-				formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
-				logger.Info("褰撳墠鍗犳瘮灏忓叕寮忥細", formula)
-			} else {
-				formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
-				logger.Info("褰撳墠灏哄灏忓叕寮忥細", formula)
+			switch rule.SdkArgAlias {
+				case "score":
+					formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
+					logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
+				case "proportion":
+					formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
+					logger.Info("鍗犳瘮鍏紡锛�", formula)
+				case "size":
+					formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
+					logger.Info("灏哄灏忓叕寮忥細", formula)
 			}
 			expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
 			result, _ := expression.Evaluate(nil)                      // 寰楀埌鏁板鍏紡鐨勭粨鏋�

--
Gitblit v1.8.0