fengweiqiang 5 жил өмнө
parent
commit
973682e641

+ 1 - 0
src/jy/pretreated/colonkv.go

@@ -21,6 +21,7 @@ var (
 	regKV          = regexp.MustCompile("([\\p{Han}][^,,。、.;;\r\n]{1,30}?)[::](.*)")
 	filterK        = regexp.MustCompile("[((\\[【].*?[))\\]】]|<[^>].+?>|[①②③¥·;;‘“'’”,*<>((\\[【、))/\\]】??,。.\".\\s\u3000\u2003\u00a0]+|^[一二三四五六七八九十0-91234567890]+")
 	filterValue    = regexp.MustCompile("(^(无)$|^[\r\n\\s\u3000\u2003\u00a0]+$|^<.*>)")
+	filterWinner   = regexp.MustCompile(".{2,40}(集团|公司|学校|中心|家具城|门诊|[大中小]学|部|院|局|厂|店|所|队|社|室|厅|会|场|行)")
 	regReplKey     = regexp.MustCompile("^(包(.+[A-Za-z\\d])?|本项目|推荐|的|本次)|([约为元万亿]+|[大小]写|人民币|[全]称|姓名)$")
 	buyerAndAgency = regexp.MustCompile("(代理(机构|人)|采购(人|单位))")
 	BlockTagMap    = map[string]bool{

+ 2 - 1
src/jy/util/ossclient.go

@@ -12,7 +12,8 @@ import (
 
 var (
 	ossEndpoint        = "oss-cn-beijing-internal.aliyuncs.com" //http://oss-cn-beijing.aliyuncs.com"
-	ossEndpointTest    = "topjy.oss-cn-beijing.aliyuncs.com"
+	//ossEndpointTest    = "topjy.oss-cn-beijing.aliyuncs.com"
+	ossEndpointTest    = "oss-cn-beijing.aliyuncs.com"
 	ossAccessKeyId     = "LTAI4FvLSWN3Wz9F6dUxQGMR"
 	ossAccessKeySecret = "WnQpnNVEiRfZsz5hIqFSr0phayMo3U"
 	ossBucketName      = "topjy"

+ 1 - 1
src/main_blocktest.go

@@ -119,7 +119,7 @@ func com(doc map[string]interface{}) {
 		Result:    map[string][]*ju.ExtField{},
 		BuyerAddr: qu.ObjToString(doc["buyeraddr"]),
 		RuleBlock: e.RuleBlock,
-		Dataging: qu.IntAll(doc["dataging"]),
+		Dataging:  qu.IntAll(doc["dataging"]),
 	}
 	e.TaskInfo.ProcessPool <- true
 	pretreated.AnalyStart(j, false, "")

+ 2 - 2
src/res/fieldscore.json

@@ -778,7 +778,7 @@
         "type": "float",
         "describe": "min>val:1,min<=val<=max:3,max<val:1",
         "min": 100,
-        "max": 100000000000,
+        "max": 1000000000000,
         "score": [
             -3,
             2,
@@ -789,7 +789,7 @@
         "type": "float",
         "describe": "min>val:1,min<=val<=max:3,max<val:1",
         "min": 1000,
-        "max": 100000000000,
+        "max": 1000000000000,
         "score": [
             -3,
             2,