From bb0f02275b44a629cdfc2db1def72d218c09226b Mon Sep 17 00:00:00 2001
From: XiaoLFeng <gm@x-lf.cn>
Date: Mon, 25 Dec 2023 02:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/cmd/cmd.go                           | 22 +++++++++++++------
 internal/controller/auth/{ => user}/auth.go   |  2 +-
 .../auth/{ => user}/authController.go         |  4 ++--
 3 files changed, 18 insertions(+), 10 deletions(-)
 rename internal/controller/auth/{ => user}/auth.go (90%)
 rename internal/controller/auth/{ => user}/authController.go (90%)

diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go
index f34f28b..a6ec07b 100644
--- a/internal/cmd/cmd.go
+++ b/internal/cmd/cmd.go
@@ -1,7 +1,8 @@
 package cmd
 
 import (
-	"PersonalMain/internal/controller/auth"
+	"PersonalMain/internal/controller/auth/token"
+	"PersonalMain/internal/controller/auth/user"
 	"PersonalMain/internal/middleware"
 	"context"
 
@@ -21,21 +22,28 @@ var (
 			s := g.Server()
 			s.Group("/api", func(group *ghttp.RouterGroup) {
 				group.Middleware(middleware.TimestampMiddleware)
+				group.Middleware(middleware.JsonResponseMiddleware)
+
 				group.Group("/", func(group *ghttp.RouterGroup) {
-					group.Middleware(ghttp.MiddlewareHandlerResponse)
 					group.Bind(
 						hello.NewV1(),
 					)
 				})
 				group.Group("/auth", func(group *ghttp.RouterGroup) {
-					group.Middleware(ghttp.MiddlewareHandlerResponse)
-					group.Bind(
-						auth.NewAuthV1(),
-					)
+					group.Group("/user", func(group *ghttp.RouterGroup) {
+						group.Bind(
+							user.NewAuthV1(),
+						)
+					})
+					group.Group("/token", func(group *ghttp.RouterGroup) {
+						group.Bind(
+							token.NewTokenV1(),
+						)
+					})
 				})
 			})
+			s.SetServerRoot("resource/public")
 			s.Run()
-			s.SetServerRoot("public")
 			return nil
 		},
 	}
diff --git a/internal/controller/auth/auth.go b/internal/controller/auth/user/auth.go
similarity index 90%
rename from internal/controller/auth/auth.go
rename to internal/controller/auth/user/auth.go
index 01c14a0..e4a07c8 100644
--- a/internal/controller/auth/auth.go
+++ b/internal/controller/auth/user/auth.go
@@ -1,4 +1,4 @@
-package auth
+package user
 
 import (
 	"PersonalMain/api"
diff --git a/internal/controller/auth/authController.go b/internal/controller/auth/user/authController.go
similarity index 90%
rename from internal/controller/auth/authController.go
rename to internal/controller/auth/user/authController.go
index dabc5c7..9ee31fd 100644
--- a/internal/controller/auth/authController.go
+++ b/internal/controller/auth/user/authController.go
@@ -1,4 +1,4 @@
-package auth
+package user
 
 import (
 	"PersonalMain/api/request"
@@ -12,5 +12,5 @@ func (c *ControllerV1) AuthRegister(_ context.Context, req *request.RegisterReq)
 		Message: "Success",
 		Data:    req,
 	}
-	return res, nil
+	return res, err
 }