Skip to content

Commit df1319a

Browse files
committed
merge routes/routes.go+register.go as router.go
1 parent d223ae6 commit df1319a

File tree

6 files changed

+11
-16
lines changed

6 files changed

+11
-16
lines changed

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func main() {
4444
middlewares := DefaultGinMiddlewares()
4545
app := webserver.NewGinEngine(middlewares...)
4646
// 注册路由
47-
routes.Register(app)
47+
routes.InitRouter(app)
4848
// 运行服务
4949
webserver.Run(app)
5050
}

pink-lady

41.4 MB
Binary file not shown.

routes/ping_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func TestPing(t *testing.T) {
1515
viper.Set("basic_auth.username", "admin")
1616
viper.Set("basic_auth.password", "admin")
1717
defer viper.Reset()
18-
Register(r)
18+
InitRouter(r)
1919
recorder, err := goutils.RequestHTTPHandler(
2020
r,
2121
"GET",

routes/register.go routes/router.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ const (
3737
DisableGinSwaggerEnvkey = "DISABLE_GIN_SWAGGER"
3838
)
3939

40-
// Register 在 gin engine 上注册 url 对应的 HandlerFunc
41-
func Register(httpHandler http.Handler) {
40+
// InitRouter 在 gin engine 上注册 url 对应的 HandlerFunc
41+
func InitRouter(httpHandler http.Handler) {
4242
app, ok := httpHandler.(*gin.Engine)
4343
if !ok {
4444
panic("HTTP handler must be *gin.Engine")
@@ -88,3 +88,8 @@ func Register(httpHandler http.Handler) {
8888
// 注册其他 gin HandlerFunc
8989
Routes(app)
9090
}
91+
92+
// Routes 注册 API URL 路由
93+
func Routes(app *gin.Engine) {
94+
// TODO: 在这里注册你的 gin API,如: app.GET("/", HandlerFunc)
95+
}

routes/register_test.go routes/router_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/stretchr/testify/assert"
1111
)
1212

13-
func TestRegisterRoutes(t *testing.T) {
13+
func TestInitRouter(t *testing.T) {
1414
gin.SetMode(gin.ReleaseMode)
1515
r := gin.New()
1616
// Register 中的 basic auth 依赖 viper 配置
@@ -21,7 +21,7 @@ func TestRegisterRoutes(t *testing.T) {
2121

2222
services.Init()
2323

24-
Register(r)
24+
InitRouter(r)
2525
recorder, err := goutils.RequestHTTPHandler(
2626
r,
2727
"GET",

routes/routes.go

-10
This file was deleted.

0 commit comments

Comments
 (0)