rogee/quyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: rogee:88d42470c4fc7cfa6d579c947eebec16a2fb124b
Branches Tags
rogee:main rogee:master
...
compare: rogee:40df9604d8f75bab84671bf2b7b9b7d5a5e699e6
Branches Tags
rogee:main rogee:master

3 Commits
88d42470c4 ... 40df9604d8

Author SHA1 Message Date
Rogee
40df9604d8 fix: 修改用户列表查询条件以支持通过手机号搜索
Some checks failed
build quyun / Build (push) Failing after 1m24s
Details
2025-12-20 14:33:05 +08:00
Rogee
0185e51396 feat: support set user phone 2025-12-20 14:27:29 +08:00
Rogee
8e95dada82 fix: issues 2025-12-20 14:11:44 +08:00
19 changed files with 230 additions and 93 deletions
Expand all files Collapse all files

2
backend_v1/app/http/admin/auth.go
View File

@@ -28,7 +28,7 @@ type TokenResponse struct {
// @Produce json
// @Param body body AuthBody true "请求体"
// @Success 200 {object} TokenResponse "成功"
// @Router /admin/auth [post]
// @Router /admin/v1/auth [post]
// @Bind body body
func (ctl *auth) Login(ctx fiber.Ctx, body *AuthBody) (*TokenResponse, error) {
if body.Username == "pl.yang" && body.Password == "Xixi@0202" {

14
backend_v1/app/http/admin/medias.go
View File

@@ -8,6 +8,7 @@ import (
"quyun/v2/providers/ali"
"github.com/gofiber/fiber/v3"
"go.ipao.vip/gen"
)
// @provider
@@ -23,11 +24,16 @@ type medias struct {
// @Param pagination query requests.Pagination false "分页参数"
// @Param query query ListQuery false "筛选条件"
// @Success 200 {object} requests.Pager{items=models.Medium} "成功"
// @Router /admin/medias [get]
// @Router /admin/v1/medias [get]
// @Bind pagination query
// @Bind query query
func (ctl *medias) List(ctx fiber.Ctx, pagination *requests.Pagination, query *ListQuery) (*requests.Pager, error) {
return services.Media.List(ctx, pagination, models.MediumQuery.Name.Like(database.WrapLike(*query.Keyword)))
conds := []gen.Condition{}
if query.Keyword != nil {
conds = append(conds, models.MediumQuery.Name.Like(database.WrapLike(*query.Keyword)))
}
return services.Media.List(ctx, pagination, conds...)
}
// Show media
@@ -36,7 +42,7 @@ func (ctl *medias) List(ctx fiber.Ctx, pagination *requests.Pagination, query *L
// @Tags Admin Medias
// @Param id path int64 true "媒体 ID"
// @Success 302 {string} string "跳转"
// @Router /admin/medias/:id [get]
// @Router /admin/v1/medias/:id [get]
// @Bind media path key(id) model(id)
func (ctl *medias) Show(ctx fiber.Ctx, media *models.Medium) error {
url, err := ctl.oss.GetSignedUrl(ctx, media.Path)
@@ -54,7 +60,7 @@ func (ctl *medias) Show(ctx fiber.Ctx, media *models.Medium) error {
// @Produce json
// @Param id path int64 true "媒体 ID"
// @Success 204 {object} any "成功"
// @Router /admin/medias/:id [delete]
// @Router /admin/v1/medias/:id [delete]
// @Bind media path key(id) model(id)
func (ctl *medias) Delete(ctx fiber.Ctx, media *models.Medium) error {
if err := ctl.oss.Delete(ctx, media.Path); err != nil {

4
backend_v1/app/http/admin/orders.go
View File

@@ -25,7 +25,7 @@ type orders struct{}
// @Param pagination query requests.Pagination false "分页参数"
// @Param query query OrderListQuery false "筛选条件"
// @Success 200 {object} requests.Pager{items=services.OrderListItem} "成功"
// @Router /admin/orders [get]
// @Router /admin/v1/orders [get]
// @Bind pagination query
// @Bind query query
func (ctl *orders) List(
@@ -52,7 +52,7 @@ func (ctl *orders) List(
// @Produce json
// @Param id path int64 true "订单 ID"
// @Success 200 {object} any "成功"
// @Router /admin/orders/:id/refund [post]
// @Router /admin/v1/orders/:id/refund [post]
// @Bind order path key(id) model(id)
func (ctl *orders) Refund(ctx fiber.Ctx, order *models.Order) error {
return services.Orders.Refund(ctx, order)

18
backend_v1/app/http/admin/posts.go
View File

@@ -3,6 +3,7 @@ package admin
import (
"quyun/v2/app/requests"
"quyun/v2/app/services"
"quyun/v2/database"
"quyun/v2/database/models"
"quyun/v2/pkg/fields"
@@ -27,12 +28,13 @@ type posts struct{}
// @Param pagination query requests.Pagination false "分页参数"
// @Param query query ListQuery false "筛选条件"
// @Success 200 {object} requests.Pager{items=PostItem} "成功"
// @Router /admin/posts [get]
// @Router /admin/v1/posts [get]
// @Bind pagination query
// @Bind query query
func (ctl *posts) List(ctx fiber.Ctx, pagination *requests.Pagination, query *ListQuery) (*requests.Pager, error) {
conds := []gen.Condition{
models.PostQuery.Title.Like(*query.Keyword),
conds := []gen.Condition{}
if query.Keyword != nil && *query.Keyword != "" {
conds = append(conds, models.PostQuery.Title.Like(database.WrapLike(*query.Keyword)))
}
pager, err := services.Posts.List(ctx, pagination, conds...)
if err != nil {
@@ -81,7 +83,7 @@ type PostForm struct {
// @Produce json
// @Param form body PostForm true "请求体"
// @Success 200 {object} any "成功"
// @Router /admin/posts [post]
// @Router /admin/v1/posts [post]
// @Bind form body
func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error {
post := models.Post{
@@ -126,7 +128,7 @@ func (ctl *posts) Create(ctx fiber.Ctx, form *PostForm) error {
// @Param id path int64 true "作品 ID"
// @Param form body PostForm true "请求体"
// @Success 200 {object} any "成功"
// @Router /admin/posts/:id [put]
// @Router /admin/v1/posts/:id [put]
// @Bind post path key(id) model(id)
// @Bind form body
func (ctl *posts) Update(ctx fiber.Ctx, post *models.Post, form *PostForm) error {
@@ -167,7 +169,7 @@ func (ctl *posts) Update(ctx fiber.Ctx, post *models.Post, form *PostForm) error
// @Produce json
// @Param id path int64 true "作品 ID"
// @Success 204 {object} any "成功"
// @Router /admin/posts/:id [delete]
// @Router /admin/v1/posts/:id [delete]
// @Bind post path key(id) model(id)
func (ctl *posts) Delete(ctx fiber.Ctx, post *models.Post) error {
if _, err := post.ForceDelete(ctx); err != nil {
@@ -189,7 +191,7 @@ type PostItem struct {
// @Produce json
// @Param id path int64 true "作品 ID"
// @Success 200 {object} PostItem "成功"
// @Router /admin/posts/:id [get]
// @Router /admin/v1/posts/:id [get]
// @Bind post path key(id) model(id)
func (ctl *posts) Show(ctx fiber.Ctx, post *models.Post) (*PostItem, error) {
medias, err := services.Media.GetByIds(ctx, lo.Map(post.Assets.Data(), func(asset fields.MediaAsset, _ int) int64 {
@@ -212,7 +214,7 @@ func (ctl *posts) Show(ctx fiber.Ctx, post *models.Post) (*PostItem, error) {
// @Param id path int64 true "作品 ID"
// @Param userId path int64 true "用户 ID"
// @Success 200 {object} any "成功"
// @Router /admin/posts/:id/send-to/:userId [post]
// @Router /admin/v1/posts/:id/send-to/:userId [post]
// @Bind post path key(id) model(id)
// @Bind user path key(userId) model(id)
func (ctl *posts) SendTo(ctx fiber.Ctx, post *models.Post, user *models.User) error {

85
backend_v1/app/http/admin/routes.gen.go
View File

@@ -50,28 +50,28 @@ func (r *Routes) Name() string {
// Each route is registered with its corresponding controller action and parameter bindings.
func (r *Routes) Register(router fiber.Router) {
// Register routes for controller: auth
r.log.Debugf("Registering route: Post /admin/auth -> auth.Login")
router.Post("/admin/auth"[len(r.Path()):], DataFunc1(
r.log.Debugf("Registering route: Post /admin/v1/auth -> auth.Login")
router.Post("/admin/v1/auth"[len(r.Path()):], DataFunc1(
r.auth.Login,
Body[AuthBody]("body"),
))
// Register routes for controller: medias
r.log.Debugf("Registering route: Delete /admin/medias/:id -> medias.Delete")
router.Delete("/admin/medias/:id"[len(r.Path()):], Func1(
r.log.Debugf("Registering route: Delete /admin/v1/medias/:id -> medias.Delete")
router.Delete("/admin/v1/medias/:id"[len(r.Path()):], Func1(
r.medias.Delete,
func(ctx fiber.Ctx) (*models.Medium, error) {
v := fiber.Params[int](ctx, "id")
return models.MediumQuery.WithContext(ctx).Where(field.NewUnsafeFieldRaw("id = ?", v)).First()
},
))
r.log.Debugf("Registering route: Get /admin/medias -> medias.List")
router.Get("/admin/medias"[len(r.Path()):], DataFunc2(
r.log.Debugf("Registering route: Get /admin/v1/medias -> medias.List")
router.Get("/admin/v1/medias"[len(r.Path()):], DataFunc2(
r.medias.List,
Query[requests.Pagination]("pagination"),
Query[ListQuery]("query"),
))
r.log.Debugf("Registering route: Get /admin/medias/:id -> medias.Show")
router.Get("/admin/medias/:id"[len(r.Path()):], Func1(
r.log.Debugf("Registering route: Get /admin/v1/medias/:id -> medias.Show")
router.Get("/admin/v1/medias/:id"[len(r.Path()):], Func1(
r.medias.Show,
func(ctx fiber.Ctx) (*models.Medium, error) {
v := fiber.Params[int](ctx, "id")
@@ -79,14 +79,14 @@ func (r *Routes) Register(router fiber.Router) {
},
))
// Register routes for controller: orders
r.log.Debugf("Registering route: Get /admin/orders -> orders.List")
router.Get("/admin/orders"[len(r.Path()):], DataFunc2(
r.log.Debugf("Registering route: Get /admin/v1/orders -> orders.List")
router.Get("/admin/v1/orders"[len(r.Path()):], DataFunc2(
r.orders.List,
Query[requests.Pagination]("pagination"),
Query[OrderListQuery]("query"),
))
r.log.Debugf("Registering route: Post /admin/orders/:id/refund -> orders.Refund")
router.Post("/admin/orders/:id/refund"[len(r.Path()):], Func1(
r.log.Debugf("Registering route: Post /admin/v1/orders/:id/refund -> orders.Refund")
router.Post("/admin/v1/orders/:id/refund"[len(r.Path()):], Func1(
r.orders.Refund,
func(ctx fiber.Ctx) (*models.Order, error) {
v := fiber.Params[int](ctx, "id")
@@ -94,35 +94,35 @@ func (r *Routes) Register(router fiber.Router) {
},
))
// Register routes for controller: posts
r.log.Debugf("Registering route: Delete /admin/posts/:id -> posts.Delete")
router.Delete("/admin/posts/:id"[len(r.Path()):], Func1(
r.log.Debugf("Registering route: Delete /admin/v1/posts/:id -> posts.Delete")
router.Delete("/admin/v1/posts/:id"[len(r.Path()):], Func1(
r.posts.Delete,
func(ctx fiber.Ctx) (*models.Post, error) {
v := fiber.Params[int](ctx, "id")
return models.PostQuery.WithContext(ctx).Where(field.NewUnsafeFieldRaw("id = ?", v)).First()
},
))
r.log.Debugf("Registering route: Get /admin/posts -> posts.List")
router.Get("/admin/posts"[len(r.Path()):], DataFunc2(
r.log.Debugf("Registering route: Get /admin/v1/posts -> posts.List")
router.Get("/admin/v1/posts"[len(r.Path()):], DataFunc2(
r.posts.List,
Query[requests.Pagination]("pagination"),
Query[ListQuery]("query"),
))
r.log.Debugf("Registering route: Get /admin/posts/:id -> posts.Show")
router.Get("/admin/posts/:id"[len(r.Path()):], DataFunc1(
r.log.Debugf("Registering route: Get /admin/v1/posts/:id -> posts.Show")
router.Get("/admin/v1/posts/:id"[len(r.Path()):], DataFunc1(
r.posts.Show,
func(ctx fiber.Ctx) (*models.Post, error) {
v := fiber.Params[int](ctx, "id")
return models.PostQuery.WithContext(ctx).Where(field.NewUnsafeFieldRaw("id = ?", v)).First()
},
))
r.log.Debugf("Registering route: Post /admin/posts -> posts.Create")
router.Post("/admin/posts"[len(r.Path()):], Func1(
r.log.Debugf("Registering route: Post /admin/v1/posts -> posts.Create")
router.Post("/admin/v1/posts"[len(r.Path()):], Func1(
r.posts.Create,
Body[PostForm]("form"),
))
r.log.Debugf("Registering route: Post /admin/posts/:id/send-to/:userId -> posts.SendTo")
router.Post("/admin/posts/:id/send-to/:userId"[len(r.Path()):], Func2(
r.log.Debugf("Registering route: Post /admin/v1/posts/:id/send-to/:userId -> posts.SendTo")
router.Post("/admin/v1/posts/:id/send-to/:userId"[len(r.Path()):], Func2(
r.posts.SendTo,
func(ctx fiber.Ctx) (*models.Post, error) {
v := fiber.Params[int](ctx, "id")
@@ -133,8 +133,8 @@ func (r *Routes) Register(router fiber.Router) {
return models.UserQuery.WithContext(ctx).Where(field.NewUnsafeFieldRaw("id = ?", v)).First()
},
))
r.log.Debugf("Registering route: Put /admin/posts/:id -> posts.Update")
router.Put("/admin/posts/:id"[len(r.Path()):], Func2(
r.log.Debugf("Registering route: Put /admin/v1/posts/:id -> posts.Update")
router.Put("/admin/v1/posts/:id"[len(r.Path()):], Func2(
r.posts.Update,
func(ctx fiber.Ctx) (*models.Post, error) {
v := fiber.Params[int](ctx, "id")
@@ -143,40 +143,40 @@ func (r *Routes) Register(router fiber.Router) {
Body[PostForm]("form"),
))
// Register routes for controller: statistics
r.log.Debugf("Registering route: Get /admin/statistics -> statistics.statistics")
router.Get("/admin/statistics"[len(r.Path()):], DataFunc0(
r.log.Debugf("Registering route: Get /admin/v1/statistics -> statistics.statistics")
router.Get("/admin/v1/statistics"[len(r.Path()):], DataFunc0(
r.statistics.statistics,
))
// Register routes for controller: uploads
r.log.Debugf("Registering route: Get /admin/uploads/pre-uploaded-check/:md5.:ext -> uploads.PreUploadCheck")
router.Get("/admin/uploads/pre-uploaded-check/:md5.:ext"[len(r.Path()):], DataFunc3(
r.log.Debugf("Registering route: Get /admin/v1/uploads/pre-uploaded-check/:md5.:ext -> uploads.PreUploadCheck")
router.Get("/admin/v1/uploads/pre-uploaded-check/:md5.:ext"[len(r.Path()):], DataFunc3(
r.uploads.PreUploadCheck,
PathParam[string]("md5"),
PathParam[string]("ext"),
QueryParam[string]("mime"),
))
r.log.Debugf("Registering route: Post /admin/uploads/post-uploaded-action -> uploads.PostUploadedAction")
router.Post("/admin/uploads/post-uploaded-action"[len(r.Path()):], Func1(
r.log.Debugf("Registering route: Post /admin/v1/uploads/post-uploaded-action -> uploads.PostUploadedAction")
router.Post("/admin/v1/uploads/post-uploaded-action"[len(r.Path()):], Func1(
r.uploads.PostUploadedAction,
Body[PostUploadedForm]("body"),
))
// Register routes for controller: users
r.log.Debugf("Registering route: Get /admin/users -> users.List")
router.Get("/admin/users"[len(r.Path()):], DataFunc2(
r.log.Debugf("Registering route: Get /admin/v1/users -> users.List")
router.Get("/admin/v1/users"[len(r.Path()):], DataFunc2(
r.users.List,
Query[requests.Pagination]("pagination"),
Query[UserListQuery]("query"),
))
r.log.Debugf("Registering route: Get /admin/users/:id -> users.Show")
router.Get("/admin/users/:id"[len(r.Path()):], DataFunc1(
r.log.Debugf("Registering route: Get /admin/v1/users/:id -> users.Show")
router.Get("/admin/v1/users/:id"[len(r.Path()):], DataFunc1(
r.users.Show,
func(ctx fiber.Ctx) (*models.User, error) {
v := fiber.Params[int](ctx, "id")
return models.UserQuery.WithContext(ctx).Where(field.NewUnsafeFieldRaw("id = ?", v)).First()
},
))
r.log.Debugf("Registering route: Get /admin/users/:id/articles -> users.Articles")
router.Get("/admin/users/:id/articles"[len(r.Path()):], DataFunc2(
r.log.Debugf("Registering route: Get /admin/v1/users/:id/articles -> users.Articles")
router.Get("/admin/v1/users/:id/articles"[len(r.Path()):], DataFunc2(
r.users.Articles,
func(ctx fiber.Ctx) (*models.User, error) {
v := fiber.Params[int](ctx, "id")
@@ -184,8 +184,8 @@ func (r *Routes) Register(router fiber.Router) {
},
Query[requests.Pagination]("pagination"),
))
r.log.Debugf("Registering route: Post /admin/users/:id/balance -> users.Balance")
router.Post("/admin/users/:id/balance"[len(r.Path()):], Func2(
r.log.Debugf("Registering route: Post /admin/v1/users/:id/balance -> users.Balance")
router.Post("/admin/v1/users/:id/balance"[len(r.Path()):], Func2(
r.users.Balance,
func(ctx fiber.Ctx) (*models.User, error) {
v := fiber.Params[int](ctx, "id")
@@ -193,6 +193,15 @@ func (r *Routes) Register(router fiber.Router) {
},
Body[UserBalance]("balance"),
))
r.log.Debugf("Registering route: Post /admin/v1/users/:id/phone -> users.SetPhone")
router.Post("/admin/v1/users/:id/phone"[len(r.Path()):], Func2(
r.users.SetPhone,
func(ctx fiber.Ctx) (*models.User, error) {
v := fiber.Params[int](ctx, "id")
return models.UserQuery.WithContext(ctx).Where(field.NewUnsafeFieldRaw("id = ?", v)).First()
},
Body[UserPhoneForm]("form"),
))
r.log.Info("Successfully registered all routes")
}

2
backend_v1/app/http/admin/statistics.go
View File

@@ -26,7 +26,7 @@ type StatisticsResponse struct {
// @Tags Admin Statistics
// @Produce json
// @Success 200 {object} StatisticsResponse "成功"
// @Router /admin/statistics [get]
// @Router /admin/v1/statistics [get]
func (s *statistics) statistics(ctx fiber.Ctx) (*StatisticsResponse, error) {
statistics := &StatisticsResponse{}

4
backend_v1/app/http/admin/uploads.go
View File

@@ -41,7 +41,7 @@ type PreCheckResp struct {
// @Param ext path string true "文件扩展名（不含点）"
// @Param mime query string true "文件 MIME 类型"
// @Success 200 {object} PreCheckResp "成功"
// @Router /admin/uploads/pre-uploaded-check/:md5.:ext [get]
// @Router /admin/v1/uploads/pre-uploaded-check/:md5.:ext [get]
// @Bind md5 path
// @Bind ext path
// @Bind mime query
@@ -74,7 +74,7 @@ type PostUploadedForm struct {
// @Produce json
// @Param body body PostUploadedForm true "请求体"
// @Success 200 {object} any "成功"
// @Router /admin/uploads/post-uploaded-action [post]
// @Router /admin/v1/uploads/post-uploaded-action [post]
// @Bind body body
func (up *uploads) PostUploadedAction(ctx fiber.Ctx, body *PostUploadedForm) error {
m, err := services.Media.GetByHash(ctx, body.Md5)

35
backend_v1/app/http/admin/users.go
View File

@@ -25,12 +25,15 @@ type users struct{}
// @Param pagination query requests.Pagination false "分页参数"
// @Param query query UserListQuery false "筛选条件"
// @Success 200 {object} requests.Pager{items=models.User} "成功"
// @Router /admin/users [get]
// @Router /admin/v1/users [get]
// @Bind pagination query
// @Bind query query
func (ctl *users) List(ctx fiber.Ctx, pagination *requests.Pagination, query *UserListQuery) (*requests.Pager, error) {
conds := []gen.Condition{
models.UserQuery.Username.Like(database.WrapLike(*query.Keyword)),
conds := []gen.Condition{}
if query.Keyword != nil && *query.Keyword != "" {
conds = append(conds,
models.UserQuery.Phone.Like(database.WrapLike(*query.Keyword)),
)
}
return services.Users.List(ctx, pagination, conds...)
}
@@ -42,7 +45,7 @@ func (ctl *users) List(ctx fiber.Ctx, pagination *requests.Pagination, query *Us
// @Produce json
// @Param id path int64 true "用户 ID"
// @Success 200 {object} models.User "成功"
// @Router /admin/users/:id [get]
// @Router /admin/v1/users/:id [get]
// @Bind user path key(id) model(id)
func (ctl *users) Show(ctx fiber.Ctx, user *models.User) (*models.User, error) {
return user, nil
@@ -56,7 +59,7 @@ func (ctl *users) Show(ctx fiber.Ctx, user *models.User) (*models.User, error) {
// @Param id path int64 true "用户 ID"
// @Param pagination query requests.Pagination false "分页参数"
// @Success 200 {object} requests.Pager{items=models.Post} "成功"
// @Router /admin/users/:id/articles [get]
// @Router /admin/v1/users/:id/articles [get]
// @Bind user path key(id) model(id)
// @Bind pagination query
func (ctl *users) Articles(ctx fiber.Ctx, user *models.User, pagination *requests.Pagination) (*requests.Pager, error) {
@@ -67,6 +70,10 @@ type UserBalance struct {
Balance int64 `json:"balance"`
}
type UserPhoneForm struct {
Phone string `json:"phone"` // 用户手机号（11 位数字）
}
// Balance
//
// @Summary 调整用户余额
@@ -76,9 +83,25 @@ type UserBalance struct {
// @Param id path int64 true "用户 ID"
// @Param balance body UserBalance true "请求体"
// @Success 200 {object} any "成功"
// @Router /admin/users/:id/balance [post]
// @Router /admin/v1/users/:id/balance [post]
// @Bind user path key(id) model(id)
// @Bind balance body
func (ctl *users) Balance(ctx fiber.Ctx, user *models.User, balance *UserBalance) error {
return services.Users.AddBalance(ctx, user.ID, balance.Balance)
}
// SetPhone
//
// @Summary 设置用户手机号
// @Tags Admin Users
// @Accept json
// @Produce json
// @Param id path int64 true "用户 ID"
// @Param form body UserPhoneForm true "请求体"
// @Success 200 {object} any "成功"
// @Router /admin/v1/users/:id/phone [post]
// @Bind user path key(id) model(id)
// @Bind form body
func (ctl *users) SetPhone(ctx fiber.Ctx, user *models.User, form *UserPhoneForm) error {
return services.Users.SetPhone(ctx, user.ID, form.Phone)
}

39
backend_v1/app/services/users.go
View File

@@ -42,9 +42,12 @@ func (m *users) List(
conds ...gen.Condition,
) (*requests.Pager, error) {
pagination.Format()
_, query := models.UserQuery.QueryContext(ctx)
tbl, query := models.UserQuery.QueryContext(ctx)
items, cnt, err := query.Where(conds...).FindByPage(int(pagination.Offset()), int(pagination.Limit))
items, cnt, err := query.
Where(conds...).
Order(tbl.ID.Desc()).
FindByPage(int(pagination.Offset()), int(pagination.Limit))
if err != nil {
return nil, errors.Wrap(err, "query users error")
}
@@ -361,3 +364,35 @@ func (m *users) ValidatePhoneCode(ctx context.Context, phone, code string) (*mod
return user, nil
}
// SetPhone 管理端设置用户手机号。
func (m *users) SetPhone(ctx context.Context, userID int64, phone string) error {
phone = strings.TrimSpace(phone)
if phone == "" {
return errors.New("手机号不能为空")
}
if len(phone) != 11 {
return errors.New("手机号必须为 11 位数字")
}
for _, r := range phone {
if r < '0' || r > '9' {
return errors.New("手机号必须为 11 位数字")
}
}
// 业务约束：手机号建议全局唯一（至少在本系统内），避免登录/验证身份混淆。
tbl, query := models.UserQuery.QueryContext(ctx)
_, err := query.Where(tbl.Phone.Eq(phone), tbl.ID.Neq(userID)).First()
if err == nil {
return errors.New("手机号已被其他用户占用")
}
if !errors.Is(err, gorm.ErrRecordNotFound) {
return errors.Wrap(err, "failed to check phone uniqueness")
}
// 仅更新 phone 字段，避免覆盖其它字段。
if _, err := query.Where(tbl.ID.Eq(userID)).Update(tbl.Phone, phone); err != nil {
return errors.Wrap(err, "failed to update user phone")
}
return nil
}

2
frontend/admin/src/api/apiClient.js
View File

@@ -2,7 +2,7 @@ import axios from 'axios';
// Create a base axios instance
export const apiClient = axios.create({
baseURL: import.meta.env.VITE_API_BASE_URL || '/v1',
baseURL: import.meta.env.VITE_API_BASE_URL || '',
timeout: 10000,
headers: {
'Content-Type': 'application/json',

2
frontend/admin/src/api/authService.js
View File

@@ -2,6 +2,6 @@ import httpClient from './httpClient';
export const authService = {
login(username, password) {
return httpClient.post('/admin/auth', { username, password });
return httpClient.post('/auth', { username, password });
},
};

2
frontend/admin/src/api/httpClient.js
View File

@@ -4,7 +4,7 @@ import axios from 'axios';
// Create axios instance with default config
const httpClient = axios.create({
baseURL: '/v1',
baseURL: '/admin/v1',
timeout: 10000,
headers: {
'Content-Type': 'application/json',

12
frontend/admin/src/api/mediaService.js
View File

@@ -2,30 +2,30 @@ import httpClient from './httpClient';
export const mediaService = {
getMedias({ page = 1, limit = 10 } = {}) {
return httpClient.get('/admin/medias', {
return httpClient.get('/medias', {
params: { page, limit }
});
},
createMedia(mediaInfo) {
return httpClient.post('/admin/medias', mediaInfo);
return httpClient.post('/medias', mediaInfo);
},
preUploadedCheck(md5, ext, mime) {
return httpClient.get(`/admin/uploads/pre-uploaded-check/${md5}.${ext}`, {
return httpClient.get(`/uploads/pre-uploaded-check/${md5}.${ext}`, {
params: { mime }
});
},
uploadedSuccess(data) {
return httpClient.post('/admin/uploads/post-uploaded-action', data);
return httpClient.post('/uploads/post-uploaded-action', data);
},
getMediaPreviewUrl(id) {
const token = localStorage.getItem('__token');
return `${httpClient.defaults.baseURL}/admin/medias/${id}?token=${token}`;
return `${httpClient.defaults.baseURL}/medias/${id}?token=${token}`;
},
delete(id) {
return httpClient.delete(`/admin/medias/${id}`);
return httpClient.delete(`/medias/${id}`);
},
};

4
frontend/admin/src/api/orderService.js
View File

@@ -2,7 +2,7 @@ import httpClient from './httpClient';
export const orderService = {
get({ page = 1, limit = 10, keyword = '' } = {}) {
return httpClient.get('/admin/orders', {
return httpClient.get('/orders', {
params: {
page,
limit,
@@ -11,6 +11,6 @@ export const orderService = {
});
},
refund(id) {
return httpClient.post(`/admin/orders/${id}/refund`);
return httpClient.post(`/orders/${id}/refund`);
}
}

12
frontend/admin/src/api/postService.js
View File

@@ -2,7 +2,7 @@ import httpClient from './httpClient';
export const postService = {
getPosts({ page = 1, limit = 10, keyword = '' } = {}) {
return httpClient.get('/admin/posts', {
return httpClient.get('/posts', {
params: {
page,
limit,
@@ -11,19 +11,19 @@ export const postService = {
});
},
getPost(id) {
return httpClient.get(`/admin/posts/${id}`);
return httpClient.get(`/posts/${id}`);
},
createPost(post) {
return httpClient.post('/admin/posts', post);
return httpClient.post('/posts', post);
},
updatePost(id, post) {
return httpClient.put(`/admin/posts/${id}`, post);
return httpClient.put(`/posts/${id}`, post);
},
deletePost(id) {
return httpClient.delete(`/admin/posts/${id}`);
return httpClient.delete(`/posts/${id}`);
},
sendTo(id, userId) {
return httpClient.post(`/admin/posts/${id}/send-to/${userId}`);
return httpClient.post(`/posts/${id}/send-to/${userId}`);
},
}

2
frontend/admin/src/api/statisticsService.js
View File

@@ -2,6 +2,6 @@ import httpClient from './httpClient';
export const statisticsService = {
get() {
return httpClient.get('/admin/statistics');
return httpClient.get('/statistics');
},
}

21
frontend/admin/src/api/userService.js
View File

@@ -2,7 +2,7 @@ import httpClient from './httpClient';
export const userService = {
getUsers({ page = 1, limit = 10, keyword = '' } = {}) {
return httpClient.get('/admin/users', {
return httpClient.get('/users', {
params: {
page,
limit,
@@ -11,28 +11,33 @@ export const userService = {
});
},
searchUser(id) {
return httpClient.get(`/admin/users/${id}`);
return httpClient.get(`/users/${id}`);
},
userBalance(id, balance) {
return httpClient.post(`/admin/users/${id}/balance`, {
return httpClient.post(`/users/${id}/balance`, {
balance
});
},
setPhone(id, phone) {
return httpClient.post(`/users/${id}/phone`, {
phone
});
},
getUser(id) {
return httpClient.get(`/admin/users/${id}`);
return httpClient.get(`/users/${id}`);
},
deleteUser(id) {
return httpClient.delete(`/admin/users/${id}`);
return httpClient.delete(`/users/${id}`);
},
getUserById(id) {
return httpClient.get(`/admin/users/${id}`);
return httpClient.get(`/users/${id}`);
},
getUserArticles(userId, page, limit) {
return httpClient.get(`/admin/users/${userId}/articles`, {
return httpClient.get(`/users/${userId}/articles`, {
params: {
page,
limit,
}
});
}
}
}

59
frontend/admin/src/pages/UserPage.vue
View File

@@ -6,6 +6,7 @@ import Button from 'primevue/button';
import Column from 'primevue/column';
import ConfirmDialog from 'primevue/confirmdialog';
import DataTable from 'primevue/datatable';
import Dialog from 'primevue/dialog';
import InputText from 'primevue/inputtext';
import ProgressSpinner from 'primevue/progressspinner';
import Toast from 'primevue/toast';
@@ -36,6 +37,11 @@ const users = ref({
const first = ref(0);
const rows = ref(10);
const phoneDialogVisible = ref(false);
const phoneSaving = ref(false);
const phoneTargetUser = ref(null);
const phoneInput = ref('');
const fetchUsers = async () => {
loading.value = true;
try {
@@ -100,6 +106,36 @@ const handleRecharge = (user) => {
});
};
const openPhoneDialog = (user) => {
phoneTargetUser.value = user;
phoneInput.value = (user?.phone || '').toString();
phoneDialogVisible.value = true;
};
const normalizePhone = (v) => v.toString().replace(/\D/g, '').slice(0, 11);
const savePhone = async () => {
if (!phoneTargetUser.value) return;
const phone = normalizePhone(phoneInput.value);
if (phone.length !== 11) {
toast.add({ severity: 'error', summary: '错误', detail: '手机号必须为 11 位数字', life: 3000 });
return;
}
phoneSaving.value = true;
try {
await userService.setPhone(phoneTargetUser.value.id, phone);
toast.add({ severity: 'success', summary: '成功', detail: '手机号已更新', life: 3000 });
phoneDialogVisible.value = false;
await fetchUsers();
} catch (error) {
console.error('Failed to set phone:', error);
toast.add({ severity: 'error', summary: '错误', detail: error?.response?.data?.message || '设置手机号失败', life: 3000 });
} finally {
phoneSaving.value = false;
}
};
onMounted(() => {
fetchUsers();
});
@@ -108,6 +144,25 @@ onMounted(() => {
<template>
<Toast />
<ConfirmDialog />
<Dialog v-model:visible="phoneDialogVisible" modal header="设置手机号" :style="{ width: '420px' }">
<div class="space-y-3">
<div class="text-sm text-gray-600" v-if="phoneTargetUser">
用户：{{ phoneTargetUser.username }}（ID: {{ phoneTargetUser.id }}）
</div>
<div>
<label class="block text-sm font-medium text-gray-700 mb-1">手机号</label>
<InputText v-model="phoneInput" class="w-full" placeholder="请输入 11 位手机号" inputmode="numeric"
maxlength="11" @input="(e) => phoneInput = normalizePhone(e.target.value)" />
</div>
</div>
<template #footer>
<div class="flex justify-end gap-2">
<Button label="取消" text @click="phoneDialogVisible = false" />
<Button label="保存" severity="success" :loading="phoneSaving" @click="savePhone" />
</div>
</template>
</Dialog>
<div class="w-full">
<div class="flex justify-between items-center mb-6">
@@ -164,7 +219,7 @@ onMounted(() => {
</template>
</Column>
<Column field="open_id" header="OpenID" sortable></Column>
<Column field="phone" header="Phone" sortable></Column>
<Column field="status" header="状态" sortable>
<template #body="{ data }">
@@ -187,6 +242,8 @@ onMounted(() => {
<div class="flex justify-center space-x-2">
<Button icon="pi pi-credit-card" rounded text severity="success"
@click="handleRecharge(data)" label="充值" />
<Button icon="pi pi-phone" rounded text severity="info" @click="openPhoneDialog(data)"
label="设置手机号" />
</div>
</template>
</Column>

4
frontend/admin/vite.config.js
View File

@@ -27,11 +27,11 @@ export default defineConfig({
},
server: {
host: '0.0.0.0',
allowedHosts: ['mp.jdwan.com'],
allowedHosts: ['mp.jdwan.com'],
port: 3000,
open: true,
proxy: {
'/v1': 'http://localhost:8088',
'/admin/v1': 'http://localhost:8088',
}
}
});