wip:日志包替换

common/redis-util.go

@@ -1,10 +1,9 @@
 package common
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	"encoding/json"
 	"github.com/go-redis/redis"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
 	"time"
 )
 
@@ -48,7 +47,7 @@ func (r *Redis) Set(k string, v interface{}, timeout int64) bool {
 	cmd := r.Client.Set(k, bt, time.Duration(timeout)*time.Second)
 	b, err := cmd.Result()
 	if err != nil {
-		g.Log().Errorf(gctx.New(), "redis Set err %s", err.Error())
+		log.Errorf("redis Set err %s", err.Error())
 	}
 	return "OK" == b
 }
@@ -59,7 +58,7 @@ func (r *Redis) Get(k string) interface{} {
 	if bt != nil && len(bt) > 0 {
 		var res interface{}
 		if err := json.Unmarshal(bt, &res); err != nil {
-			g.Log().Errorf(gctx.New(), "redis Get Unmarshal err %v", err)
+			log.Errorf("redis Get Unmarshal err %v", err)
 		}
 		return res
 	}
@@ -71,7 +70,7 @@ func (r *Redis) GetBytes(k string) []byte {
 	bt, err := cmd.Bytes()
 	if err != nil {
 		if err.Error() != "redis: nil" {
-			g.Log().Errorf(gctx.New(), "redis GetBytes err %s", err.Error())
+			log.Errorf("redis GetBytes err %s", err.Error())
 		}
 		return nil
 	}
@@ -82,7 +81,7 @@ func (r *Redis) MGet(k ...string) []interface{} {
 	cmd := r.Client.MGet(k...)
 	arr, err := cmd.Result()
 	if err != nil {
-		g.Log().Errorf(gctx.New(), "redis MGet err %s", err.Error())
+		log.Errorf("redis MGet err %s", err.Error())
 	}
 	return arr
 }
@@ -91,7 +90,7 @@ func (r *Redis) Incr(k string) int64 {
 	cmd := r.Client.Incr(k)
 	res, err := cmd.Result()
 	if err != nil {
-		g.Log().Errorf(gctx.New(), "redis Incr err %s", err.Error())
+		log.Errorf("redis Incr err %s", err.Error())
 	}
 	return res
 }
@@ -99,7 +98,7 @@ func (r *Redis) Incr(k string) int64 {
 func (r *Redis) Del(k string) bool {
 	_, err := r.Client.Del(k).Result()
 	if err != nil {
-		g.Log().Errorf(gctx.New(), "redis Del err %s", err.Error())
+		log.Errorf("redis Del err %s", err.Error())
 		return false
 	}
 	return true
@@ -108,7 +107,7 @@ func (r *Redis) Del(k string) bool {
 func (r *Redis) Exists(k string) bool {
 	res, err := r.Client.Exists(k).Result()
 	if err != nil {
-		g.Log().Errorf(gctx.New(), "redis Exists err %s", err.Error())
+		log.Errorf("redis Exists err %s", err.Error())
 	}
 	return res == 1
 }
@@ -126,7 +125,7 @@ func (r *Redis) GetTTL(key string) int64 {
 	cmd := r.Client.TTL(key)
 	t, err := cmd.Result()
 	if err != nil {
-		g.Log().Errorf(gctx.New(), "redis GetTTL err %s", err.Error())
+		log.Errorf("redis GetTTL err %s", err.Error())
 	}
 	if t.Nanoseconds() < 0 {
 		return -1

core/logs/init.go

@@ -1,6 +1,7 @@
 package logs
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/common/db"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/logs/internal/notice"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/logs/internal/savedb"
@@ -15,20 +16,19 @@ func InitLogs() {
 	var noticeConfig notice.NoticeConfig
 	ctx := gctx.New()
 	if err := g.Cfg().MustGet(ctx, "alarm").Scan(&noticeConfig); err != nil {
-		g.Log().Errorf(ctx, "nsq通知配置异常", err)
+		log.WithContext(ctx).Errorf("nsq通知配置异常 %v", err)
 	}
 
 	noticeObj, err := notice.NewNotice(noticeConfig)
 	if err != nil {
-		g.Log().Errorf(ctx, "nsq通知初始化异常异常", err)
+		log.WithContext(ctx).Errorf("nsq通知初始化异常异常 %v", err)
 	}
 
 	// 持久化化存储
-	var sDB *savedb.DbLogs
-	if g.Cfg().MustGet(ctx, "logger.reqLog.saveToDb").Bool() {
-		sDB = new(savedb.DbLogs)
-		sDB.Db = db.MgoLog
-	}
+	sDB := &savedb.DbLogs{}
+
+	sDB = new(savedb.DbLogs)
+	sDB.Db = db.MgoLog
 
 	GateWayServerLog = new(serverLog)
 

core/logs/internal/notice/notice.go

@@ -1,11 +1,9 @@
 package notice
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	"bp.jydev.jianyu360.cn/BP/jynsq/gonsq"
 	"encoding/json"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
-	"log"
 )
 
 type NoticeConfig struct {
@@ -45,9 +43,10 @@ func (n *Notice) SendWarnMsg(detail map[string]interface{}) error {
 	if err != nil {
 		return err
 	}
-	g.Log().Debugf(gctx.New(), "模拟发送信息----->", string(bs))
+
+	log.Debugf("模拟发送信息----->%s", string(bs))
 	if err := n.p.Publish(bs); err != nil {
-		log.Println("nsq连接失败", err)
+		log.Errorf("nsq连接失败 %v", err)
 	}
 	return nil
 }

core/logs/serverLogs.go

@@ -1,6 +1,7 @@
 package logs
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	. "bp.jydev.jianyu360.cn/BaseService/gateway/common/gatecode"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/logs/internal/notice"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/logs/internal/savedb"
@@ -8,7 +9,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/text/gstr"
@@ -86,15 +86,14 @@ func (s *serverLog) RecordLogAndNotice(r *ghttp.Request, err error) {
 				"log": contextDetail,
 			})
 		}
-		g.Log("reqLog").Debugf(r.Context(), gerror.Stack(err))
+		log.WithContext(r.Context()).Debugln(gerror.Stack(err))
 	}
 
 	if s.SDb != nil {
 		s.SDb.AddLogToTask(PaseReq(handlerCtx, r))
 	}
-
 	//日志输出
-	g.Log("reqLog").Printf(r.Context(), contextDetail)
+	log.WithContext(r.Context()).Error(contextDetail)
 }
 
 func PaseReq(ctx *router.GContext, r *ghttp.Request) map[string]interface{} {

core/proxy/filterPoly/blacklist.go

@@ -3,22 +3,21 @@ package filterPoly
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/mongodb"
+	log "app.yhyue.com/moapp/jylog"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/common/db"
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/util/gconv"
 	"strings"
 	"time"
 )
 
-//syncBlackWhiteList 同步永久黑名单白名单
+// syncBlackWhiteList 同步永久黑名单白名单
 func syncBlackWhiteList() {
 	mgSess := db.MgoJy.GetMgoConn()
 	defer func() {
 		db.MgoJy.DestoryMongoConn(mgSess)
 	}()
-	g.Log().Infof(gctx.New(), "开始同步黑白名单")
+	log.Info("开始同步黑白名单")
 	addBlackNum, addWhiteNum := 0, 0
 	// 从用户表同步黑名单
 	iter := mgSess.DB("qfw").C("user").Find(map[string]interface{}{"i_ban": 1}).Select(map[string]interface{}{"_id": 1}).Iter()
@@ -28,7 +27,7 @@ func syncBlackWhiteList() {
 		blackKey := fmt.Sprintf(BlackListKey, uid)
 		if !AllRedis.Exists(blackKey) {
 			AllRedis.Set(blackKey, 1, -1)
-			g.Log().Infof(gctx.New(), "同步黑名单-加入%s", uid)
+			log.Infof("同步黑名单-加入%s", uid)
 			addBlackNum++
 		}
 	}
@@ -42,29 +41,29 @@ func syncBlackWhiteList() {
 			if key := fmt.Sprintf(WhiteListKey, value); status == 1 && !AllRedis.Exists(key) {
 				addWhiteNum++
 				AllRedis.Set(key, 1, -1)
-				g.Log().Infof(gctx.New(), "同步白名单-加入%s", value)
+				log.Info("同步白名单-加入%s", value)
 			} else if key := fmt.Sprintf(BlackListKey, value); status == -1 && !AllRedis.Exists(key) {
 				addBlackNum++
 				AllRedis.Set(key, 1, -1)
-				g.Log().Infof(gctx.New(), "同步黑名单-加入%s", value)
+				log.Info("同步黑名单-加入%s", value)
 			}
 		}
 	}
 
-	g.Log().Infof(gctx.New(), "同步结束,共新增%d个黑名单,%d个白名单", addBlackNum, addWhiteNum)
+	log.Info("同步结束,共新增%d个黑名单,%d个白名单", addBlackNum, addWhiteNum)
 }
 
-//checkBackList 查询是否在白名单中
+// checkBackList 查询是否在白名单中
 func (a *ReqFilterPoly) checkWhiteList(k string) bool {
 	return AllRedis.Get(fmt.Sprintf(WhiteListKey, k)) != nil
 }
 
-//checkBackList 查询是否在黑名单中
+// checkBackList 查询是否在黑名单中
 func (a *ReqFilterPoly) checkBackList(k string) bool {
 	return AllRedis.Get(fmt.Sprintf(BlackListKey, k)) != nil
 }
 
-//addBackList 加入黑名单
+// addBackList 加入黑名单
 func (a *ReqFilterPoly) addBackList(k, cause string) {
 	timeLong := a.Rule.TempBlockTime
 	blockTimes := a.Rule.IdMaxBlockTimes
@@ -74,7 +73,7 @@ func (a *ReqFilterPoly) addBackList(k, cause string) {
 	}
 	//统计临时黑名单次数,超过次数进入永久黑名单
 	if !RateOk(fmt.Sprintf(BlackTimesKey, k), blockTimes[1], time.Duration(blockTimes[0])*time.Second) {
-		g.Log().Infof(gctx.New(), "%s 多次进入临时黑名单，现转移至永久黑名单", k)
+		log.Infof("%s 多次进入临时黑名单，现转移至永久黑名单", k)
 		timeLong = -1
 	}
 	AllRedis.Set(fmt.Sprintf(BlackListKey, k), 1, timeLong)

core/proxy/filterPoly/filterPoly.go

@@ -1,11 +1,12 @@
 package filterPoly
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	"fmt"
 	"github.com/gogf/gf/v2/frame/g"
 )
 
-//ReqFilterPoly 代理应用下每一组action
+// ReqFilterPoly 代理应用下每一组action
 type ReqFilterPoly struct {
 	Code string   //别名【用于验证码分组统计】
 	Rule *ReqRule //action分组rule【需要配合Alias使用】
@@ -48,13 +49,13 @@ func (a *ReqFilterPoly) IdFilter(ctx g.Ctx, id string) (statusCode int, key stri
 
 	// 设置验证码状态
 	if statusCode == 2 {
-		g.Log().Infof(ctx, "%s 超出验证码请求阈值,弹出验证码", id)
+		log.WithContext(ctx).Infof("%s 超出验证码请求阈值,弹出验证码", id)
 		go a.SetWaitVerify(id, a.Rule.IdTimeRange)
 	}
 
 	//最大值校验
 	if !a.rateCheckOk(id, a.Rule.IdMax) {
-		g.Log().Infof(ctx, "%s 超出最大请求限制,加入临时黑名单", id)
+		log.WithContext(ctx).Infof("%s 超出最大请求限制,加入临时黑名单", id)
 		a.addBackList(id, "exceed IdMax")
 		AllRedis.Del(fmt.Sprintf(RateDataKey, a.Rule.Alias, a.Rule.IdMax[0], id))
 		return -1, id
@@ -99,12 +100,12 @@ func (a *ReqFilterPoly) IpFilter(ctx g.Ctx, ip string) (statusCode int, key stri
 		}
 	}
 	if statusCode == 2 {
-		g.Log().Infof(ctx, "%s 超出验证码请求阈值,弹出验证码", ip)
+		log.WithContext(ctx).Infof("%s 超出验证码请求阈值,弹出验证码", ip)
 		go a.SetWaitVerify(ip, a.Rule.IdTimeRange)
 	}
 	//最大值校验
 	if !a.rateCheckOk(ip, a.Rule.IpMax) {
-		g.Log().Infof(ctx, "%s 超出最大请求限制,加入临时黑名单", ip)
+		log.WithContext(ctx).Infof("%s 超出最大请求限制,加入临时黑名单", ip)
 		a.addBackList(ip, "exceed IdMax")
 		AllRedis.Del(fmt.Sprintf(RateDataKey, a.Rule.Alias, a.Rule.IpMax[0], ip))
 		return -1, ip

core/proxy/filterPoly/manager.go

@@ -1,6 +1,7 @@
 package filterPoly
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/common"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/common/db"
 	"github.com/gogf/gf/v2/frame/g"
@@ -24,7 +25,7 @@ func InitFilterPolyManager() *Manager {
 			code := gconv.String(rule["code"])
 			var reqRule ReqRule
 			if err := gconv.Scan(rule["ploy_rule"], &reqRule); err != nil {
-				g.Log().Errorf(gctx.New(), "格式化%s策略异常 %v", code, err)
+				log.Errorf("格式化%s策略异常 %v", code, err)
 				continue
 			}
 			manager.AddRule(code, &reqRule)
@@ -39,7 +40,7 @@ func (receiver *Manager) initCache() {
 	var conf common.RedisConf
 	ctx := gctx.New()
 	if err := g.Cfg().MustGet(ctx, "databases.polyredis").Scan(&conf); err != nil {
-		g.Log().Errorf(ctx, "redis初始化异常", err)
+		log.WithContext(ctx).Errorf("redis初始化异常 %v", err)
 	}
 	AllRedis = common.InitRedis(conf)
 }

core/proxy/filterPoly/verify.go

@@ -1,41 +1,40 @@
 package filterPoly
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
 	"time"
 )
 
-//IsWaitVerify 是否处于等待验证码校验
+// IsWaitVerify 是否处于等待验证码校验
 func (a *ReqFilterPoly) IsWaitVerify(k string) bool {
 	return AllRedis.Get(fmt.Sprintf(WaitVerifyKey, k)) != nil
 }
 
-//SetWaitVerify 设置验证码
+// SetWaitVerify 设置验证码
 func (a *ReqFilterPoly) SetWaitVerify(k string, t int64) {
 	AllRedis.Set(fmt.Sprintf(WaitVerifyKey, k), 1, t)
 }
 
-//ClearWaitVerify 清除验证码状态
+// ClearWaitVerify 清除验证码状态
 func (a *ReqFilterPoly) ClearWaitVerify(k string) {
 	AllRedis.Del(fmt.Sprintf(WaitVerifyKey, k))
 	AllRedis.Del(fmt.Sprintf(VerifyRedisKey, k))
 }
 
-//VerifyErrDetail 验证码输入出错统计
+// VerifyErrDetail 验证码输入出错统计
 func (a *ReqFilterPoly) VerifyErrDetail(k string) {
 	if len(a.Rule.VcodeErrorTimes) != 2 {
 		return
 	}
 	if !RateOk(fmt.Sprintf(ErrVerifyKey, k), a.Rule.VcodeErrorTimes[1], time.Duration(a.Rule.VcodeErrorTimes[0])*time.Second) {
-		g.Log().Infof(gctx.New(), "%s 验证码多次验证出错，加入临时黑名单", k)
+		log.Infof("%s 验证码多次验证出错，加入临时黑名单", k)
 		AllRedis.Del(fmt.Sprintf(ErrVerifyKey, k))
 		a.addBackList(k, "exceed VerifyKey")
 	}
 }
 
-//rateCheckOk 访问频率统计
+// rateCheckOk 访问频率统计
 func (a *ReqFilterPoly) rateCheckOk(k string, r []int64) bool {
 	if len(r) != 2 {
 		return true
@@ -70,7 +69,7 @@ func (a *ReqFilterPoly) finalRateCheckOk(k string, r []int64, sign string) bool
 	return flag
 }
 
-//RateOk 次数统计
+// RateOk 次数统计
 func RateOk(keys string, count int64, duration time.Duration) bool {
 	if AllRedis.IncrTimeout(keys, duration) >= count {
 		return false
@@ -78,7 +77,7 @@ func RateOk(keys string, count int64, duration time.Duration) bool {
 	return true
 }
 
-//ShowCodeById 超出最大阈值，每n次弹出验证码
+// ShowCodeById 超出最大阈值，每n次弹出验证码
 func (a *ReqFilterPoly) ShowCodeById(k string) bool {
 	c := AllRedis.IncrTimeout(fmt.Sprintf(ExceedTimeKey, a.Rule.Alias, k), time.Duration(a.Rule.IdTimeRange)*time.Second) //超出阀值请求次数
 	if (c-1)%a.Rule.IdFrep == 0 {
@@ -87,7 +86,7 @@ func (a *ReqFilterPoly) ShowCodeById(k string) bool {
 	return false
 }
 
-//ShowCodeByIp 超出最大阈值，每n次弹出验证码
+// ShowCodeByIp 超出最大阈值，每n次弹出验证码
 func (a *ReqFilterPoly) ShowCodeByIp(k string) bool {
 	c := AllRedis.IncrTimeout(fmt.Sprintf(ExceedTimeKey, a.Rule.Alias, k), time.Duration(a.Rule.IpTimeRange)*time.Second) //超出阀值请求次数
 	if (c-1)%a.Rule.IpFrep == 0 {

core/proxy/filterPoly/verifyDetail.go

@@ -1,10 +1,10 @@
 package filterPoly
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/util"
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"math"
 	"net/http"
@@ -28,12 +28,12 @@ func (a *ReqFilterPoly) VerifyHandle(req *http.Request, key string) map[string]i
 			}
 			var result = [][]int{}
 			if err := json.Unmarshal(va, &result); err != nil {
-				g.Log().Errorf(req.Context(), "%s Unmarshal 出错 %v", key, err)
+				log.WithContext(req.Context()).Errorf("%s Unmarshal 出错 %v\n", key, err)
 				return false
 			}
 			vcArr := strings.Split(vc, ";")
 			if len(vcArr) != len(result) {
-				g.Log().Infof(req.Context(), "用户%s验证码校验失败 选择数量不足 \n正确坐标:%v\n输入坐标%v ", key, result, vcArr)
+				log.WithContext(req.Context()).Infof("用户%s验证码校验失败 选择数量不足 \n正确坐标:%v\n输入坐标%v \n", key, result, vcArr)
 				return false
 			}
 
@@ -51,11 +51,11 @@ func (a *ReqFilterPoly) VerifyHandle(req *http.Request, key string) map[string]i
 				}
 
 				if d := Distance(px, py, result[index][0], result[index][1]); d > 15 {
-					g.Log().Infof(req.Context(), "用户%s验证码校验失败 w:%d 第(%d)校验结果%f\n正确坐标:%v\n输入坐标%v ", key, imgWidth, index, d, result, vcArr)
+					log.WithContext(req.Context()).Infof("用户%s验证码校验失败 w:%d 第(%d)校验结果%f\n正确坐标:%v\n输入坐标%v \n", key, imgWidth, index, d, result, vcArr)
 					return false
 				}
 			}
-			g.Log().Infof(req.Context(), "用户%s验证码校验通过", key)
+			log.WithContext(req.Context()).Infof("用户%s验证码校验通过\n", key)
 			return true
 		}()
 		if ok {

core/proxy/middleware/filterFuncs.go

@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	"fmt"
 	"github.com/gogf/gf/v2/net/gtrace"
 	"net/url"
@@ -13,7 +14,6 @@ import (
 	. "bp.jydev.jianyu360.cn/BaseService/gateway/common/gatecode"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/proxy/rpc"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/router"
-	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/util/gconv"
 )
@@ -100,7 +100,7 @@ func filterAfter(r *ghttp.Request) (err error) {
 			var respErr error
 			deductNum, ids, respErr = GetResponseJsonAndClear(r)
 			if respErr != nil { //扣减接口异常 不修改接口内容
-				g.Log().Error(r.Context(), respErr)
+				log.WithContext(r.Context()).Errorln(respErr)
 			}
 		} else if rule.Deduct != 1 {
 			deductNum = gconv.Int64(rule.Deduct)
@@ -131,9 +131,9 @@ func GetResponseJsonAndClear(r *ghttp.Request) (deductNum int64, ids []string, e
 		r.Response.ClearBuffer()
 		r.Response.WriteJson(respJson)
 		r.Response.Header().Set("Content-Length", gconv.String(len(r.Response.Buffer())))
-		g.Log().Debugf(r.Context(), "填充 %s 相应头长度%s", gconv.String(respJson), r.Response.Header().Get("Content-Length"))
+		log.WithContext(r.Context()).Debugf("填充 %s 相应头长度%s\n", gconv.String(respJson), r.Response.Header().Get("Content-Length"))
 	}()
-	g.Log().Debugf(r.Context(), "获取 %s 相应头长度%s", gconv.String(respJson), r.Response.Header().Get("Content-Length"))
+	log.WithContext(r.Context()).Debugf("获取 %s 相应头长度%s", gconv.String(respJson), r.Response.Header().Get("Content-Length"))
 
 	//仅接口返回成功后 进行资源操作
 	if code, exists := respJson["error_code"]; !(exists && code == 0) {

core/proxy/proxyServer.go

@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	. "bp.jydev.jianyu360.cn/BaseService/gateway/common/gatecode"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/proxy/broker"
@@ -35,12 +36,12 @@ func InitGateWayServer(initCtx gctx.Ctx) *ghttp.Server {
 	var err error
 	routerManager, err = router.InitRouterManager()
 	if err != nil {
-		g.Log().Error(initCtx, err)
+		log.WithContext(initCtx).Errorln(err)
 	}
 	//初始化外部服务
 	sussBiServer, err := outServer.InitSussBi(gcfg.Instance().MustGet(initCtx, "outServer.sussbi", nil).Map())
 	if err != nil {
-		g.Log().Error(initCtx, err)
+		log.WithContext(initCtx).Infoln(err)
 	} else {
 		vars.BManager.RegisterOutServer(sussBiServer.Url, sussBiServer)
 	}
@@ -109,7 +110,7 @@ var proxyHandler = func(r *ghttp.Request) {
 			if i == (errTryTime - 1) {
 				r.SetError(NewErrorWithCode(GATEWAY_PROXY_ERR, fmt.Sprintf("代理异常:%s err:%v \n", gCtx.ServerAddr, err.Error())))
 			}
-			g.Log().Error(r.Context(), "ErrorHandler ", err)
+			log.WithContext(r.Context()).Error("ErrorHandler ", err)
 		}
 		// 代理请求
 		proxyClient.CreateCustomProxyClient(proxyAddr, errHandel, changeFunc).ServeHTTP(r.Response.ResponseWriter, r.Request)
@@ -117,7 +118,7 @@ var proxyHandler = func(r *ghttp.Request) {
 		if gCtx.RouterRule.IsOutServer { //检测外部服务登录状态是否过期
 			if vars.BManager.CheckOutSeverLoginOut(gCtx.RouterRule.MiddleCode, r) || hasErr {
 				if err := vars.BManager.OutSeverLoginIn(gCtx.RouterRule.MiddleCode); err != nil {
-					g.Log().Errorf(r.GetCtx(), "%s 外部服务自动登录异常 %v \n", gCtx.RouterRule.MiddleCode, err)
+					log.WithContext(r.GetCtx()).Errorf("%s 外部服务自动登录异常 %v \n", gCtx.RouterRule.MiddleCode, err)
 				}
 			}
 		}

core/util/http.go

@@ -1,13 +1,13 @@
 package util
 
 import (
+	log "app.yhyue.com/moapp/jylog"
 	"bufio"
 	"bytes"
 	"compress/flate"
 	"compress/gzip"
 	"encoding/json"
 	"fmt"
-	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"io"
 	"io/ioutil"
@@ -58,7 +58,7 @@ func ChangeResponse(r *ghttp.Request, fn func([]byte) error) (err error) {
 	if encoding == "gzip" { //处理解压
 		body, err := gzip.NewReader(r.Body)
 		if err != nil {
-			g.Log().Error(r.Context(), "ChangeResponse gzip err", err)
+			log.WithContext(r.Context()).Error(r.Context(), "ChangeResponse gzip err", err)
 			return err
 		}
 		content, err = io.ReadAll(body)

etc/config.yaml

@@ -91,26 +91,6 @@ jaeger:
   name: "gateway"
   address: "192.168.3.71:6831"
 
-#日志配置
-logger:
-  level: "PROD"                # ALL, DEV, PROD
-  default:
-    file: "{Y-m-d}.log"
-    rotateExpire: 10
-    rotateBackupLimit: 10
-    stdout: true
-    path: "./logs/system"
-  reqLog:
-    level: "PROD"
-    saveToDb: true
-    path: "./logs/request"
-    file: "{Y-m-d}.log"        # 日志文件格式
-    stdout: true               # 是否输出至控制台
-    rotateBackupLimit: 5
-    rotateExpire: 7d           # 当日志文件超过7天都没有任何修改/写入时，glog模块将会自动将其进行滚动切分。同时进行压缩存储
-    rotateBackupExpire: 60s    # 切分文件的过期时间为7d，即七天后会自动删除该切分文件
-    rotateBackupCompress: 0   # 滚动切分文件的压缩比（0-9）。默认为0，表示不压缩
-
 # 系统告警
 alarm:
   isOpen: true                        # 异常通知开关。默���关闭

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"app.yhyue.com/moapp/jylog"
+	log "app.yhyue.com/moapp/jylog"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/common/db"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/logs"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/proxy"
@@ -14,8 +14,6 @@ import (
 )
 
 func init() {
-	g.Log().SetWriter(jylog.GetWriter())
-	g.Log("reqLog").SetWriter(jylog.GetWriter())
 	g.Cfg().GetAdapter().(*gcfg.AdapterFile).SetFileName("./etc/config.yaml") //设置配置文件
 	db.InitDatabases()                                                        // 初始化数据库
 	logs.InitLogs()                                                           // 初始化日志组件
@@ -29,7 +27,7 @@ func main() {
 	if jaegerAddress := g.Cfg().MustGet(mainCtx, "jaeger.address", "").String(); jaegerAddress != "" {
 		tp, err := jaeger.Init(g.Cfg().MustGet(mainCtx, "jaeger.name", "gateway").String(), jaegerAddress)
 		if err != nil {
-			g.Log().Fatal(mainCtx, err)
+			log.WithContext(mainCtx).Fatal(err)
 		}
 		defer tp.Shutdown(mainCtx)
 	}