chore: 调整目录结构

i2bill.api

@@ -87,15 +87,20 @@ type infoResponse {
 	ErpRoleType int64  `json:"erpRoleType"`
 }
 
+@server(
+	group: auth
+)
 service i2bill-api {
 	@handler Hello
 	get /api/hello
+	
 	@handler LoginByWeixin
 	post /api/auth/loginByWeixin(loginByWeixinRequest) returns(loginByWeixinResponse)
 }
 
 @server(
 	jwt: JwtAuth
+	group: user
 )
 service i2bill-api {
 	@handler JzQrCode

internal/handler/hellohandler.go → internal/handler/auth/hellohandler.go

@@ -1,16 +1,16 @@
-package handler
+package auth
 
 import (
 	"net/http"
 
 	"git.i2edu.net/i2/go-zero/rest/httpx"
-	"git.i2edu.net/i2/i2-bill-api/internal/logic"
+	"git.i2edu.net/i2/i2-bill-api/internal/logic/auth"
 	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 )
 
 func HelloHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		l := logic.NewHelloLogic(r.Context(), ctx)
+		l := auth.NewHelloLogic(r.Context(), ctx)
 		err := l.Hello()
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/loginbyweixinhandler.go → internal/handler/auth/loginbyweixinhandler.go

@@ -1,10 +1,10 @@
-package handler
+package auth
 
 import (
 	"net/http"
 
 	"git.i2edu.net/i2/go-zero/rest/httpx"
-	"git.i2edu.net/i2/i2-bill-api/internal/logic"
+	"git.i2edu.net/i2/i2-bill-api/internal/logic/auth"
 	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 	"git.i2edu.net/i2/i2-bill-api/internal/types"
 	"git.i2edu.net/i2/i2-bill-api/internal/utils"
@@ -17,7 +17,7 @@ func LoginByWeixinHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 			httpx.OkJson(w, utils.ReturnHTTPFail(err))
 			return
 		}
-		l := logic.NewLoginByWeixinLogic(r.Context(), ctx)
+		l := auth.NewLoginByWeixinLogic(r.Context(), ctx)
 		resp, err := l.LoginByWeixin(req)
 		if err != nil {
 			httpx.OkJson(w, utils.ReturnHTTPFail(err))

internal/handler/routes.go

@@ -4,6 +4,8 @@ package handler
 import (
 	"net/http"
 
+	"git.i2edu.net/i2/i2-bill-api/internal/handler/auth"
+	"git.i2edu.net/i2/i2-bill-api/internal/handler/user"
 	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 
 	"git.i2edu.net/i2/go-zero/rest"
@@ -15,12 +17,12 @@ func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {
 			{
 				Method:  http.MethodGet,
 				Path:    "/api/hello",
-				Handler: HelloHandler(serverCtx),
+				Handler: auth.HelloHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/api/auth/loginByWeixin",
-				Handler: LoginByWeixinHandler(serverCtx),
+				Handler: auth.LoginByWeixinHandler(serverCtx),
 			},
 		},
 	)
@@ -30,17 +32,17 @@ func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {
 			{
 				Method:  http.MethodGet,
 				Path:    "/api/user/share/jzQrcode",
-				Handler: JzQrCodeHandler(serverCtx),
+				Handler: user.JzQrCodeHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/api/user/bindMobile",
-				Handler: BindMobileHandler(serverCtx),
+				Handler: user.BindMobileHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/api/user/info",
-				Handler: GetUserHandler(serverCtx),
+				Handler: user.GetUserHandler(serverCtx),
 			},
 		},
 		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),

internal/handler/bindmobilehandler.go → internal/handler/user/bindmobilehandler.go

@@ -1,9 +1,9 @@
-package handler
+package user
 
 import (
 	"net/http"
 
-	"git.i2edu.net/i2/i2-bill-api/internal/logic"
+	"git.i2edu.net/i2/i2-bill-api/internal/logic/user"
 	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 	"git.i2edu.net/i2/i2-bill-api/internal/types"
 	"git.i2edu.net/i2/i2-bill-api/internal/utils"
@@ -23,7 +23,7 @@ func BindMobileHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 			httpx.OkJson(w, utils.ReturnHTTPFail(err))
 			return
 		}
-		l := logic.NewBindMobileLogic(r.Context(), ctx)
+		l := user.NewBindMobileLogic(r.Context(), ctx)
 		l.UserId = uid
 		l.SessionKey = skey
 		resp, err := l.BindMobile(req)

internal/handler/getuserhandler.go → internal/handler/user/getuserhandler.go

@@ -1,13 +1,12 @@
-package handler
+package user
 
 import (
 	"net/http"
 
-	"git.i2edu.net/i2/i2-bill-api/internal/logic"
+	"git.i2edu.net/i2/go-zero/rest/httpx"
+	"git.i2edu.net/i2/i2-bill-api/internal/logic/user"
 	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 	"git.i2edu.net/i2/i2-bill-api/internal/utils"
-
-	"git.i2edu.net/i2/go-zero/rest/httpx"
 )
 
 func GetUserHandler(ctx *svc.ServiceContext) http.HandlerFunc {
@@ -17,7 +16,7 @@ func GetUserHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 			httpx.OkJson(w, utils.ReturnHTTPFail(err))
 			return
 		}
-		l := logic.NewGetUserLogic(r.Context(), ctx)
+		l := user.NewGetUserLogic(r.Context(), ctx)
 		l.UserId = uid
 		l.SessionKey = skey
 		resp, err := l.GetUser()

internal/handler/jzqrcodehandler.go → internal/handler/user/jzqrcodehandler.go

@@ -1,10 +1,10 @@
-package handler
+package user
 
 import (
 	"net/http"
 
 	"git.i2edu.net/i2/go-zero/rest/httpx"
-	"git.i2edu.net/i2/i2-bill-api/internal/logic"
+	"git.i2edu.net/i2/i2-bill-api/internal/logic/user"
 	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 	"git.i2edu.net/i2/i2-bill-api/internal/utils"
 )
@@ -16,7 +16,7 @@ func JzQrCodeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 			httpx.OkJson(w, utils.ReturnHTTPFail(err))
 			return
 		}
-		l := logic.NewJzQrCodeLogic(r.Context(), ctx)
+		l := user.NewJzQrCodeLogic(r.Context(), ctx)
 		l.UserId = uid
 		l.SessionKey = skey
 		resp, err := l.JzQrCode()

internal/logic/hellologic.go → internal/logic/auth/hellologic.go

@@ -1,4 +1,4 @@
-package logic
+package auth
 
 import (
 	"context"

internal/logic/loginbyweixinlogic.go → internal/logic/auth/loginbyweixinlogic.go

@@ -1,4 +1,4 @@
-package logic
+package auth
 
 import (
 	"context"

internal/logic/bindmobilelogic.go → internal/logic/user/bindmobilelogic.go

@@ -1,4 +1,4 @@
-package logic
+package user
 
 import (
 	"context"

internal/logic/getuserlogic.go → internal/logic/user/getuserlogic.go

@@ -1,4 +1,4 @@
-package logic
+package user
 
 import (
 	"context"

internal/logic/jzqrcodelogic.go → internal/logic/user/jzqrcodelogic.go

@@ -1,4 +1,4 @@
-package logic
+package user
 
 import (
 	"context"