Selaa lähdekoodia

chore: 调整目录结构

2637309949 4 vuotta sitten
vanhempi
commit
c20b115bcc

+ 0 - 1
go.mod

@@ -7,6 +7,5 @@ require (
 	git.i2edu.net/i2/i2-bill-erp v0.0.0-20210623022310-19bfc0a41451
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/satori/go.uuid v1.2.0
-	github.com/tal-tech/go-zero v1.1.7 // indirect
 	gopkg.in/yaml.v2 v2.4.0
 )

+ 0 - 3
go.sum

@@ -1,9 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-git.i2edu.net/i2/go-zero v1.0.0/go.mod h1:a9idDtfMmMXrZIHyDg6XnYjWuCpKG0I6zv6Vo9Fpncc=
 git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f h1:zD6rIG7+PhJwYXuQbHyw1pn/z5oUXzrUg9bo9F9+b5k=
 git.i2edu.net/i2/go-zero v1.0.1-0.20210616091154-7fac117e009f/go.mod h1:a9idDtfMmMXrZIHyDg6XnYjWuCpKG0I6zv6Vo9Fpncc=
-git.i2edu.net/i2/i2-bill-erp v0.0.0-20210622060700-13e3b8900ff0 h1:uP58UiI5mHqh1AaYzl5/SSGFQe2VApGxlMQZwjddmmo=
-git.i2edu.net/i2/i2-bill-erp v0.0.0-20210622060700-13e3b8900ff0/go.mod h1:z41FgmYvzNObeFdF0YekAkJpq7UwvLKfruqjqMLyhTw=
 git.i2edu.net/i2/i2-bill-erp v0.0.0-20210623022310-19bfc0a41451 h1:uDtYmC19dlGyhyfHMSORWUfizSTpf1T/nqg/c5DW0XE=
 git.i2edu.net/i2/i2-bill-erp v0.0.0-20210623022310-19bfc0a41451/go.mod h1:WymRAuTBomfIIWmSxOKOkF/0jPQw8KoQlw4C5W7D2rU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=

+ 1 - 1
internal/handler/routes.go

@@ -47,7 +47,7 @@ func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {
 			{
 				Method:  http.MethodPost,
 				Path:    "/api/v1/part_time_user/add",
-				Handler: PartTimeUserAdHandler(serverCtx),
+				Handler: user.PartTimeUserAdHandler(serverCtx),
 			},
 		},
 		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),

+ 4 - 4
internal/handler/parttimeuseradhandler.go → internal/handler/user/parttimeuseradhandler.go

@@ -1,13 +1,13 @@
-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"
 
-	"github.com/tal-tech/go-zero/rest/httpx"
+	"git.i2edu.net/i2/go-zero/rest/httpx"
 )
 
 func PartTimeUserAdHandler(ctx *svc.ServiceContext) http.HandlerFunc {
@@ -18,7 +18,7 @@ func PartTimeUserAdHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 			return
 		}
 
-		l := logic.NewPartTimeUserAdLogic(r.Context(), ctx)
+		l := user.NewPartTimeUserAdLogic(r.Context(), ctx)
 		resp, err := l.PartTimeUserAd(req)
 		if err != nil {
 			httpx.Error(w, err)

+ 4 - 2
internal/logic/logic_test.go → internal/logic/user/logic_test.go

@@ -1,11 +1,13 @@
-package logic
+package user
 
 import (
 	"fmt"
 	"testing"
+
+	"git.i2edu.net/i2/i2-bill-api/internal/logic/auth"
 )
 
 func TestCreateJWT(t *testing.T) {
-	l := new(LoginByWeixinLogic)
+	l := new(auth.LoginByWeixinLogic)
 	fmt.Println(l.CreateJWT(1624415746, l.svcCtx.Config.JwtAuth.AccessSecret, nil, 1000))
 }

+ 3 - 2
internal/logic/parttimeuseradlogic.go → internal/logic/user/parttimeuseradlogic.go

@@ -1,10 +1,11 @@
-package logic
+package user
 
 import (
 	"context"
+	"time"
+
 	"git.i2edu.net/i2/go-zero/core/stores/cache"
 	"git.i2edu.net/i2/i2-bill-api/model"
-	"time"
 
 	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 	"git.i2edu.net/i2/i2-bill-api/internal/types"