1

server/styleagent/controller/user_controller.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"slogan-agent/common"
-	"slogan-agent/styleagent/dao"
 	"slogan-agent/styleagent/model/dto"
 	"slogan-agent/styleagent/service"
 
@@ -15,33 +14,18 @@ type user struct{}
 
 var User = new(user)
 
-func (c *user) Register(ctx context.Context, req *dto.RegisterReq) (res *struct{}, err error) {
-	_, err = service.UserService.Register(ctx, req.Account, req.Password, req.Name)
-	if err != nil {
-		return nil, err
-	}
-	return &struct{}{}, nil
+func (c *user) Register(ctx context.Context, req *dto.RegisterReq) (res *dto.RegisterRes, err error) {
+	return service.UserService.Register(ctx, req)
 }
 
 func (c *user) Login(ctx context.Context, req *dto.LoginReq) (res *dto.LoginRes, err error) {
-	user, token, err := service.UserService.Login(ctx, req.Account, req.Password)
-	if err != nil {
-		return nil, err
-	}
-	return &dto.LoginRes{
-		Token: token,
-		User:  &dto.LoginUser{Id: user.Id, Role: user.Role, Name: user.Name},
-	}, nil
+	return service.UserService.Login(ctx, req)
 }
 
-func (c *user) ChangePassword(ctx context.Context, req *dto.ChangePasswordReq) (res *struct{}, err error) {
-	return nil, service.UserService.ChangePassword(ctx, common.GetUserId(g.RequestFromCtx(ctx)), req.OldPassword, req.NewPassword)
+func (c *user) ChangePassword(ctx context.Context, req *dto.ChangePasswordReq) (res *dto.ChangePasswordRes, err error) {
+	return service.UserService.ChangePassword(ctx, common.GetUserId(g.RequestFromCtx(ctx)), req)
 }
 
 func (c *user) Profile(ctx context.Context, req *dto.ProfileReq) (res *dto.ProfileRes, err error) {
-	user, err := dao.User.GetOne(ctx, common.GetUserId(g.RequestFromCtx(ctx)))
-	if err != nil || user == nil {
-		return nil, err
-	}
-	return &dto.ProfileRes{Id: user.Id, Role: user.Role, Name: user.Name, Username: user.Username, Phone: user.Phone}, nil
+	return service.UserService.Profile(ctx, common.GetUserId(g.RequestFromCtx(ctx)))
 }