From cd2a59c4cfc968e0629a88d82b962a6177b2ea4f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 01 七月 2019 17:49:18 +0800
Subject: [PATCH] 加点异常处理

---
 ruleserver/ruleToformula.go |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 320cbf9..ca648a2 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -215,7 +215,6 @@
 							linkTask(args, ruleList[i], taskId)
 						} else {
 							// 鐙珛浠诲姟鐨勫鐞�
-							log.Println("----------------------------------------64鎽勫儚鏈哄叆鍏�")
 							RunRule(args, ruleList[i], taskId)
 						}
 					}
@@ -225,6 +224,12 @@
 	}
 }
 func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string) bool {
+	defer func() {
+		if err := recover(); err != nil {
+			fmt.Println("姣斿瑙勫垯鏈夎", err.(string))
+		}
+
+	}()
 	resultSplice := []*LittleRuleResult{}
 	// 鍏堣繃瀹屾潯浠惰鍒�
 	for j := 0; j < len(groupRule.Rules); j++ {
@@ -290,7 +295,10 @@
 	if completeFormula != "" {
 		log.Println("鐪嬬湅鍏紡-----------锛�", completeFormula)
 		expression, _ := govaluate.NewEvaluableExpression(completeFormula)
-		result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+		result, err := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+		if err != nil {
+			panic("寰楀埌鐨勬暟瀛﹀叕寮忎笉鍙В鏋�")
+		}
 		if result.(bool) {
 			// 缁欒繖甯ф暟鎹墦涓婅鍒欑粍鏍囩
 			//args.RuleResult = append(args.RuleResult, Result{TaskId: taskId, RuleGroupId: groupRule.GroupId})

--
Gitblit v1.8.0