gin init upgrade

ginmodule/ginloader.go

@@ -19,7 +19,9 @@ type GinModule struct {
 
  // 自定义Module配置
  GinModuleConfig *declaration.ModuleConfig
- GinInterceptor *func(instance interface{})
+ GinInterceptor func(instance interface{})
+
+ ginEngine *gin.Engine
 
  // * 注册业务路由
  Routers []Router
@@ -45,30 +47,24 @@ func (g *GinModule) ModuleConfig() *declaration.ModuleConfig {
  UnregisterPriority: 0,
  UnregisterAllowAsync: true,
  UnregisterMaxWaitSeconds: 30,
+ LoadInterceptor: g.GinInterceptor,
  }
 }
 
-// Interceptor 初始化gin原始实例拦截器
-// request instance: *gin.Engine
-func (g *GinModule) Interceptor() *func(instance interface{}) {
- return g.GinInterceptor
+func (g *GinModule) RawInstance() interface{} {
+ g.ginEngine = gin.New()
+ return g.ginEngine
 }
 
-func (g *GinModule) Register(interceptor *func(instance interface{})) error {
+func (g *GinModule) Register() error {
  var err error
-
+ ginEngin := g.ginEngine
  if g.DebugModule {
  gin.SetMode(gin.DebugMode)
  } else {
  gin.SetMode(gin.ReleaseMode)
  }
 
- ginEngin := gin.New()
-
- if interceptor != nil {
- (*interceptor)(ginEngin)
- }
-
  if g.MaxMultipartMemory > 0 {
  ginEngin.MaxMultipartMemory = g.MaxMultipartMemory
  }

go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
  github.com/acexy/golang-toolkit v0.0.4
  github.com/gin-gonic/gin v1.9.1
- github.com/golang-acexy/starter-parent v0.0.3
+ github.com/golang-acexy/starter-parent v0.0.4
 )
 
 require (
@@ -24,7 +24,7 @@ require (
  github.com/mattn/go-isatty v0.0.20 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
- github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+ github.com/pelletier/go-toml/v2 v2.2.0 // indirect
  github.com/sirupsen/logrus v1.9.3 // indirect
  github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
  github.com/ugorji/go/codec v1.2.12 // indirect

go.sum

@@ -31,7 +31,11 @@ github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang-acexy/starter-parent v0.0.3 h1:LZlP2r8XLCNOmqGqA7rnptvjkH0Wh6M9N/HL2tSBBvM=
 github.com/golang-acexy/starter-parent v0.0.3/go.mod h1:Ol9Gt1uRVVi1fSemTh0xeuZFcfIU+VATmPSm28ilnNk=
+github.com/golang-acexy/starter-parent v0.0.4 h1:BNqp4ig2XOYt7C3B3ldq4r4gmfV3wWLibMqWRmpSerA=
+github.com/golang-acexy/starter-parent v0.0.4/go.mod h1:Ol9Gt1uRVVi1fSemTh0xeuZFcfIU+VATmPSm28ilnNk=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@@ -50,20 +54,24 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
 github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
+github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo=
+github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
@@ -83,6 +91,7 @@ golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

test/ginstarter_test.go

@@ -17,7 +17,6 @@ func init() {
 
  interceptor := func(instance interface{}) {
  engine := instance.(*gin.Engine)
-
  // 使用interceptor的形式，获取原始gin实例 注册一个伪探活服务
  engine.GET("/ping", func(context *gin.Context) {
  context.String(http.StatusOK, "alive")
@@ -34,7 +33,7 @@ func init() {
  &router.AbortRouter{},
  &router.BasicAuthRouter{},
  },
- GinInterceptor: &interceptor,
+ GinInterceptor: interceptor,
  }}
 
 }