From c1c0d40ea4bca5b5eb1786e0b20409129e394e98 Mon Sep 17 00:00:00 2001
From: Sage <1010309281@qq.com>
Date: Tue, 25 Jan 2022 17:48:14 +0800
Subject: [PATCH 1/3] remove n

---
 src/v1/grpcserver/server_grpc.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/v1/grpcserver/server_grpc.go b/src/v1/grpcserver/server_grpc.go
index b2e09f0..ce1f254 100644
--- a/src/v1/grpcserver/server_grpc.go
+++ b/src/v1/grpcserver/server_grpc.go
@@ -63,7 +63,7 @@ func (svr *GRPCServer) run() error {
 		svr.HandlerFunc(svr.s)
 	}
 
-	svr.Info("[%s]rpc running at %s\n", svr.name, svr.listenAddr)
+	svr.Info("[%s]rpc running at %s", svr.name, svr.listenAddr)
 	if err := svr.s.Serve(lis); err != nil {
 		svr.Fatal("failed to serve: %v", err)
 		return err
@@ -85,7 +85,7 @@ func (svr *GRPCServer) registerService() error {
 	}
 
 	if svr.serviceRegister != nil {
-		svr.Info("[%s]rpc register addr %s\n", svr.name, regServer)
+		svr.Info("[%s]rpc register addr %s", svr.name, regServer)
 		return svr.serviceRegister.Register(svr.name, regServer)
 	}
 
-- 
Gitee


From 07749d86c59848f26cefe6ba8f847af0580c7562 Mon Sep 17 00:00:00 2001
From: sage <sage@ponyft.com>
Date: Tue, 8 Feb 2022 11:12:50 +0800
Subject: [PATCH 2/3] modify config

---
 src/v1/config/db.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/v1/config/db.go b/src/v1/config/db.go
index 7265d3e..60a5ed3 100644
--- a/src/v1/config/db.go
+++ b/src/v1/config/db.go
@@ -1,5 +1,7 @@
 package config
 
+import "fmt"
+
 type DBConfig struct {
 	DbHost     string `yaml:"DbHost"`
 	DbPort     string `yaml:"DbPort"`
@@ -13,3 +15,13 @@ type DBConfig struct {
 	MaxIdleTime  int    `default:"0" yaml:"ConnMaxIdleTime"` //每个链接最大空闲时间
 	MaxConcatLen string `default:"" yaml:"MaxConcatLen"`
 }
+
+func (c DBConfig) DSNForMysql() string {
+	return fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=True&loc=Local",
+		c.DbUser, c.DbPassword, c.DbHost, c.DbPort, c.DbName)
+}
+
+func (c DBConfig) DSNForPgSql() string {
+	return fmt.Sprintf("host=%s port=%s user=%s dbname=%s password=%s",
+		c.DbHost, c.DbPort, c.DbUser, c.DbName, c.DbPassword)
+}
-- 
Gitee


From 1a5ec662a82d439499318755b7f0244139b68290 Mon Sep 17 00:00:00 2001
From: sage <sage@ponyft.com>
Date: Thu, 10 Feb 2022 20:44:06 +0800
Subject: [PATCH 3/3] modify add requestId

---
 src/v1/httpserver/vars.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/v1/httpserver/vars.go b/src/v1/httpserver/vars.go
index 5326200..4a0ea07 100644
--- a/src/v1/httpserver/vars.go
+++ b/src/v1/httpserver/vars.go
@@ -1,7 +1,6 @@
 package httpserver
 
 import (
-	"context"
 	"fmt"
 	"gitee.com/scottq/go-framework/src/utils"
 	"golang.org/x/time/rate"
@@ -48,8 +47,11 @@ var GlobalMiddlewareAddRequestId = func(requestIdField string) Middleware {
 	return func(ctx *Ctx, next func(*Ctx)) {
 
 		//添加requestId
-		c := context.WithValue(ctx.request.Context(), requestIdField, utils.NewRequestId())
-		ctx.request = ctx.request.WithContext(c)
+		//c := context.WithValue(ctx.request.Context(), requestIdField, utils.NewRequestId())
+		//ctx.request = ctx.request.WithContext(c)
+
+		//改为直接ctx接收requestId
+		ctx.SetRequestId(utils.NewRequestId())
 
 		next(ctx)
 	}
-- 
Gitee