From 4749d09f155ccffeff8e473aa1a9d021be7dfcba Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 05 七月 2019 18:22:08 +0800
Subject: [PATCH] 更新protomsg包

---
 ruleserver/ruleToformula.go |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index f12918a..efda1eb 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -348,7 +348,7 @@
 				}
 			}
 			if flag {
-				logger.Info("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
+				logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
 				// 濡傛灉鎴愬姛浜嗘垜搴旇鎵惧埌瑙勫垯涓秹鍙婂埌鐨剆dk锛岃褰曚笅浠栦滑鐨剆dkname
 				sdkName := ""
 				for j := 0; j < len(groupRule.Rules); j++ {
@@ -595,7 +595,7 @@
 
 		if rule.SdkId == am.sdkId && rule.PolygonId == am.areaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
 
-			if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a971" {
+			if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a971" && rule.SdkArgAlias != "time_rule"{
 				// 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ锛屼絾瑕佽�冭檻濡備綍瀵规瘡涓�寮犻兘鎶ヨ鍛�
 				argValue, err := strconv.ParseFloat(rule.SdkArgValue, 64)
 				if err != nil {
@@ -606,7 +606,7 @@
 				for _, obj := range am.filterData {
 					for index := 0; index < len(obj.Liker); {
 						// 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
-						if float64(obj.Liker[index].CompareScore) < argValue {
+						if float64(obj.Liker[index].CompareScore * 100) < argValue {
 							// Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
 							obj.Liker = append(obj.Liker[:index], obj.Liker[index+1:]...)
 						} else {

--
Gitblit v1.8.0