panlei
2019-07-04 3e2c40a20764f62969f807688457d15a09a413e7
ruleserver/ruleToformula.go
@@ -4,7 +4,6 @@
   "encoding/json"
   "fmt"
   "log"
   "os"
   "ruleprocess/cache"
   "sort"
   "strconv"
@@ -292,10 +291,10 @@
   if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || strings.HasPrefix(completeFormula, ">=") || strings.HasPrefix(completeFormula, "<=") || strings.HasPrefix(completeFormula, "==") || strings.HasPrefix(completeFormula, "!=") || strings.HasPrefix(completeFormula, ">") || strings.HasPrefix(completeFormula, "<") {
      // 以这些开头的基本是联动任务
      if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || strings.HasPrefix(completeFormula, ">=") || strings.HasPrefix(completeFormula, "<=") || strings.HasPrefix(completeFormula, "==") || strings.HasPrefix(completeFormula, "!=") {
         completeFormula = completeFormula[2 : len(completeFormula)-1]
         completeFormula = completeFormula[2 :]
      }
      if strings.HasPrefix(completeFormula, ">") || strings.HasPrefix(completeFormula, "<") {
         completeFormula = completeFormula[1 : len(completeFormula)-1]
         completeFormula = completeFormula[1 :]
      }
      log.Println("-------------------看看拔毛后的表达式:",completeFormula)
      expression, _ := govaluate.NewEvaluableExpression(completeFormula)
@@ -572,7 +571,7 @@
               if args.RuleResult["face"] != nil {
                  log.Println("-------------------face结果标签", args.RuleResult["face"].([]Arg))
               }
               os.Exit(0)
               //os.Exit(0)
            }
         }
      } else {