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

jyBXCore/api/bxcore.go

@@ -10,6 +10,7 @@ import (
 	IC "jyBXCore/api/init"
 	"jyBXCore/api/internal/handler"
 	"jyBXCore/api/internal/svc"
+	"jyBXCore/entity"
 	"log"
 	"net/http"
 	"os"
@@ -46,7 +47,8 @@ func main() {
 	})
 	//日志记录
 	logx.SetWriter(logrusx.NewLogrusWriter())
-	IC.LogInit(IC.SearchLog, IC.C.SearchLog, IC.MgoLog)
+	IC.SearchLog = entity.NewSaveLog(IC.C.SearchLog.Name, IC.C.SearchLog.CollName, IC.C.SearchLog.MgoSaveCacheSize, IC.C.SearchLog.SPSize, IC.C.SearchLog.BulkSize, IC.C.SearchLog.TimeAfter, IC.C.SearchLog.Timeout, IC.MgoLog)
+	go IC.SearchLog.SaveMgo()
 	handler.RegisterHandlers(server, ctx)
 	fmt.Printf("Starting server at %s:%d...\n", IC.C.Host, IC.C.Port)
 	server.Start()

jyBXCore/api/init/logs.go

@@ -1,14 +1,7 @@
 package init
 
 import (
-	"app.yhyue.com/moapp/jybase/mongodb"
-	"jyBXCore/api/internal/config"
 	"jyBXCore/entity"
 )
 
 var SearchLog *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()
-}

jyBXSubscribe/api/bxsubscribe.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"app.yhyue.com/moapp/jybase/endless"
+	"jyBXSubscribe/entity"
+
 	// logrusx "app.yhyue.com/moapp/jylogx/logx"
 	"fmt"
 	"jyBXSubscribe/api/internal/handler"
@@ -50,7 +52,8 @@ func main() {
 	handler.RegisterHandlers(server, ctx)
 	//日志记录
 	// logx.SetWriter(logrusx.NewLogrusWriter())
-	IC.LogInit(IC.SubscribeUpdateLog, IC.C.SubscribeUpdateLog, IC.MgoLog)
+	IC.SubscribeUpdateLog = entity.NewSaveLog(IC.C.SubscribeUpdateLog.Name, IC.C.SubscribeUpdateLog.CollName, IC.C.SubscribeUpdateLog.MgoSaveCacheSize, IC.C.SubscribeUpdateLog.SPSize, IC.C.SubscribeUpdateLog.BulkSize, IC.C.SubscribeUpdateLog.TimeAfter, IC.C.SubscribeUpdateLog.Timeout, IC.MgoLog)
+	go IC.SubscribeUpdateLog.SaveMgo()
 	fmt.Printf("Starting server at %s:%d...\n", IC.C.Host, IC.C.Port)
 	server.Start()
 

jyBXSubscribe/api/init/logs.go

@@ -1,14 +1,7 @@
 package init
 
 import (
-	"app.yhyue.com/moapp/jybase/mongodb"
-	"jyBXSubscribe/api/internal/config"
 	"jyBXSubscribe/entity"
 )
 
 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()
-}