xiugai

rpc/etc/biservice.yaml

@@ -1,22 +1,23 @@
 Name: biservice.rpc
-ListenOn: 0.0.0.0:9998
+ListenOn: 0.0.0.0:9996
 Etcd:
   Hosts:
-    - 192.168.3.240:2379
+    - 192.168.3.206:2379
   Key: biservice.rpc
+Timeout: 300000
 Mode: test
 Mysql:
   JianYu:
     DBName: jianyu
-    Address: 192.168.3.149:3306
-    UserName: root
+    Address: jymysql.jydev.jy360.cn:33066
+    UserName: jianyu
     PassWord: Topnet123
     MaxOpenConns: 5
     MaxIdleConns: 5
   JyDoc:
     DBName: jydocs
-    Address: 192.168.3.149:3306
-    UserName: root
+    Address: jymysql.jydev.jy360.cn:33066
+    UserName: jianyu
     PassWord: Topnet123
     MaxOpenConns: 5
     MaxIdleConns: 5
@@ -25,8 +26,8 @@ Mysql:
     Address: 192.168.3.149:4000
     UserName: xuzhiheng
     PassWord: "Xzh#20221122K"
-    MaxOpenConns: 5
-    MaxIdleConns: 5
+    MaxOpenConns: 30
+    MaxIdleConns: 30
   Tidb:
     DBName: base_service
     Address: 192.168.3.217:4000
@@ -37,15 +38,15 @@ Mysql:
   BiTidb:
     DBName: jianyu_subjectdb_test
     Address: 192.168.3.149:4000
-    UserName: xuzhiheng
-    PassWord: "Xzh#20221122K"
-    MaxOpenConns: 5
-    MaxIdleConns: 5
+    UserName: root
+    PassWord: "Tibi#20211222"
+    MaxOpenConns: 20
+    MaxIdleConns: 20
   CallTidb:
     DBName: Call_Accounting
     Address: 192.168.3.149:4000
-    UserName: xuzhiheng
-    PassWord: "Xzh#20221122K"
+    UserName: root
+    PassWord: "Tibi#20211222"
     MaxOpenConns: 5
     MaxIdleConns: 5
   BiService:
@@ -73,25 +74,25 @@ Mongo:
     Password: jy@DevGroup
     Size: 10
 Es:
-  Address: http://192.168.3.241:9205
-  DbSize: 5
+  Address: http://192.168.3.241:9205,http://192.168.3.149:9200
+  DbSize: 10
   Version: v7
-  UserName:
-  Password:
-  Index: projectset
-  IType: projectset
+  UserName: ""
+  Password: ""
+  Index: bidding
+  IType: bidding
 EntEs:
-  Address: http://192.168.3.241:9205
-  DbSize: 5
+  Address: http://192.168.3.241:9205,http://192.168.3.149:9200
+  DbSize: 10
   Version: v7
-  UserName:
-  Password:
+  UserName: ""
+  Password: ""
 Logx:
-  Mode: console #console|file|volume
+  Mode: file #console|file|volume
   Path: logs
   Level: info #info|error|severe
   KeepDays: 100
-CustomerCol: customer_test
+CustomerCol: customer
 AddCountLimit: 500
 DrawCountLimit: 1000
 TopicName: jy_position_sync
@@ -120,8 +121,9 @@ Mail:
     Pwd: "ue9Rg9Sf4CVtdm5a"
     User: "public03@topnet.net.cn"
 UpdateProjectUrl: "http://192.168.3.206:7778/updateProject"
-ExportDirectory: "D:/top_git_projects/biService"
-ComFileDir: "D:/top_git_projects/biComFileRes"
+ExportDirectory: "/home/tietaRes"
 ExportUrl: "https://jybx-webtest.jydev.jianyu360.com/tietaRes"
-ComFileUrl: "https://jybx-webtest.jydev.jianyu360.com/tietaRes"
 ExportCount: 15000
+#新增
+ComFileDir: "/home/biComFileRes"
+ComFileUrl: "https://jybx2-webtest.jydev.jianyu360.com/biComFileRes"

service/clue.go

@@ -649,6 +649,10 @@ func DrawClues(positionId, count1, count2, count3 int64) int {
 				drawCount += int(count3)
 				break
 			}
+			if counts1 > 5*int(count3) {
+				drawCount += int(counts)
+				break
+			}
 		}
 	}
 	return drawCount