feat:日志

rpc/common/etc/logs.yaml

@@ -0,0 +1,6 @@
+Mode: file
+Path: ./logs
+Level:
+  - info
+  - error
+KeepDays: 10

rpc/common/init/init.go

@@ -1,16 +1,20 @@
 package init
 
 import (
-	"flag"
-	"github.com/zeromicro/go-zero/core/conf"
 	"app.yhyue.com/moapp/jyInfo/rpc/common/internal/config"
 	"app.yhyue.com/moapp/jyInfo/rpc/model"
-	"app.yhyue.com/moapp/jyInfo/rpc/util"
+	"flag"
+	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 var configFile = flag.String("f", "etc/common.yaml", "the config file")
 var C config.Config
 
+//
+var logFile = flag.String("lf", "etc/logs.yaml", "the config file")
+var logc model.Logc
+
 //
 func init() {
 	conf.MustLoad(*configFile, &C)
@@ -32,7 +36,21 @@ func init() {
 	nsq := C.Nsq
 	model.InitNsqConfig(&nsq)
 	//定时任务
-	tk := C.Task
-	//日志清除
-	go util.NewTaskInit(tk.IsRun, tk.TaskInfoLog.Flag, tk.TaskInfoLog.Cron, tk.TaskInfoLog.EffectiveTime).Crontab()
+	//tk := C.Task
+	////日志清除
+	//go util.NewTaskInit(tk.IsRun, tk.TaskInfoLog.Flag, tk.TaskInfoLog.Cron, tk.TaskInfoLog.EffectiveTime).Crontab()
+	//
+	//初始化日志信息
+	conf.MustLoad(*logFile, &logc)
+	if len(logc.Level) > 0 {
+		for _, v := range logc.Level {
+			logx.MustSetup(logx.LogConf{
+				Mode:     logc.Mode,
+				Path:     logc.Path,
+				Level:    v,
+				KeepDays: logc.KeepDays,
+			})
+			logx.Info(v, "--日志记录")
+		}
+	}
 }

rpc/consumer/consumer.go

@@ -8,8 +8,6 @@ import (
 	"app.yhyue.com/moapp/jyInfo/rpc/consumer/internal/server"
 	"app.yhyue.com/moapp/jyInfo/rpc/consumer/internal/svc"
 	"app.yhyue.com/moapp/jyInfo/rpc/consumer/type/consumer"
-	"app.yhyue.com/moapp/jyInfo/rpc/util"
-
 	mc "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/endless"
 	"github.com/zeromicro/go-zero/core/service"
@@ -38,7 +36,7 @@ func main() {
 		}
 	})
 	//日志记录
-	s.AddUnaryInterceptors(util.CustomInterceptors)
+	//s.AddUnaryInterceptors(util.CustomInterceptors)
 	defer s.Stop()
 
 	fmt.Printf("Starting rpc server at %s...\n", IC.C.ListenOn)

rpc/consumer/etc/logs.yaml

@@ -0,0 +1,6 @@
+Mode: file
+Path: ./logs
+Level:
+  - info
+  - error
+KeepDays: 10

rpc/consumer/init/init.go

@@ -1,16 +1,21 @@
 package init
 
 import (
-	"flag"
-	"github.com/zeromicro/go-zero/core/conf"
 	"app.yhyue.com/moapp/jyInfo/rpc/consumer/internal/config"
 	"app.yhyue.com/moapp/jyInfo/rpc/model"
 	Oss "app.yhyue.com/moapp/jyInfo/rpc/model/oss"
+	"flag"
+	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
-var configFile = flag.String("f", "etc/consumer.yaml", "the config file")
+var configFile = flag.String("cf", "etc/consumer.yaml", "the config file")
 var C config.Config
 
+//
+var logFile = flag.String("lf", "etc/logs.yaml", "the config file")
+var logc model.Logc
+
 func init() {
 	conf.MustLoad(*configFile, &C)
 	//初始化msyql
@@ -31,4 +36,18 @@ func init() {
 	//初始化oss
 	oss := C.Oss
 	Oss.InitOss(oss.OssEndpoint, oss.OssAccessKeyId, oss.OssAccessKeySecret)
+	//
+	//初始化日志信息
+	conf.MustLoad(*logFile, &logc)
+	if len(logc.Level) > 0 {
+		for _, v := range logc.Level {
+			logx.MustSetup(logx.LogConf{
+				Mode:     logc.Mode,
+				Path:     logc.Path,
+				Level:    v,
+				KeepDays: logc.KeepDays,
+			})
+			logx.Info(v, "--日志记录")
+		}
+	}
 }

rpc/consumer/internal/logic/infofileuploadlogic.go

@@ -5,7 +5,6 @@ import (
 	model "app.yhyue.com/moapp/jyInfo/rpc/model/oss"
 	"bytes"
 	"context"
-	"log"
 	"strings"
 	"time"
 
@@ -37,7 +36,7 @@ func (l *InfoFileUploadLogic) InfoFileUpload(in *consumer.InfoFileUploadReq) (*c
 	key := model.GetHashKey(in.File) + model.TypeByExt(in.FileName)
 	t1 := time.Now()
 	b, err := model.OssPutObject(key, bytes.NewReader(in.File), mc.InterfaceToStr(IC.C.Oss.OssBucketName))
-	log.Println("----------", time.Since(t1))
+	logx.Info("----------", time.Since(t1))
 	fileSize := mc.InterfaceToStr(in.FileSize/1024) + "KB"
 	if err == nil && b {
 		var data consumer.InfoFileUploadData

rpc/manager/etc/logs.yaml

@@ -0,0 +1,6 @@
+Mode: file
+Path: ./logs
+Level:
+  - info
+  - error
+KeepDays: 10

rpc/manager/init/init.go

@@ -1,11 +1,12 @@
 package init
 
 import (
+	"app.yhyue.com/moapp/jyInfo/rpc/manager/internal/config"
+	"app.yhyue.com/moapp/jyInfo/rpc/model"
 	"flag"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/conf"
-	"app.yhyue.com/moapp/jyInfo/rpc/manager/internal/config"
-	"app.yhyue.com/moapp/jyInfo/rpc/model"
+	"github.com/zeromicro/go-zero/core/logx"
 	"log"
 
 	_ "github.com/go-sql-driver/mysql"
@@ -18,6 +19,10 @@ var C config.Config
 var DB *gorm.DB
 var err error
 
+//
+var logFile = flag.String("lf", "etc/logs.yaml", "the config file")
+var logc model.Logc
+
 func init() {
 	conf.MustLoad(*configF, &C)
 	//初始化msyql
@@ -47,5 +52,18 @@ func init() {
 	//初始Sensitive
 	sm := C.Sensitive
 	model.InitSensitive(&sm)
-
+	//
+	//初始化日志信息
+	conf.MustLoad(*logFile, &logc)
+	if len(logc.Level) > 0 {
+		for _, v := range logc.Level {
+			logx.MustSetup(logx.LogConf{
+				Mode:     logc.Mode,
+				Path:     logc.Path,
+				Level:    v,
+				KeepDays: logc.KeepDays,
+			})
+			logx.Info(v, "--日志记录")
+		}
+	}
 }

rpc/model/logx.go

@@ -0,0 +1,8 @@
+package model
+
+type Logc struct {
+	Mode     string
+	Path     string
+	Level    []string
+	KeepDays int
+}