juwan/juwan-backend
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Refactor: Remove deprecated gRPC service files and implement new API structure

Browse Source 
- Deleted old gRPC service definitions in `game_grpc.pb.go` and `public.go`.
- Added new API server implementations for objectstory, player, and shop services.
- Introduced configuration files for new APIs in `etc/*.yaml`.
- Created main entry points for each service in `objectstory.go`, `player.go`, and `shop.go`.
- Removed unused user update handler and user API files.
- Added utility functions for context management and HTTP header parsing.
- Introduced PostgreSQL backup configuration in `backup/postgreSql.yaml`.
This commit is contained in:
wwweww
2026-02-28 18:35:56 +08:00
parent d2f33b4b96
commit 19cc7a778c
349 changed files with 42548 additions and 1453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/users/api/internal/handler/user/getUserInfoHandler.go
+3 -2
View File
@@ -6,16 +6,17 @@ package user
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"juwan-backend/app/users/api/internal/logic/user"
"juwan-backend/app/users/api/internal/svc"
"juwan-backend/app/users/api/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
)
// 获取用户信息
func GetUserInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.GetUserInfoReq
var req types.GetUserReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
return
app/users/api/internal/handler/user/updateMeHandler.go
+3 -2
View File
@@ -6,16 +6,17 @@ package user
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"juwan-backend/app/users/api/internal/logic/user"
"juwan-backend/app/users/api/internal/svc"
"juwan-backend/app/users/api/internal/types"
"github.com/zeromicro/go-zero/rest/httpx"
)
// 更改当前登录用户信息
func UpdateMeHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.UpdateUserInfoReq
var req types.UpdateUserProfileReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
return
app/users/api/internal/handler/user/updateUserInfoHandler.go
-32
View File
@@ -1,32 +0,0 @@
// Code scaffolded by goctl. Safe to edit.
// goctl 1.9.2
package user
import (
"net/http"
"github.com/zeromicro/go-zero/rest/httpx"
"juwan-backend/app/users/api/internal/logic/user"
"juwan-backend/app/users/api/internal/svc"
"juwan-backend/app/users/api/internal/types"
)
// 修改用户信息
func UpdateUserInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.UpdateUserInfoReq
if err := httpx.Parse(r, &req); err != nil {
httpx.ErrorCtx(r.Context(), w, err)
return
}
l := user.NewUpdateUserInfoLogic(r.Context(), svcCtx)
resp, err := l.UpdateUserInfo(&req)
if err != nil {
httpx.ErrorCtx(r.Context(), w, err)
} else {
httpx.OkJsonCtx(r.Context(), w, resp)
}
}
}
app/users/api/internal/logic/auth/logoutLogic.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"context"
"errors"
"juwan-backend/app/users/rpc/usercenter"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"juwan-backend/app/users/api/internal/svc"
"juwan-backend/app/users/api/internal/types"
@@ -32,7 +32,7 @@ func NewLogoutLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LogoutLogi
func (l *LogoutLogic) Logout(_ *types.LogoutReq) (resp *types.EmptyResp, err error) {
// todo: add your logic here and delete this line
userId, err := contextx.UserIDFrom(l.ctx)
userId, err := contextj.UserIDFrom(l.ctx)
if err != nil {
return nil, errors.New("illegal id")
}
app/users/api/internal/logic/auth/registerLogic.go
+4 -4
View File
@@ -8,7 +8,7 @@ import (
"errors"
"juwan-backend/app/users/rpc/pb"
"juwan-backend/app/users/rpc/usercenter"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"juwan-backend/common/utils/pwdUtils"
"regexp"
@@ -57,10 +57,10 @@ func (l *RegisterLogic) Register(req *types.RegisterReq) (resp *types.RegisterRe
return nil, errors.New("hash password failed")
}
requestId, err := contextx.RequestIdFrom(l.ctx)
requestId, err := contextj.RequestIdFrom(l.ctx)
if err != nil {
logx.Errorf("contextx.RequestIdFrom failed: %v", err)
return nil, errors.New("contextx.RequestIdFrom failed")
logx.Errorf("contextj.RequestIdFrom failed: %v", err)
return nil, errors.New("contextj.RequestIdFrom failed")
}
res, err := l.svcCtx.UserRpc.Register(l.ctx, &usercenter.RegisterReq{
app/users/api/internal/logic/auth/resetPasswordLogic.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"context"
"errors"
"juwan-backend/app/users/rpc/usercenter"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"juwan-backend/common/utils/pwdUtils"
"juwan-backend/app/users/api/internal/svc"
@@ -32,7 +32,7 @@ func NewResetPasswordLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Res
}
func (l *ResetPasswordLogic) ResetPassword(req *types.ResetPasswordReq) (resp *types.EmptyResp, err error) {
requestId, err := contextx.RequestIdFrom(l.ctx)
requestId, err := contextj.RequestIdFrom(l.ctx)
if err != nil {
logx.Errorf("get request id from context failed, err:%v.", err)
return nil, errors.New("bad request")
app/users/api/internal/logic/user/getMeLogic.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
"errors"
"juwan-backend/app/users/rpc/usercenter"
"juwan-backend/common/converter"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"time"
"juwan-backend/app/users/api/internal/svc"
@@ -33,7 +33,7 @@ func NewGetMeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetMeLogic
}
func (l *GetMeLogic) GetMe() (resp *types.User, err error) {
userId, err := contextx.UserIDFrom(l.ctx)
userId, err := contextj.UserIDFrom(l.ctx)
if err != nil {
return nil, errors.New("illegal id")
}
app/users/api/internal/logic/user/switchRoleLogic.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"context"
"errors"
"juwan-backend/app/users/rpc/usercenter"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"juwan-backend/app/users/api/internal/svc"
"juwan-backend/app/users/api/internal/types"
@@ -33,7 +33,7 @@ func NewSwitchRoleLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Switch
func (l *SwitchRoleLogic) SwitchRole(req *types.SwitchRoleReq) (resp *types.EmptyResp, err error) {
// todo: add your logic here and delete this line
id, err := contextx.UserIDFrom(l.ctx)
id, err := contextj.UserIDFrom(l.ctx)
if err != nil {
logx.Errorf("get user id from context: %v", err)
return nil, errors.New("illegal id")
app/users/api/internal/logic/user/updateMeLogic.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
"errors"
"juwan-backend/app/users/rpc/usercenter"
"juwan-backend/common/converter"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"strings"
"juwan-backend/app/users/api/internal/svc"
@@ -33,7 +33,7 @@ func NewUpdateMeLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateMe
}
func (l *UpdateMeLogic) UpdateMe(req *types.UpdateUserProfileReq) (resp *types.UpdateUserProfileReq, err error) {
userId, err := contextx.UserIDFrom(l.ctx)
userId, err := contextj.UserIDFrom(l.ctx)
if err != nil {
return nil, err
}
app/users/api/internal/logic/verification_admin/approveVerificationLogic.go
+2 -2
View File
@@ -6,7 +6,7 @@ package verification_admin
import (
"context"
"juwan-backend/app/user_verifications/rpc/pb"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"time"
"juwan-backend/app/users/api/internal/svc"
@@ -35,7 +35,7 @@ var (
)
func (l *ApproveVerificationLogic) ApproveVerification(req *types.VerificationIdReq) (resp *types.VerificationEmptyResp, err error) {
adminId, err := contextx.AdminIdFrom(l.ctx)
adminId, err := contextj.AdminIdFrom(l.ctx)
if err != nil {
return nil, err
}
app/users/api/internal/logic/verification_admin/getVerificationsLogic.go
+2 -2
View File
@@ -6,7 +6,7 @@ package verification_admin
import (
"context"
"juwan-backend/app/user_verifications/rpc/pb"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"time"
"juwan-backend/app/users/api/internal/svc"
@@ -32,7 +32,7 @@ func NewGetVerificationsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
}
func (l *GetVerificationsLogic) GetVerifications(req *types.GetPendingListReq) (resp *types.GetPendingListResp, err error) {
_, err = contextx.AdminIdFrom(l.ctx)
_, err = contextj.AdminIdFrom(l.ctx)
if err != nil {
return nil, err
}
app/users/api/internal/logic/verification_admin/rejectVerificationLogic.go
+2 -2
View File
@@ -6,7 +6,7 @@ package verification_admin
import (
"context"
"juwan-backend/app/user_verifications/rpc/pb"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"time"
"juwan-backend/app/users/api/internal/svc"
@@ -34,7 +34,7 @@ var REJECTED = "rejected"
func (l *RejectVerificationLogic) RejectVerification(req *types.RejectVerificationReq) (resp *types.VerificationEmptyResp, err error) {
// todo: add your logic here and delete this line
adminId, err := contextx.AdminIdFrom(l.ctx)
adminId, err := contextj.AdminIdFrom(l.ctx)
if err != nil {
return nil, err
}
app/users/api/internal/logic/verification_user/applyVerificationLogic.go
+3 -3
View File
@@ -10,7 +10,7 @@ import (
"juwan-backend/app/user_verifications/rpc/pb"
"juwan-backend/app/users/api/internal/svc"
"juwan-backend/app/users/api/internal/types"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"github.com/zeromicro/go-zero/core/logx"
)
@@ -31,10 +31,10 @@ func NewApplyVerificationLogic(ctx context.Context, svcCtx *svc.ServiceContext)
}
func (l *ApplyVerificationLogic) ApplyVerification(req *types.ApplyVerificationReq) (resp *types.VerificationEmptyResp, err error) {
userId, err := contextx.UserIDFrom(l.ctx)
userId, err := contextj.UserIDFrom(l.ctx)
if err != nil {
logx.Errorf("get user id from context: %v", err)
return nil, contextx.ERRILLEGALUSER
return nil, contextj.ERRILLEGALUSER
}
verifications, err := l.svcCtx.UserVerificationsRpc.SearchUserVerifications(l.ctx, &pb.SearchUserVerificationsReq{
UserId: userId,
app/users/api/internal/logic/verification_user/getMyVerificationsLogic.go
+3 -3
View File
@@ -6,7 +6,7 @@ package verification_user
import (
"context"
"juwan-backend/app/user_verifications/rpc/pb"
"juwan-backend/common/utils/contextx"
"juwan-backend/common/utils/contextj"
"time"
"juwan-backend/app/users/api/internal/svc"
@@ -33,10 +33,10 @@ func NewGetMyVerificationsLogic(ctx context.Context, svcCtx *svc.ServiceContext)
func (l *GetMyVerificationsLogic) GetMyVerifications() (resp *types.GetMyVerificationsResp, err error) {
// todo: add your logic here and delete this line
userId, err := contextx.UserIDFrom(l.ctx)
userId, err := contextj.UserIDFrom(l.ctx)
if err != nil {
logx.Errorf("get user id from context: %v", err)
return nil, contextx.ERRILLEGALUSER
return nil, contextj.ERRILLEGALUSER
}
verifications, err := l.svcCtx.UserVerificationsRpc.SearchUserVerifications(l.ctx, &pb.SearchUserVerificationsReq{
app/users/api/internal/types/types.go
+6 -6
View File
@@ -41,8 +41,8 @@ type GetUserReq struct {
}
type LoginReq struct {
Phone string `json:"phone,omitempty"` // 手机号登录
Username string `json:"username,omitempty"` // 或用户名登录
Phone string `json:"phone,omitempty,optional"` // 手机号登录
Username string `json:"username,omitempty"` // 或用户名登录
Password string `json:"password"`
Remember bool `json:"remember,optional"`
}
@@ -57,8 +57,8 @@ type LogoutReq struct {
}
type RegisterReq struct {
Phone string `json:"phone,omitempty"`
Email string `json:"email,omitempty"`
Phone string `json:"phone,omitempty,optional"`
Email string `json:"email,omitempty,"`
Username string `json:"username"`
Password string `json:"password"`
Vcode string `json:"vcode,omitempty"` // 验证码
@@ -114,8 +114,8 @@ type User struct {
Role string `json:"role"` // consumer, player, owner, admin
VerifiedRoles []string `json:"verifiedRoles"` // e.g. ["consumer", "player"]
VerificationStatus map[string]string `json:"verificationStatus"` // e.g. {"player": "approved"}
Phone string `json:"phone,omitempty"`
Bio string `json:"bio,omitempty"`
Phone string `json:"phone,omitempty,optional "`
Bio string `json:"bio,omitempty,optional "`
CreatedAt string `json:"createdAt"` // ISO 8601
}