目录调整

internal/handler/parttimeuseraddhandler.go → internal/handler/part_time_user/parttimeuseraddhandler.go

@@ -1,13 +1,13 @@
-package handler
+package part_time_user
 
 import (
+	"git.i2edu.net/i2/i2-bill-api/internal/logic/part_time_user"
 	"net/http"
 
-	"git.i2edu.net/i2/i2-bill-api/internal/logic"
 	"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 PartTimeUserAddHandler(ctx *svc.ServiceContext) http.HandlerFunc {
@@ -18,7 +18,7 @@ func PartTimeUserAddHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 			return
 		}
 
-		l := logic.NewPartTimeUserAddLogic(r.Context(), ctx)
+		l := part_time_user.NewPartTimeUserAddLogic(r.Context(), ctx)
 		resp, err := l.PartTimeUserAdd(req)
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/parttimeuserupdatehandler.go → internal/handler/part_time_user/parttimeuserupdatehandler.go

@@ -1,9 +1,9 @@
-package handler
+package part_time_user
 
 import (
+	"git.i2edu.net/i2/i2-bill-api/internal/logic/part_time_user"
 	"net/http"
 
-	"git.i2edu.net/i2/i2-bill-api/internal/logic"
 	"git.i2edu.net/i2/i2-bill-api/internal/svc"
 	"git.i2edu.net/i2/i2-bill-api/internal/types"
 
@@ -18,7 +18,7 @@ func PartTimeUserUpdateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 			return
 		}
 
-		l := logic.NewPartTimeUserUpdateLogic(r.Context(), ctx)
+		l := part_time_user.NewPartTimeUserUpdateLogic(r.Context(), ctx)
 		resp, err := l.PartTimeUserUpdate(req)
 		if err != nil {
 			httpx.Error(w, err)

internal/handler/routes.go

@@ -2,6 +2,7 @@
 package handler
 
 import (
+	"git.i2edu.net/i2/i2-bill-api/internal/handler/part_time_user"
 	"net/http"
 
 	auth "git.i2edu.net/i2/i2-bill-api/internal/handler/auth"
@@ -52,12 +53,12 @@ func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {
 			{
 				Method:  http.MethodPost,
 				Path:    "/api/v1/part_time_user/add",
-				Handler: PartTimeUserAddHandler(serverCtx),
+				Handler: part_time_user.PartTimeUserAddHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
 				Path:    "/api/v1/part_time_user/update",
-				Handler: PartTimeUserUpdateHandler(serverCtx),
+				Handler: part_time_user.PartTimeUserUpdateHandler(serverCtx),
 			},
 		},
 		rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),

internal/logic/logic_test.go

@@ -2,11 +2,12 @@ package logic
 
 import (
 	"fmt"
+	"git.i2edu.net/i2/i2-bill-api/internal/logic/auth"
 	"testing"
 )
 
 func TestCreateJWT(t *testing.T) {
-	l := new(LoginByWeixinLogic)
+	l := new(auth.LoginByWeixinLogic)
 	payloads := map[string]interface{}{
 		"userId":     3,
 		"sessionKey": "sessionKey",

internal/logic/parttimeuseraddlogic.go → internal/logic/part_time_user/parttimeuseraddlogic.go

@@ -1,9 +1,8 @@
-package logic
+package part_time_user
 
 import (
 	"context"
 	"git.i2edu.net/i2/go-zero/core/stores/sqlx"
-	"git.i2edu.net/i2/i2-bill-api/internal/utils"
 	"git.i2edu.net/i2/i2-bill-api/model"
 	"time"
 
@@ -29,7 +28,7 @@ func NewPartTimeUserAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) Pa
 
 func (l *PartTimeUserAddLogic) PartTimeUserAdd(req types.PartTimeUserAddRequest) (*types.Response, error) {
 	// todo: add your logic here and delete this line
-	userId := utils.GetUserIdByJwt(l.ctx)
+	userId := l.svcCtx.GetUserIdByJwt(l.ctx)
 	var bean = new(model.I2billMktPartTimeUser)
 	err := l.svcCtx.SqlConn.QueryRow(bean, "select * from i2bill_mkt_part_time_user where user_id = ? and del_flag = 0", userId)
 	if err != nil && err != sqlx.ErrNotFound {

internal/logic/parttimeuserupdatelogic.go → internal/logic/part_time_user/parttimeuserupdatelogic.go

@@ -1,9 +1,8 @@
-package logic
+package part_time_user
 
 import (
 	"context"
 	"git.i2edu.net/i2/go-zero/core/stores/sqlx"
-	"git.i2edu.net/i2/i2-bill-api/internal/utils"
 	"git.i2edu.net/i2/i2-bill-api/model"
 	"time"
 
@@ -29,7 +28,8 @@ func NewPartTimeUserUpdateLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 
 func (l *PartTimeUserUpdateLogic) PartTimeUserUpdate(req types.PartTimeUserAddRequest) (*types.Response, error) {
 	// todo: add your logic here and delete this line
-	userId := utils.GetUserIdByJwt(l.ctx)
+	userId := l.svcCtx.GetUserIdByJwt(l.ctx)
+
 	var bean = new(model.I2billMktPartTimeUser)
 	err := l.svcCtx.SqlConn.QueryRow(bean, "select * from i2bill_mkt_part_time_user where user_id = ? and del_flag = 0", userId)
 	if err != nil && err != sqlx.ErrNotFound {

internal/svc/servicecontext.go

@@ -1,6 +1,7 @@
 package svc
 
 import (
+	"context"
 	"crypto/aes"
 	"crypto/cipher"
 	"encoding/base64"
@@ -204,6 +205,12 @@ func (sc *ServiceContext) GetClaims(r *http.Request) (int64, string, error) {
 	return userId, sessionKey, err
 }
 
+func (sc *ServiceContext) GetUserIdByJwt(ctx context.Context) int64 {
+	UserIdStr := ctx.Value("userId").(json.Number)
+	number, _ := strconv.ParseInt(UserIdStr.String(), 10, 64)
+	return number
+}
+
 func NewServiceContext(c config.Config) *ServiceContext {
 	svc := &ServiceContext{
 		Config:      c,

internal/utils/utils.go

@@ -1,8 +1,6 @@
 package utils
 
 import (
-	"context"
-	"encoding/json"
 	"strconv"
 	"time"
 
@@ -31,9 +29,3 @@ func String2Int64(str string) int64 {
 	number, _ := strconv.ParseInt(str, 10, 64)
 	return number
 }
-
-func GetUserIdByJwt(ctx context.Context) int64 {
-	UserIdStr := ctx.Value("userId").(json.Number)
-	return String2Int64(UserIdStr.String())
-
-}