From 224fd8bd81a690e31ba196da58154866d67c171f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 17:22:41 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 14 +++++++-------
ruleserver/ruleToformula.go | 4 ----
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index e0b081d..9a9bec8 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -23,11 +23,11 @@
type conf struct {
PhotoUrl string `yaml:"photoUrl"`
- Videopersons string `yaml:"videoPersons"`
- Personaction string `yaml:"personAction"`
- Serverip string `yaml:"serverIp"`
- Serverport string `yaml:"serverPort"`
- Dbtablepersons string `yaml:"dbTablePersons"`
+ VideoPersons string `yaml:"videoPersons"`
+ PersonAction string `yaml:"personAction"`
+ ServerIp string `yaml:"serverIp"`
+ ServerPort string `yaml:"serverPort"`
+ DbTablePersons string `yaml:"dbTablePersons"`
}
func init() {
@@ -40,8 +40,8 @@
//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
yaml.Unmarshal(data, &c)
weedfsUrl = c.PhotoUrl
- videoPersonUrl = c.Videopersons
- personAction = c.Personaction
+ videoPersonUrl = c.VideoPersons
+ personAction = c.PersonAction
}
// 浜鸿劯鐨勬暟鎹粨鏋�
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index bf944ed..7898230 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -451,10 +451,6 @@
if rule.PolygonId == am.areaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" && rule.SdkArgAlias != "compareBase" {
- if err != nil {
- logger.Error("瑙勫垯閰嶇疆鐨勯槇鍊奸潪娉�")
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
- }
flag := "false"
// 鎶婃病鏈夌浉浼艰�呯殑浜鸿劯浠巉ilterData涓垹闄�
for index := 0; index < len(am.filterData); {
--
Gitblit v1.8.0