Merge branch 'dev/1.1.39.1_fuwencai' of BaseService/jyMicroservices into hotfix/v1.1.39.1

jyBXCore/api/init/logs.go

@@ -4,13 +4,11 @@ import (
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"jyBXCore/api/internal/config"
 	"jyBXCore/entity"
-	"log"
 )
 
 var SearchLog *entity.SaveLogs
 
-func LogInit(sl *entity.SaveLogs,c config.SaveLogConfig, mgo mongodb.MongodbSim) {
+func LogInit(sl *entity.SaveLogs, c config.SaveLogConfig, mgo mongodb.MongodbSim) {
 	sl = entity.NewSaveLog(c.Name, c.CollName, c.MgoSaveCacheSize, c.SPSize, c.BulkSize, c.TimeAfter, c.Timeout, mgo)
 	go sl.SaveMgo()
-	log.Println("初始化日志保存")
 }

jyBXCore/entity/logs.go

@@ -52,7 +52,10 @@ func (s *SaveLogs) SaveMgo() {
 	log.Println(fmt.Sprintf("%s Save...", s.Name))
 	arr := make([]map[string]interface{}, s.BulkSize)
 	index := 0
+	timer := time.NewTimer(time.Duration(s.TimeAfter) * time.Millisecond)
+	defer timer.Stop()
 	for {
+		timer.Reset(time.Duration(s.TimeAfter) * time.Millisecond)
 		select {
 		case v := <-s.MgoSaveCache:
 			arr[index] = v
@@ -68,7 +71,7 @@ func (s *SaveLogs) SaveMgo() {
 				arr = make([]map[string]interface{}, s.BulkSize)
 				index = 0
 			}
-		case <-time.After(time.Duration(s.TimeAfter) * time.Millisecond):
+		case <-timer.C:
 			if index > 0 {
 				s.SP <- true
 				go func(arru []map[string]interface{}) {

jyBXSubscribe/api/init/logs.go

@@ -4,8 +4,6 @@ import (
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"jyBXSubscribe/api/internal/config"
 	"jyBXSubscribe/entity"
-
-	"log"
 )
 
 var SubscribeUpdateLog *entity.SaveLogs
@@ -13,5 +11,4 @@ var SubscribeUpdateLog *entity.SaveLogs
 func LogInit(sl *entity.SaveLogs, c config.SaveLogConfig, mgo mongodb.MongodbSim) {
 	sl = entity.NewSaveLog(c.Name, c.CollName, c.MgoSaveCacheSize, c.SPSize, c.BulkSize, c.TimeAfter, c.Timeout, mgo)
 	go sl.SaveMgo()
-	log.Println("初始化日志保存")
 }

jyBXSubscribe/entity/logs.go

@@ -52,7 +52,10 @@ func (s *SaveLogs) SaveMgo() {
 	log.Println(fmt.Sprintf("%s Save...", s.Name))
 	arr := make([]map[string]interface{}, s.BulkSize)
 	index := 0
+	timer := time.NewTimer(time.Duration(s.TimeAfter) * time.Millisecond)
+	defer timer.Stop()
 	for {
+		timer.Reset(time.Duration(s.TimeAfter) * time.Millisecond)
 		select {
 		case v := <-s.MgoSaveCache:
 			arr[index] = v
@@ -68,7 +71,7 @@ func (s *SaveLogs) SaveMgo() {
 				arr = make([]map[string]interface{}, s.BulkSize)
 				index = 0
 			}
-		case <-time.After(time.Duration(s.TimeAfter) * time.Millisecond):
+		case <-timer.C:
 			if index > 0 {
 				s.SP <- true
 				go func(arru []map[string]interface{}) {