add: user auth accomplished

app/users/api/etc/user-api.yaml

@@ -9,3 +9,6 @@ Prometheus:
 
 UsercenterRpcConf:
   Target: k8s://juwan/user-rpc-svc:9001
+
+SnowflakeRpcConf:
+  Target: k8s://juwan/snowflake-svc:8080

app/users/api/internal/config/config.go

@@ -11,4 +11,5 @@ import (
 type Config struct {
 	rest.RestConf
 	UsercenterRpcConf zrpc.RpcClientConf
+	SnowflakeRpcConf  zrpc.RpcClientConf
 }

app/users/api/internal/contextx/contextx.go

@@ -0,0 +1,30 @@
+package contextx
+
+import (
+	"context"
+	"errors"
+)
+
+func WithRequestId(c context.Context, requestId string) context.Context {
+	return context.WithValue(c, "request_id", requestId)
+}
+
+func RequestIdFrom(c context.Context) (string, error) {
+	requestID, ok := c.Value("request_id").(string)
+	if !ok {
+		return "", errors.New("request_id not found in context")
+	}
+	return requestID, nil
+}
+
+func WithToken(c context.Context, token string) context.Context {
+	return context.WithValue(c, "token", token)
+}
+
+func TokenFrom(c context.Context) (string, error) {
+	token, ok := c.Value("token").(string)
+	if !ok {
+		return "", errors.New("token not found in context")
+	}
+	return token, nil
+}

app/users/api/internal/handler/user/loginHandler.go

@@ -4,12 +4,12 @@
 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"
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 // 用户登录接口
@@ -23,6 +23,22 @@ func LoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 
 		l := user.NewLoginLogic(r.Context(), svcCtx)
 		resp, err := l.Login(&req)
+		token := resp.Token
+		resp.Token = ""
+		http.SetCookie(w, &http.Cookie{
+			Name:        "JToken",
+			Value:       token,
+			Quoted:      false,
+			Path:        "/",
+			Domain:      "",
+			RawExpires:  "",
+			MaxAge:      691200,
+			Secure:      false,
+			HttpOnly:    true,
+			SameSite:    http.SameSiteStrictMode,
+			Partitioned: false,
+		})
+
 		if err != nil {
 			httpx.ErrorCtx(r.Context(), w, err)
 		} else {

app/users/api/internal/handler/user/registerHandler.go

@@ -4,29 +4,93 @@
 package user
 
 import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"juwan-backend/app/users/api/internal/contextx"
+	"juwan-backend/common/utils"
 	"net/http"
+	"strconv"
 
-	"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 RegisterHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		if err := normalizeRegisterBody(r); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
 		var req types.RegisterReq
 		if err := httpx.Parse(r, &req); err != nil {
 			httpx.ErrorCtx(r.Context(), w, err)
 			return
 		}
 
-		l := user.NewRegisterLogic(r.Context(), svcCtx)
+		requestId := r.Header.Get("X-Request-ID")
+		//regCtx := context.WithValue(r.Context(), "request_id", requestId)
+		regCtx := contextx.WithRequestId(r.Context(), requestId)
+		if requestId == "" {
+			httpx.ErrorCtx(r.Context(), w, errors.New("bad request"))
+		}
+
+		l := user.NewRegisterLogic(regCtx, svcCtx)
 		resp, err := l.Register(&req)
+
 		if err != nil {
 			httpx.ErrorCtx(r.Context(), w, err)
 		} else {
-			httpx.OkJsonCtx(r.Context(), w, resp)
+			httpx.OkJsonCtx(r.Context(), w, utils.NewErrorResp(400, err))
 		}
 	}
 }
+
+func normalizeRegisterBody(r *http.Request) error {
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		return err
+	}
+	defer r.Body.Close()
+
+	if len(body) == 0 {
+		r.Body = io.NopCloser(bytes.NewReader(body))
+		return nil
+	}
+
+	var payload map[string]any
+	if err := json.Unmarshal(body, &payload); err != nil {
+		r.Body = io.NopCloser(bytes.NewReader(body))
+		return nil
+	}
+
+	vcode, exists := payload["vcode"]
+	if exists {
+		switch value := vcode.(type) {
+		case string:
+			parsed, convErr := strconv.Atoi(value)
+			if convErr != nil {
+				return fmt.Errorf("invalid vcode format")
+			}
+			payload["vcode"] = parsed
+		case float64:
+			payload["vcode"] = int(value)
+		}
+	}
+
+	normalized, err := json.Marshal(payload)
+	if err != nil {
+		return err
+	}
+
+	r.Body = io.NopCloser(bytes.NewReader(normalized))
+	r.ContentLength = int64(len(normalized))
+	return nil
+}

app/users/api/internal/logic/user/getUserInfoLogic.go

@@ -5,6 +5,9 @@ package user
 
 import (
 	"context"
+	"errors"
+	"juwan-backend/app/users/rpc/usercenter"
+	"juwan-backend/common/converter"
 
 	"juwan-backend/app/users/api/internal/svc"
 	"juwan-backend/app/users/api/internal/types"
@@ -27,8 +30,21 @@ func NewGetUserInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUs
 	}
 }
 
-func (l *GetUserInfoLogic) GetUserInfo(req *types.GetUserInfoReq) (resp *types.UserInfo, err error) {
+func (l *GetUserInfoLogic) GetUserInfo(req *types.GetUserInfoReq) (resp types.UserInfo, err error) {
 	// todo: add your logic here and delete this line
+	pbUser, err := l.svcCtx.UserRpc.GetUsersById(l.ctx, &usercenter.GetUsersByIdReq{
+		Id: req.UserId,
+	})
+	if err != nil {
+		return types.UserInfo{}, errors.New("failed to get user info by userid")
+	}
+	user := types.UserInfo{}
+	err = converter.StructToStruct(&pbUser.Users, &user)
+	if err != nil {
+		logx.Errorf("struct to user info failed, err:%v.", err)
+		return types.UserInfo{}, errors.New("failed to get user info by userid")
+	}
 
-	return
+	//req.UserId
+	return user, nil
 }

app/users/api/internal/logic/user/loginLogic.go

@@ -5,9 +5,11 @@ package user
 
 import (
 	"context"
-
+	"errors"
 	"juwan-backend/app/users/api/internal/svc"
 	"juwan-backend/app/users/api/internal/types"
+	"juwan-backend/app/users/rpc/usercenter"
+	"time"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -28,6 +30,24 @@ func NewLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LoginLogic
 }
 
 func (l *LoginLogic) Login(req *types.LoginReq) (resp *types.LoginResp, err error) {
+	if len(req.Username) < 3 || len(req.Password) > 20 || len(req.Password) < 8 || len(req.Password) > 20 {
+		return nil, errors.New("the information is illegal")
+	}
 
-	return &types.LoginResp{}, nil
+	res, err := l.svcCtx.UserRpc.Login(l.ctx, &usercenter.LoginReq{
+		Username: req.Username,
+		Passwd:   req.Password,
+	})
+	if err != nil {
+		logx.Errorf("rpc login err: %v", err)
+		return nil, errors.New("login fail")
+	}
+
+	return &types.LoginResp{
+		UserId:   res.Id,
+		Username: res.Username,
+		Email:    res.Email,
+		Token:    res.Token,
+		Expires:  int64((7 * 24 * time.Hour).Seconds()),
+	}, nil
 }

app/users/api/internal/logic/user/logoutLogic.go

@@ -5,9 +5,11 @@ package user
 
 import (
 	"context"
+	"errors"
 
 	"juwan-backend/app/users/api/internal/svc"
 	"juwan-backend/app/users/api/internal/types"
+	"juwan-backend/app/users/rpc/usercenter"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -28,7 +30,14 @@ func NewLogoutLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LogoutLogi
 }
 
 func (l *LogoutLogic) Logout(req *types.LogoutReq) (resp *types.LogoutResp, err error) {
-	// todo: add your logic here and delete this line
+	if req.UserId <= 0 {
+		return nil, errors.New("invalid userId")
+	}
 
-	return
+	_, err = l.svcCtx.UserRpc.Logout(l.ctx, &usercenter.LogoutReq{UserId: req.UserId})
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.LogoutResp{Message: "logout success"}, nil
 }

app/users/api/internal/logic/user/registerLogic.go

@@ -6,13 +6,15 @@ package user
 import (
 	"context"
 	"errors"
+	"juwan-backend/app/users/api/internal/contextx"
+	"regexp"
 
 	"juwan-backend/app/users/api/internal/svc"
 	"juwan-backend/app/users/api/internal/types"
 	"juwan-backend/app/users/rpc/pb"
+	"juwan-backend/app/users/rpc/usercenter"
 	"juwan-backend/common/utils"
 
-	"github.com/google/uuid"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
@@ -31,40 +33,54 @@ func NewRegisterLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Register
 	}
 }
 
+var usernameRegex = regexp.MustCompile("^[a-zA-Z0-9_]+$")
+
 func (l *RegisterLogic) Register(req *types.RegisterReq) (resp *types.RegisterResp, err error) {
-	// 检查用户是否已存在
 	existingUser, err := l.svcCtx.UserRpc.GetUserByUsername(l.ctx, &pb.GetUserByUsernameReq{
 		Username: req.Username,
 	})
+	if len(req.Username) < 3 {
+		return nil, errors.New("username must be at least 3 characters long")
+	}
+	if len(req.Username) > 20 {
+		return nil, errors.New("username must be at most 20 characters long")
+	}
+	if !usernameRegex.MatchString(req.Username) {
+		return nil, errors.New("username can only contain letters, numbers, and underscores")
+	}
 	if err == nil && existingUser != nil {
 		return nil, errors.New("user already exists")
 	}
 
-	// 生成用户ID
-	userId, err := uuid.NewRandom()
-	if err != nil {
-		return nil, errors.New("generate user ID failed")
-	}
-
-	// 加密密码
 	hashedPassword, err := utils.HashPassword(req.Password)
 	if err != nil {
 		return nil, errors.New("hash password failed")
 	}
 
-	// 创建新用户
-	_res, err := l.svcCtx.UserRpc.AddUsers(l.ctx, &pb.AddUsersReq{
-		UserId:   userId.String(),
-		Username: req.Username,
-		Passwd:   hashedPassword,
-		Phone:    req.Phone,
-		State:    true,
+	requestId, err := contextx.RequestIdFrom(l.ctx)
+	if err != nil {
+		logx.Errorf("contextx.RequestIdFrom failed: %v", errjA)
+		return nil, errors.New("contextx.RequestIdFrom failed")
+	}
+
+	_, err = l.svcCtx.UserRpc.Register(l.ctx, &usercenter.RegisterReq{
+		Username:  req.Username,
+		Passwd:    hashedPassword,
+		Phone:     req.Username,
+		Vcode:     req.Vcode,
+		Email:     req.Email,
+		RequestId: requestId,
 	})
 	if err != nil {
-		l.Errorf("AddUsers failed: %v", err)
-		return nil, errors.New("add user failed")
+		logx.Error("failed to register user: ", err)
+		return nil, errors.New("failed to register user")
 	}
 
 	// 返回响应
-	return &types.RegisterResp{}, nil
+	return &types.RegisterResp{
+		UserId:   0,
+		Username: req.Username,
+		Email:    req.Email,
+		Message:  "register success",
+	}, nil
 }

app/users/api/internal/svc/serviceContext.go

@@ -4,24 +4,28 @@
 package svc
 
 import (
+	"juwan-backend/app/snowflake/rpc/snowflake"
 	"juwan-backend/app/users/api/internal/config"
 	"juwan-backend/app/users/api/internal/middleware"
 	"juwan-backend/app/users/rpc/usercenter"
+	"juwan-backend/common/snowflakex"
 
 	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/zrpc"
 )
 
 type ServiceContext struct {
-	Config  config.Config
-	Logger  rest.Middleware
-	UserRpc usercenter.Usercenter
+	Config       config.Config
+	Logger       rest.Middleware
+	UserRpc      usercenter.Usercenter
+	SnowflakeRpc snowflake.SnowflakeServiceClient
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
-		Config:  c,
-		Logger:  middleware.NewLoggerMiddleware().Handle,
-		UserRpc: usercenter.NewUsercenter(zrpc.MustNewClient(c.UsercenterRpcConf)),
+		Config:       c,
+		Logger:       middleware.NewLoggerMiddleware().Handle,
+		UserRpc:      usercenter.NewUsercenter(zrpc.MustNewClient(c.UsercenterRpcConf)),
+		SnowflakeRpc: snowflakex.NewClient(c.SnowflakeRpcConf),
 	}
 }

app/users/api/internal/types/types.go

@@ -26,7 +26,8 @@ type LoginResp struct {
 }
 
 type LogoutReq struct {
-	UserId int64 `path:"userId" binding:"required,gt=0"`
+	UserId int64  `path:"userId" binding:"required,gt=0"`
+	Token  string `header:"Authorization" binding:"required"`
 }
 
 type LogoutResp struct {
@@ -38,6 +39,7 @@ type RegisterReq struct {
 	Password string `json:"password" binding:"required,min=6,max=128"`
 	Email    string `json:"email,omitempty" binding:"omitempty,email"`
 	Phone    string `json:"phone,omitempty" binding:"omitempty,len=11"`
+	Vcode    int32  `json:"vcode"`
 }
 
 type RegisterResp struct {

app/users/api/users.go

@@ -0,0 +1,34 @@
+// Code scaffolded by goctl. Safe to edit.
+// goctl 1.9.2
+
+package main
+
+import (
+	"flag"
+	"fmt"
+
+	"juwan-backend/app/users/api/internal/config"
+	"juwan-backend/app/users/api/internal/handler"
+	"juwan-backend/app/users/api/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/rest"
+)
+
+var configFile = flag.String("f", "etc/user-api.yaml", "the config file")
+
+func main() {
+	flag.Parse()
+
+	var c config.Config
+	conf.MustLoad(*configFile, &c)
+
+	server := rest.MustNewServer(c.RestConf)
+	defer server.Stop()
+
+	ctx := svc.NewServiceContext(c)
+	handler.RegisterHandlers(server, ctx)
+
+	fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
+	server.Start()
+}

app/users/rpc/internal/logic/loginLogic.go

@@ -2,9 +2,11 @@ package logic
 
 import (
 	"context"
-
+	"errors"
 	"juwan-backend/app/users/rpc/internal/svc"
+	utils2 "juwan-backend/app/users/rpc/internal/utils"
 	"juwan-backend/app/users/rpc/pb"
+	"juwan-backend/common/utils"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -24,7 +26,29 @@ func NewLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LoginLogic
 }
 
 func (l *LoginLogic) Login(in *pb.LoginReq) (*pb.LoginResp, error) {
-	// todo: add your logic here and delete this line
+	user, err := l.svcCtx.UsersModelRO.FindOneByUsername(l.ctx, in.Username)
+	if err != nil {
+		logx.WithContext(l.ctx).Errorf("LoginLogic.Login error:%v", err)
+		return nil, err
+	}
+	if !utils.VerifyPassword(user.Passwd, in.Passwd) {
+		logx.WithContext(l.ctx).Errorf("User %s Login failed", user.Username)
+		return nil, errors.New("incorrect password")
+	}
 
-	return &pb.LoginResp{}, nil
+	token, err := l.svcCtx.JwtManager.New(l.ctx, &utils2.TokenPayload{
+		UserId:  user.UserId,
+		IsAdmin: false,
+	})
+	if err != nil {
+		logx.Errorf("LoginLogic.Login gen jwt for user %v error:%v", user.UserId, err)
+		return nil, err
+	}
+
+	return &pb.LoginResp{
+		Token:    token,
+		Username: user.Username,
+		Email:    user.Email,
+		Id:       user.UserId,
+	}, nil
 }

app/users/rpc/internal/logic/logoutLogic.go

@@ -0,0 +1,34 @@
+package logic
+
+import (
+	"context"
+
+	"juwan-backend/app/users/rpc/internal/svc"
+	"juwan-backend/app/users/rpc/pb"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type LogoutLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewLogoutLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LogoutLogic {
+	return &LogoutLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *LogoutLogic) Logout(in *pb.LogoutReq) (*pb.LogoutResp, error) {
+	// todo: add your logic here and delete this line
+	err := l.svcCtx.JwtManager.Logout(l.ctx, in.UserId)
+	if err != nil {
+		logx.WithContext(l.ctx).Errorf("Logout failed: %s", err.Error())
+		return nil, err
+	}
+	return &pb.LogoutResp{}, nil
+}

app/users/rpc/internal/logic/registerLogic.go

@@ -0,0 +1,92 @@
+package logic
+
+import (
+	"context"
+	"crypto/rand"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"strconv"
+	"strings"
+
+	"juwan-backend/app/snowflake/rpc/snowflake"
+	"juwan-backend/app/users/rpc/internal/models"
+	"juwan-backend/app/users/rpc/internal/svc"
+	"juwan-backend/app/users/rpc/pb"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type RegisterLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+}
+
+func NewRegisterLogic(ctx context.Context, svcCtx *svc.ServiceContext) *RegisterLogic {
+	return &RegisterLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func mustNewRandomNickname() string {
+	bytes := make([]byte, 5)
+	_, err := rand.Read(bytes)
+	if err != nil {
+		return "NewUser"
+	}
+	nickname := strings.Builder{}
+	nickname.WriteString("user_")
+	nickname.WriteString(hex.EncodeToString(bytes))
+	return nickname.String()
+}
+
+func (l *RegisterLogic) Register(in *pb.RegisterReq) (*pb.RegisterResp, error) {
+	// todo: add your logic here and delete this line
+	if in.Phone == "" || in.Username == "" || in.Passwd == "" {
+		logx.Error("invalid input")
+		return nil, errors.New("invalid input")
+	}
+
+	redisKey := fmt.Sprintf("vcode:%s:%s:%s", in.RequestId, "register", in.Email)
+	vcode, err := l.svcCtx.RedisCluster.Get(l.ctx, redisKey).Result()
+	logx.Infof("vcode:%s, err:%v", vcode, err)
+	if err != nil {
+		logx.Error("invalid verification code")
+		return nil, errors.New("invalid verification code")
+	}
+
+	code, err := strconv.ParseInt(vcode, 10, 32)
+	if err != nil || int32(code) != in.Vcode {
+		logx.Error("invalid verification code")
+		return nil, errors.New("invalid verification code")
+	}
+
+	resp, err := l.svcCtx.Snowflake.NextId(l.ctx, &snowflake.NextIdReq{})
+	if err != nil {
+		return nil, errors.New("generate user ID failed")
+	}
+
+	user := models.Users{
+		UserId:     resp.Id,
+		Username:   in.Username,
+		Nickname:   mustNewRandomNickname(),
+		Passwd:     in.Passwd,
+		Phone:      in.Phone,
+		Email:      in.Email,
+		RoleType:   0,
+		IsVerified: false,
+	}
+
+	_, err = l.svcCtx.UsersModelRW.Insert(l.ctx, &user)
+	if err != nil {
+		logx.Error("failed to create user: ", err)
+		return nil, errors.New("failed to create user")
+	}
+
+	return &pb.RegisterResp{
+		Res: "user registered successfully",
+	}, nil
+}

app/users/rpc/internal/logic/validateTokenLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"fmt"
 
 	"juwan-backend/app/users/rpc/internal/svc"
 	"juwan-backend/app/users/rpc/pb"
@@ -9,6 +10,8 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
+var USER_TOKEN_TEMP = "jwt:%v"
+
 type ValidateTokenLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
@@ -24,7 +27,20 @@ func NewValidateTokenLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Val
 }
 
 func (l *ValidateTokenLogic) ValidateToken(in *pb.ValidateTokenReq) (*pb.ValidateTokenResp, error) {
-	// todo: add your logic here and delete this line
+	redisKey := fmt.Sprintf(USER_TOKEN_TEMP, in.UserId)
+	_, err := l.svcCtx.JwtManager.Valid(l.ctx, redisKey)
+	if err != nil {
+		return nil, err
+	}
+	users, err := l.svcCtx.UsersModelRO.FindOne(l.ctx, in.UserId)
+	if err != nil {
+		return nil, err
+	}
 
-	return &pb.ValidateTokenResp{}, nil
+	return &pb.ValidateTokenResp{
+		Valid:    true,
+		Message:  "OK",
+		UserId:   in.UserId,
+		RoleType: users.RoleType,
+	}, nil
 }

app/users/rpc/internal/models/usersModel_gen.go

@@ -25,6 +25,7 @@ var (
 	usersRowsWithPlaceHolder = builder.PostgreSqlJoin(stringx.Remove(usersFieldNames, "user_id", "create_at", "create_time", "created_at", "update_at", "update_time", "updated_at"))
 
 	cachePublicUsersUserIdPrefix   = "cache:public:users:userId:"
+	cachePublicUsersEmailPrefix    = "cache:public:users:email:"
 	cachePublicUsersPhonePrefix    = "cache:public:users:phone:"
 	cachePublicUsersUsernamePrefix = "cache:public:users:username:"
 )
@@ -33,6 +34,7 @@ type (
 	usersModel interface {
 		Insert(ctx context.Context, data *Users) (sql.Result, error)
 		FindOne(ctx context.Context, userId int64) (*Users, error)
+		FindOneByEmail(ctx context.Context, email string) (*Users, error)
 		FindOneByPhone(ctx context.Context, phone string) (*Users, error)
 		FindOneByUsername(ctx context.Context, username string) (*Users, error)
 		Update(ctx context.Context, data *Users) error
@@ -56,6 +58,7 @@ type (
 		CreatedAt  time.Time    `db:"created_at"`
 		UpdatedAt  time.Time    `db:"updated_at"`
 		DeletedAt  sql.NullTime `db:"deleted_at"`
+		Email      string       `db:"email"`
 	}
 )
 
@@ -72,13 +75,14 @@ func (m *defaultUsersModel) Delete(ctx context.Context, userId int64) error {
 		return err
 	}
 
+	publicUsersEmailKey := fmt.Sprintf("%s%v", cachePublicUsersEmailPrefix, data.Email)
 	publicUsersPhoneKey := fmt.Sprintf("%s%v", cachePublicUsersPhonePrefix, data.Phone)
 	publicUsersUserIdKey := fmt.Sprintf("%s%v", cachePublicUsersUserIdPrefix, userId)
 	publicUsersUsernameKey := fmt.Sprintf("%s%v", cachePublicUsersUsernamePrefix, data.Username)
 	_, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
 		query := fmt.Sprintf("delete from %s where user_id = $1", m.table)
 		return conn.ExecCtx(ctx, query, userId)
-	}, publicUsersPhoneKey, publicUsersUserIdKey, publicUsersUsernameKey)
+	}, publicUsersEmailKey, publicUsersPhoneKey, publicUsersUserIdKey, publicUsersUsernameKey)
 	return err
 }
 
@@ -99,6 +103,26 @@ func (m *defaultUsersModel) FindOne(ctx context.Context, userId int64) (*Users,
 	}
 }
 
+func (m *defaultUsersModel) FindOneByEmail(ctx context.Context, email string) (*Users, error) {
+	publicUsersEmailKey := fmt.Sprintf("%s%v", cachePublicUsersEmailPrefix, email)
+	var resp Users
+	err := m.QueryRowIndexCtx(ctx, &resp, publicUsersEmailKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v any) (i any, e error) {
+		query := fmt.Sprintf("select %s from %s where email = $1 limit 1", usersRows, m.table)
+		if err := conn.QueryRowCtx(ctx, &resp, query, email); err != nil {
+			return nil, err
+		}
+		return resp.UserId, nil
+	}, m.queryPrimary)
+	switch err {
+	case nil:
+		return &resp, nil
+	case sqlc.ErrNotFound:
+		return nil, ErrNotFound
+	default:
+		return nil, err
+	}
+}
+
 func (m *defaultUsersModel) FindOneByPhone(ctx context.Context, phone string) (*Users, error) {
 	publicUsersPhoneKey := fmt.Sprintf("%s%v", cachePublicUsersPhonePrefix, phone)
 	var resp Users
@@ -140,13 +164,14 @@ func (m *defaultUsersModel) FindOneByUsername(ctx context.Context, username stri
 }
 
 func (m *defaultUsersModel) Insert(ctx context.Context, data *Users) (sql.Result, error) {
+	publicUsersEmailKey := fmt.Sprintf("%s%v", cachePublicUsersEmailPrefix, data.Email)
 	publicUsersPhoneKey := fmt.Sprintf("%s%v", cachePublicUsersPhonePrefix, data.Phone)
 	publicUsersUserIdKey := fmt.Sprintf("%s%v", cachePublicUsersUserIdPrefix, data.UserId)
 	publicUsersUsernameKey := fmt.Sprintf("%s%v", cachePublicUsersUsernamePrefix, data.Username)
 	ret, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
-		query := fmt.Sprintf("insert into %s (%s) values ($1, $2, $3, $4, $5, $6, $7, $8, $9)", m.table, usersRowsExpectAutoSet)
-		return conn.ExecCtx(ctx, query, data.UserId, data.Username, data.Passwd, data.Nickname, data.Phone, data.RoleType, data.IsVerified, data.State, data.DeletedAt)
-	}, publicUsersPhoneKey, publicUsersUserIdKey, publicUsersUsernameKey)
+		query := fmt.Sprintf("insert into %s (%s) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)", m.table, usersRowsExpectAutoSet)
+		return conn.ExecCtx(ctx, query, data.UserId, data.Username, data.Passwd, data.Nickname, data.Phone, data.RoleType, data.IsVerified, data.State, data.DeletedAt, data.Email)
+	}, publicUsersEmailKey, publicUsersPhoneKey, publicUsersUserIdKey, publicUsersUsernameKey)
 	return ret, err
 }
 
@@ -156,13 +181,14 @@ func (m *defaultUsersModel) Update(ctx context.Context, newData *Users) error {
 		return err
 	}
 
+	publicUsersEmailKey := fmt.Sprintf("%s%v", cachePublicUsersEmailPrefix, data.Email)
 	publicUsersPhoneKey := fmt.Sprintf("%s%v", cachePublicUsersPhonePrefix, data.Phone)
 	publicUsersUserIdKey := fmt.Sprintf("%s%v", cachePublicUsersUserIdPrefix, data.UserId)
 	publicUsersUsernameKey := fmt.Sprintf("%s%v", cachePublicUsersUsernamePrefix, data.Username)
 	_, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
 		query := fmt.Sprintf("update %s set %s where user_id = $1", m.table, usersRowsWithPlaceHolder)
-		return conn.ExecCtx(ctx, query, newData.UserId, newData.Username, newData.Passwd, newData.Nickname, newData.Phone, newData.RoleType, newData.IsVerified, newData.State, newData.DeletedAt)
-	}, publicUsersPhoneKey, publicUsersUserIdKey, publicUsersUsernameKey)
+		return conn.ExecCtx(ctx, query, newData.UserId, newData.Username, newData.Passwd, newData.Nickname, newData.Phone, newData.RoleType, newData.IsVerified, newData.State, newData.DeletedAt, newData.Email)
+	}, publicUsersEmailKey, publicUsersPhoneKey, publicUsersUserIdKey, publicUsersUsernameKey)
 	return err
 }
 

app/users/rpc/internal/server/usercenterServer.go

@@ -59,6 +59,11 @@ func (s *UsercenterServer) Login(ctx context.Context, in *pb.LoginReq) (*pb.Logi
 	return l.Login(in)
 }
 
+func (s *UsercenterServer) Register(ctx context.Context, in *pb.RegisterReq) (*pb.RegisterResp, error) {
+	l := logic.NewRegisterLogic(ctx, s.svcCtx)
+	return l.Register(in)
+}
+
 func (s *UsercenterServer) ValidateToken(ctx context.Context, in *pb.ValidateTokenReq) (*pb.ValidateTokenResp, error) {
 	l := logic.NewValidateTokenLogic(ctx, s.svcCtx)
 	return l.ValidateToken(in)
@@ -68,3 +73,8 @@ func (s *UsercenterServer) CheckPermission(ctx context.Context, in *pb.CheckPerm
 	l := logic.NewCheckPermissionLogic(ctx, s.svcCtx)
 	return l.CheckPermission(in)
 }
+
+func (s *UsercenterServer) Logout(ctx context.Context, in *pb.LogoutReq) (*pb.LogoutResp, error) {
+	l := logic.NewLogoutLogic(ctx, s.svcCtx)
+	return l.Logout(in)
+}

app/users/rpc/internal/utils/jwks.go

@@ -1,90 +0,0 @@
-package utils
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/golang-jwt/jwt/v4"
-)
-
-// JWKS (JSON Web Key Set) 结构
-type JWKSKey struct {
-	Kty string `json:"kty"`
-	Use string `json:"use"`
-	Kid string `json:"kid"`
-	N   string `json:"n,omitempty"`
-	E   string `json:"e,omitempty"`
-	K   string `json:"k,omitempty"`      // 对称密钥
-	Alg string `json:"alg"`
-}
-
-type JWKS struct {
-	Keys []JWKSKey `json:"keys"`
-}
-
-// GenerateJWKSFromSecret 从密钥生成 JWKS（用于对称加密 HS256）
-func GenerateJWKSFromSecret(secretKey string, keyID string) *JWKS {
-	// 对于 HS256，将密钥进行 base64 编码
-	encodedSecret := base64.RawURLEncoding.EncodeToString([]byte(secretKey))
-
-	return &JWKS{
-		Keys: []JWKSKey{
-			{
-				Kty: "oct",
-				Use: "sig",
-				Kid: keyID,
-				K:   encodedSecret,
-				Alg: "HS256",
-			},
-		},
-	}
-}
-
-// GenerateJWKSEndpoint 生成可以被 Envoy 使用的 JWKS JSON
-// 此端点应在 user-rpc 中暴露，URL 为 /.well-known/jwks.json
-func GenerateJWKSEndpoint(secretKey string, keyID string) (string, error) {
-	if secretKey == "" {
-		return "", fmt.Errorf("secret key cannot be empty")
-	}
-
-	jwks := GenerateJWKSFromSecret(secretKey, keyID)
-
-	jsonData, err := json.MarshalIndent(jwks, "", "  ")
-	if err != nil {
-		return "", err
-	}
-
-	return string(jsonData), nil
-}
-
-// TokenPayload 令牌负载
-type TokenMetadata struct {
-	IssuedAt  time.Time
-	ExpiresAt time.Time
-	Subject   string // userId
-	Issuer    string
-	Audience  string
-}
-
-// ExtractTokenMetadata 从 token 中提取元数据（不验证签名）
-func ExtractTokenMetadata(tokenString string) (*TokenMetadata, error) {
-	token, _, err := new(jwt.Parser).ParseUnverified(tokenString, &Claims{})
-	if err != nil {
-		return nil, err
-	}
-
-	claims, ok := token.Claims.(*Claims)
-	if !ok {
-		return nil, fmt.Errorf("invalid token claims type")
-	}
-
-	return &TokenMetadata{
-		IssuedAt:  claims.IssuedAt.Time,
-		ExpiresAt: claims.ExpiresAt.Time,
-		Subject:   claims.UserId,
-		Issuer:    claims.Issuer,
-		Audience:  "", // 如果需要，可以增加到 Claims 中
-	}, nil
-}

app/users/rpc/internal/utils/jwt.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"strconv"
 	"time"
 
 	"github.com/golang-jwt/jwt/v4"
@@ -12,7 +13,7 @@ import (
 )
 
 type TokenPayload struct {
-	UserId  string
+	UserId  int64
 	IsAdmin bool
 }
 
@@ -33,6 +34,7 @@ var (
 	errInvalidToken    = errors.New("invalid token claims")
 	errTokenNotInCache = errors.New("token not found in cache")
 	errNoRedisClient   = errors.New("redis client not configured")
+	errInvalidUserID   = errors.New("invalid user id")
 	// errExpiredToken    = errors.New("token expired")
 )
 
@@ -74,8 +76,7 @@ func (m *JwtManager) New(ctx context.Context, payload *TokenPayload) (string, er
 		return "", err
 	}
 
-	// 存储 token 到 Redis，TTL 为 30 天
-	userKey := tokenCachePrefixUser + payload.UserId
+	userKey := tokenCachePrefixUser + strconv.FormatInt(claims.UserId, 10)
 	tokenKey := tokenCachePrefixToken + tokenString
 
 	tokenData, _ := json.Marshal(payload)
@@ -105,12 +106,12 @@ func (m *JwtManager) Valid(ctx context.Context, tokenString string) (*TokenPaylo
 	// 检查 token 是否在 Redis 中
 	tokenKey := tokenCachePrefixToken + tokenString
 	tokenData, err := m.redisCluster.Get(ctx, tokenKey).Result()
-	if err != nil && err != redis.Nil {
+	if err != nil && !errors.Is(err, redis.Nil) {
 		return nil, err
 	}
 
 	var payload TokenPayload
-	if err == redis.Nil {
+	if errors.Is(err, redis.Nil) {
 		return nil, errTokenNotInCache
 	}
 
@@ -125,6 +126,20 @@ func (m *JwtManager) Valid(ctx context.Context, tokenString string) (*TokenPaylo
 	})
 
 	if err != nil {
+		if errors.Is(err, jwt.ErrTokenExpired) {
+			if _, renewErr := m.Renew(ctx, tokenString); renewErr != nil {
+				return nil, renewErr
+			}
+
+			if token != nil {
+				if claims, ok := token.Claims.(*Claims); ok {
+					return &claims.TokenPayload, nil
+				}
+			}
+
+			return &payload, nil
+		}
+
 		return nil, err
 	}
 
@@ -146,7 +161,7 @@ func (m *JwtManager) Renew(ctx context.Context, tokenString string) (string, err
 	tokenKey := tokenCachePrefixToken + tokenString
 	tokenData, err := m.redisCluster.Get(ctx, tokenKey).Result()
 	if err != nil {
-		if err == redis.Nil {
+		if errors.Is(err, redis.Nil) {
 			return "", errTokenNotInCache
 		}
 		return "", err
@@ -159,15 +174,15 @@ func (m *JwtManager) Renew(ctx context.Context, tokenString string) (string, err
 	}
 
 	// 删除旧 token 记录
-	userKey := tokenCachePrefixUser + payload.UserId
+	userKey := tokenCachePrefixUser + strconv.FormatInt(payload.UserId, 10)
 	m.redisCluster.Del(ctx, tokenKey, userKey)
 
 	// 生成新 token
 	return m.New(ctx, &payload)
 }
 
-// extract payload from token without validating expiration (used for auto-renewal)
-func (m *JwtManager) Extract(ctx context.Context, tokenString string) (*TokenPayload, error) {
+// Extract payload from token without validating expiration (used for auto-renewal)
+func (m *JwtManager) Extract(_ context.Context, tokenString string) (*TokenPayload, error) {
 	token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (interface{}, error) {
 		return []byte(m.secretKey), nil
 	})
@@ -184,7 +199,7 @@ func (m *JwtManager) Extract(ctx context.Context, tokenString string) (*TokenPay
 	return &claims.TokenPayload, nil
 }
 
-// check if token exists in Redis (i.e. is valid and not revoked)
+// Exists check if token exists in Redis (i.e. is valid and not revoked)
 func (m *JwtManager) Exists(ctx context.Context, tokenString string) (bool, error) {
 	if m.redisCluster == nil {
 		return false, errNoRedisClient
@@ -199,12 +214,12 @@ func (m *JwtManager) Exists(ctx context.Context, tokenString string) (bool, erro
 	return exists > 0, nil
 }
 
-// extract payload from JWT claims
+// ClaimsToPayload extract payload from JWT claims
 func (m *JwtManager) ClaimsToPayload(claims *Claims) *TokenPayload {
 	return &claims.TokenPayload
 }
 
-// revoke token by deleting both user -> token and token -> payload keys from Redis
+// Revoke revoke token by deleting both user -> token and token -> payload keys from Redis
 func (m *JwtManager) Revoke(ctx context.Context, tokenString string) error {
 	if m.redisCluster == nil {
 		return errNoRedisClient
@@ -215,7 +230,7 @@ func (m *JwtManager) Revoke(ctx context.Context, tokenString string) error {
 		return err
 	}
 
-	userKey := tokenCachePrefixUser + payload.UserId
+	userKey := tokenCachePrefixUser + strconv.FormatInt(payload.UserId, 10)
 	tokenKey := tokenCachePrefixToken + tokenString
 
 	pipe := m.redisCluster.Pipeline()
@@ -225,19 +240,48 @@ func (m *JwtManager) Revoke(ctx context.Context, tokenString string) error {
 	return err
 }
 
-func (m *JwtManager) GetUserToken(ctx context.Context, userID string) (string, error) {
+func (m *JwtManager) GetUserToken(ctx context.Context, userID int64) (string, error) {
 	if m.redisCluster == nil {
 		return "", errNoRedisClient
 	}
+	//userID, err := strconv.FormatInt(userID, 10)
+	id := strconv.FormatInt(userID, 10)
 
-	userKey := tokenCachePrefixUser + userID
+	userKey := tokenCachePrefixUser + id
 	token, err := m.redisCluster.Get(ctx, userKey).Result()
 	if err != nil {
-		if err == redis.Nil {
-			return "", fmt.Errorf("user %s has no token", userID)
+		if errors.Is(err, redis.Nil) {
+			return "", fmt.Errorf("user %v has no token", userID)
 		}
 		return "", err
 	}
 
 	return token, nil
 }
+
+// Logout 按用户登出：删除 user->token 和 token->payload 两类缓存数据
+func (m *JwtManager) Logout(ctx context.Context, userID int64) error {
+	if m.redisCluster == nil {
+		return errNoRedisClient
+	}
+
+	if userID <= 0 {
+		return errInvalidUserID
+	}
+
+	userKey := tokenCachePrefixUser + strconv.FormatInt(userID, 10)
+	tokenString, err := m.redisCluster.Get(ctx, userKey).Result()
+	if err != nil && !errors.Is(err, redis.Nil) {
+		return err
+	}
+
+	pipe := m.redisCluster.Pipeline()
+	pipe.Del(ctx, userKey)
+	if !errors.Is(err, redis.Nil) && tokenString != "" {
+		tokenKey := tokenCachePrefixToken + tokenString
+		pipe.Del(ctx, tokenKey)
+	}
+
+	_, execErr := pipe.Exec(ctx)
+	return execErr
+}

app/users/rpc/pb.go

@@ -9,6 +9,7 @@ import (
 	"juwan-backend/app/users/rpc/internal/svc"
 	"juwan-backend/app/users/rpc/pb"
 
+	_ "github.com/lib/pq"
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/service"
 	"github.com/zeromicro/go-zero/zrpc"

app/users/rpc/pb/users.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.36.9
-// 	protoc        v6.32.0
+// 	protoc-gen-go v1.36.11
+// 	protoc        v5.29.6
 // source: users.proto
 
 package pb
@@ -24,7 +24,7 @@ const (
 // --------------------------------users--------------------------------
 type Users struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	UserId        string                 `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`          //userId
+	UserId        int64                  `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"`         //userId
 	Username      string                 `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`      //username
 	Passwd        string                 `protobuf:"bytes,3,opt,name=passwd,proto3" json:"passwd,omitempty"`          //passwd
 	Nickname      string                 `protobuf:"bytes,4,opt,name=nickname,proto3" json:"nickname,omitempty"`      //nickname
@@ -69,11 +69,11 @@ func (*Users) Descriptor() ([]byte, []int) {
 	return file_users_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *Users) GetUserId() string {
+func (x *Users) GetUserId() int64 {
 	if x != nil {
 		return x.UserId
 	}
-	return ""
+	return 0
 }
 
 func (x *Users) GetUsername() string {
@@ -148,7 +148,7 @@ func (x *Users) GetDeletedAt() int64 {
 
 type AddUsersReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	UserId        string                 `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`          //userId
+	UserId        int64                  `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"`         //userId
 	Username      string                 `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`      //username
 	Passwd        string                 `protobuf:"bytes,3,opt,name=passwd,proto3" json:"passwd,omitempty"`          //passwd
 	Nickname      string                 `protobuf:"bytes,4,opt,name=nickname,proto3" json:"nickname,omitempty"`      //nickname
@@ -193,11 +193,11 @@ func (*AddUsersReq) Descriptor() ([]byte, []int) {
 	return file_users_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *AddUsersReq) GetUserId() string {
+func (x *AddUsersReq) GetUserId() int64 {
 	if x != nil {
 		return x.UserId
 	}
-	return ""
+	return 0
 }
 
 func (x *AddUsersReq) GetUsername() string {
@@ -308,7 +308,7 @@ func (*AddUsersResp) Descriptor() ([]byte, []int) {
 
 type UpdateUsersReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	UserId        string                 `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`          //userId
+	UserId        int64                  `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"`         //userId
 	Username      string                 `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`      //username
 	Passwd        string                 `protobuf:"bytes,3,opt,name=passwd,proto3" json:"passwd,omitempty"`          //passwd
 	Nickname      string                 `protobuf:"bytes,4,opt,name=nickname,proto3" json:"nickname,omitempty"`      //nickname
@@ -353,11 +353,11 @@ func (*UpdateUsersReq) Descriptor() ([]byte, []int) {
 	return file_users_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *UpdateUsersReq) GetUserId() string {
+func (x *UpdateUsersReq) GetUserId() int64 {
 	if x != nil {
 		return x.UserId
 	}
-	return ""
+	return 0
 }
 
 func (x *UpdateUsersReq) GetUsername() string {
@@ -638,7 +638,7 @@ type SearchUsersReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Page          int64                  `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"`             //page
 	Limit         int64                  `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"`           //limit
-	UserId        string                 `protobuf:"bytes,3,opt,name=userId,proto3" json:"userId,omitempty"`          //userId
+	UserId        int64                  `protobuf:"varint,3,opt,name=userId,proto3" json:"userId,omitempty"`         //userId
 	Username      string                 `protobuf:"bytes,4,opt,name=username,proto3" json:"username,omitempty"`      //username
 	Passwd        string                 `protobuf:"bytes,5,opt,name=passwd,proto3" json:"passwd,omitempty"`          //passwd
 	Nickname      string                 `protobuf:"bytes,6,opt,name=nickname,proto3" json:"nickname,omitempty"`      //nickname
@@ -697,11 +697,11 @@ func (x *SearchUsersReq) GetLimit() int64 {
 	return 0
 }
 
-func (x *SearchUsersReq) GetUserId() string {
+func (x *SearchUsersReq) GetUserId() int64 {
 	if x != nil {
 		return x.UserId
 	}
-	return ""
+	return 0
 }
 
 func (x *SearchUsersReq) GetUsername() string {
@@ -961,6 +961,9 @@ func (x *LoginReq) GetPasswd() string {
 type LoginResp struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Token         string                 `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
+	Username      string                 `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
+	Email         string                 `protobuf:"bytes,3,opt,name=email,proto3" json:"email,omitempty"`
+	Id            int64                  `protobuf:"varint,4,opt,name=id,proto3" json:"id,omitempty"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -1002,10 +1005,31 @@ func (x *LoginResp) GetToken() string {
 	return ""
 }
 
+func (x *LoginResp) GetUsername() string {
+	if x != nil {
+		return x.Username
+	}
+	return ""
+}
+
+func (x *LoginResp) GetEmail() string {
+	if x != nil {
+		return x.Email
+	}
+	return ""
+}
+
+func (x *LoginResp) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
 type ValidateTokenReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	Token         string                 `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`   // JWT token
-	UserId        string                 `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId,omitempty"` // 用户ID
+	Token         string                 `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`    // JWT token
+	UserId        int64                  `protobuf:"varint,2,opt,name=userId,proto3" json:"userId,omitempty"` // 用户ID
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -1047,18 +1071,18 @@ func (x *ValidateTokenReq) GetToken() string {
 	return ""
 }
 
-func (x *ValidateTokenReq) GetUserId() string {
+func (x *ValidateTokenReq) GetUserId() int64 {
 	if x != nil {
 		return x.UserId
 	}
-	return ""
+	return 0
 }
 
 type ValidateTokenResp struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Valid         bool                   `protobuf:"varint,1,opt,name=valid,proto3" json:"valid,omitempty"`       // token 是否有效（不在黑名单中）
 	Message       string                 `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`    // 验证失败原因
-	UserId        string                 `protobuf:"bytes,3,opt,name=userId,proto3" json:"userId,omitempty"`      // 用户ID
+	UserId        int64                  `protobuf:"varint,3,opt,name=userId,proto3" json:"userId,omitempty"`     // 用户ID
 	RoleType      int64                  `protobuf:"varint,4,opt,name=roleType,proto3" json:"roleType,omitempty"` // 用户角色
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
@@ -1108,11 +1132,11 @@ func (x *ValidateTokenResp) GetMessage() string {
 	return ""
 }
 
-func (x *ValidateTokenResp) GetUserId() string {
+func (x *ValidateTokenResp) GetUserId() int64 {
 	if x != nil {
 		return x.UserId
 	}
-	return ""
+	return 0
 }
 
 func (x *ValidateTokenResp) GetRoleType() int64 {
@@ -1124,7 +1148,7 @@ func (x *ValidateTokenResp) GetRoleType() int64 {
 
 type CheckPermissionReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	UserId        string                 `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`     // 用户ID
+	UserId        int64                  `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"`    // 用户ID
 	Resource      string                 `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"` // 资源 ID
 	Action        string                 `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"`     // 操作类型: read/write/delete
 	unknownFields protoimpl.UnknownFields
@@ -1161,11 +1185,11 @@ func (*CheckPermissionReq) Descriptor() ([]byte, []int) {
 	return file_users_proto_rawDescGZIP(), []int{17}
 }
 
-func (x *CheckPermissionReq) GetUserId() string {
+func (x *CheckPermissionReq) GetUserId() int64 {
 	if x != nil {
 		return x.UserId
 	}
-	return ""
+	return 0
 }
 
 func (x *CheckPermissionReq) GetResource() string {
@@ -1234,13 +1258,221 @@ func (x *CheckPermissionResp) GetMessage() string {
 	return ""
 }
 
+type RegisterReq struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Username      string                 `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
+	Passwd        string                 `protobuf:"bytes,2,opt,name=passwd,proto3" json:"passwd,omitempty"`
+	Phone         string                 `protobuf:"bytes,3,opt,name=phone,proto3" json:"phone,omitempty"`
+	Vcode         int32                  `protobuf:"varint,4,opt,name=vcode,proto3" json:"vcode,omitempty"`
+	Email         string                 `protobuf:"bytes,5,opt,name=email,proto3" json:"email,omitempty"`
+	RequestId     string                 `protobuf:"bytes,6,opt,name=requestId,proto3" json:"requestId,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *RegisterReq) Reset() {
+	*x = RegisterReq{}
+	mi := &file_users_proto_msgTypes[19]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *RegisterReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RegisterReq) ProtoMessage() {}
+
+func (x *RegisterReq) ProtoReflect() protoreflect.Message {
+	mi := &file_users_proto_msgTypes[19]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RegisterReq.ProtoReflect.Descriptor instead.
+func (*RegisterReq) Descriptor() ([]byte, []int) {
+	return file_users_proto_rawDescGZIP(), []int{19}
+}
+
+func (x *RegisterReq) GetUsername() string {
+	if x != nil {
+		return x.Username
+	}
+	return ""
+}
+
+func (x *RegisterReq) GetPasswd() string {
+	if x != nil {
+		return x.Passwd
+	}
+	return ""
+}
+
+func (x *RegisterReq) GetPhone() string {
+	if x != nil {
+		return x.Phone
+	}
+	return ""
+}
+
+func (x *RegisterReq) GetVcode() int32 {
+	if x != nil {
+		return x.Vcode
+	}
+	return 0
+}
+
+func (x *RegisterReq) GetEmail() string {
+	if x != nil {
+		return x.Email
+	}
+	return ""
+}
+
+func (x *RegisterReq) GetRequestId() string {
+	if x != nil {
+		return x.RequestId
+	}
+	return ""
+}
+
+type RegisterResp struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Res           string                 `protobuf:"bytes,1,opt,name=res,proto3" json:"res,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *RegisterResp) Reset() {
+	*x = RegisterResp{}
+	mi := &file_users_proto_msgTypes[20]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *RegisterResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RegisterResp) ProtoMessage() {}
+
+func (x *RegisterResp) ProtoReflect() protoreflect.Message {
+	mi := &file_users_proto_msgTypes[20]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RegisterResp.ProtoReflect.Descriptor instead.
+func (*RegisterResp) Descriptor() ([]byte, []int) {
+	return file_users_proto_rawDescGZIP(), []int{20}
+}
+
+func (x *RegisterResp) GetRes() string {
+	if x != nil {
+		return x.Res
+	}
+	return ""
+}
+
+type LogoutReq struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	UserId        int64                  `protobuf:"varint,1,opt,name=userId,proto3" json:"userId,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *LogoutReq) Reset() {
+	*x = LogoutReq{}
+	mi := &file_users_proto_msgTypes[21]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *LogoutReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LogoutReq) ProtoMessage() {}
+
+func (x *LogoutReq) ProtoReflect() protoreflect.Message {
+	mi := &file_users_proto_msgTypes[21]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use LogoutReq.ProtoReflect.Descriptor instead.
+func (*LogoutReq) Descriptor() ([]byte, []int) {
+	return file_users_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *LogoutReq) GetUserId() int64 {
+	if x != nil {
+		return x.UserId
+	}
+	return 0
+}
+
+type LogoutResp struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *LogoutResp) Reset() {
+	*x = LogoutResp{}
+	mi := &file_users_proto_msgTypes[22]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *LogoutResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*LogoutResp) ProtoMessage() {}
+
+func (x *LogoutResp) ProtoReflect() protoreflect.Message {
+	mi := &file_users_proto_msgTypes[22]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use LogoutResp.ProtoReflect.Descriptor instead.
+func (*LogoutResp) Descriptor() ([]byte, []int) {
+	return file_users_proto_rawDescGZIP(), []int{22}
+}
+
 var File_users_proto protoreflect.FileDescriptor
 
 const file_users_proto_rawDesc = "" +
 	"\n" +
 	"\vusers.proto\x12\x02pb\"\xb1\x02\n" +
 	"\x05Users\x12\x16\n" +
-	"\x06userId\x18\x01 \x01(\tR\x06userId\x12\x1a\n" +
+	"\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" +
 	"\busername\x18\x02 \x01(\tR\busername\x12\x16\n" +
 	"\x06passwd\x18\x03 \x01(\tR\x06passwd\x12\x1a\n" +
 	"\bnickname\x18\x04 \x01(\tR\bnickname\x12\x14\n" +
@@ -1255,7 +1487,7 @@ const file_users_proto_rawDesc = "" +
 	" \x01(\x03R\tupdatedAt\x12\x1c\n" +
 	"\tdeletedAt\x18\v \x01(\x03R\tdeletedAt\"\xb7\x02\n" +
 	"\vAddUsersReq\x12\x16\n" +
-	"\x06userId\x18\x01 \x01(\tR\x06userId\x12\x1a\n" +
+	"\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" +
 	"\busername\x18\x02 \x01(\tR\busername\x12\x16\n" +
 	"\x06passwd\x18\x03 \x01(\tR\x06passwd\x12\x1a\n" +
 	"\bnickname\x18\x04 \x01(\tR\bnickname\x12\x14\n" +
@@ -1271,7 +1503,7 @@ const file_users_proto_rawDesc = "" +
 	"\tdeletedAt\x18\v \x01(\x03R\tdeletedAt\"\x0e\n" +
 	"\fAddUsersResp\"\xba\x02\n" +
 	"\x0eUpdateUsersReq\x12\x16\n" +
-	"\x06userId\x18\x01 \x01(\tR\x06userId\x12\x1a\n" +
+	"\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" +
 	"\busername\x18\x02 \x01(\tR\busername\x12\x16\n" +
 	"\x06passwd\x18\x03 \x01(\tR\x06passwd\x12\x1a\n" +
 	"\bnickname\x18\x04 \x01(\tR\bnickname\x12\x14\n" +
@@ -1296,7 +1528,7 @@ const file_users_proto_rawDesc = "" +
 	"\x0eSearchUsersReq\x12\x12\n" +
 	"\x04page\x18\x01 \x01(\x03R\x04page\x12\x14\n" +
 	"\x05limit\x18\x02 \x01(\x03R\x05limit\x12\x16\n" +
-	"\x06userId\x18\x03 \x01(\tR\x06userId\x12\x1a\n" +
+	"\x06userId\x18\x03 \x01(\x03R\x06userId\x12\x1a\n" +
 	"\busername\x18\x04 \x01(\tR\busername\x12\x16\n" +
 	"\x06passwd\x18\x05 \x01(\tR\x06passwd\x12\x1a\n" +
 	"\bnickname\x18\x06 \x01(\tR\bnickname\x12\x14\n" +
@@ -1318,24 +1550,40 @@ const file_users_proto_rawDesc = "" +
 	"\x05users\x18\x01 \x01(\v2\t.pb.UsersR\x05users\">\n" +
 	"\bLoginReq\x12\x1a\n" +
 	"\busername\x18\x01 \x01(\tR\busername\x12\x16\n" +
-	"\x06passwd\x18\x02 \x01(\tR\x06passwd\"!\n" +
+	"\x06passwd\x18\x02 \x01(\tR\x06passwd\"c\n" +
 	"\tLoginResp\x12\x14\n" +
-	"\x05token\x18\x01 \x01(\tR\x05token\"@\n" +
+	"\x05token\x18\x01 \x01(\tR\x05token\x12\x1a\n" +
+	"\busername\x18\x02 \x01(\tR\busername\x12\x14\n" +
+	"\x05email\x18\x03 \x01(\tR\x05email\x12\x0e\n" +
+	"\x02id\x18\x04 \x01(\x03R\x02id\"@\n" +
 	"\x10ValidateTokenReq\x12\x14\n" +
 	"\x05token\x18\x01 \x01(\tR\x05token\x12\x16\n" +
-	"\x06userId\x18\x02 \x01(\tR\x06userId\"w\n" +
+	"\x06userId\x18\x02 \x01(\x03R\x06userId\"w\n" +
 	"\x11ValidateTokenResp\x12\x14\n" +
 	"\x05valid\x18\x01 \x01(\bR\x05valid\x12\x18\n" +
 	"\amessage\x18\x02 \x01(\tR\amessage\x12\x16\n" +
-	"\x06userId\x18\x03 \x01(\tR\x06userId\x12\x1a\n" +
+	"\x06userId\x18\x03 \x01(\x03R\x06userId\x12\x1a\n" +
 	"\broleType\x18\x04 \x01(\x03R\broleType\"`\n" +
 	"\x12CheckPermissionReq\x12\x16\n" +
-	"\x06userId\x18\x01 \x01(\tR\x06userId\x12\x1a\n" +
+	"\x06userId\x18\x01 \x01(\x03R\x06userId\x12\x1a\n" +
 	"\bresource\x18\x02 \x01(\tR\bresource\x12\x16\n" +
 	"\x06action\x18\x03 \x01(\tR\x06action\"I\n" +
 	"\x13CheckPermissionResp\x12\x18\n" +
 	"\aallowed\x18\x01 \x01(\bR\aallowed\x12\x18\n" +
-	"\amessage\x18\x02 \x01(\tR\amessage2\x87\x04\n" +
+	"\amessage\x18\x02 \x01(\tR\amessage\"\xa1\x01\n" +
+	"\vRegisterReq\x12\x1a\n" +
+	"\busername\x18\x01 \x01(\tR\busername\x12\x16\n" +
+	"\x06passwd\x18\x02 \x01(\tR\x06passwd\x12\x14\n" +
+	"\x05phone\x18\x03 \x01(\tR\x05phone\x12\x14\n" +
+	"\x05vcode\x18\x04 \x01(\x05R\x05vcode\x12\x14\n" +
+	"\x05email\x18\x05 \x01(\tR\x05email\x12\x1c\n" +
+	"\trequestId\x18\x06 \x01(\tR\trequestId\" \n" +
+	"\fRegisterResp\x12\x10\n" +
+	"\x03res\x18\x01 \x01(\tR\x03res\"#\n" +
+	"\tLogoutReq\x12\x16\n" +
+	"\x06userId\x18\x01 \x01(\x03R\x06userId\"\f\n" +
+	"\n" +
+	"LogoutResp2\xdf\x04\n" +
 	"\n" +
 	"usercenter\x12-\n" +
 	"\bAddUsers\x12\x0f.pb.AddUsersReq\x1a\x10.pb.AddUsersResp\x126\n" +
@@ -1344,9 +1592,11 @@ const file_users_proto_rawDesc = "" +
 	"\fGetUsersById\x12\x13.pb.GetUsersByIdReq\x1a\x14.pb.GetUsersByIdResp\x12H\n" +
 	"\x11GetUserByUsername\x12\x18.pb.GetUserByUsernameReq\x1a\x19.pb.GetUserByUsernameResp\x126\n" +
 	"\vSearchUsers\x12\x12.pb.SearchUsersReq\x1a\x13.pb.SearchUsersResp\x12$\n" +
-	"\x05Login\x12\f.pb.LoginReq\x1a\r.pb.LoginResp\x12<\n" +
+	"\x05Login\x12\f.pb.LoginReq\x1a\r.pb.LoginResp\x12-\n" +
+	"\bRegister\x12\x0f.pb.RegisterReq\x1a\x10.pb.RegisterResp\x12<\n" +
 	"\rValidateToken\x12\x14.pb.ValidateTokenReq\x1a\x15.pb.ValidateTokenResp\x12B\n" +
-	"\x0fCheckPermission\x12\x16.pb.CheckPermissionReq\x1a\x17.pb.CheckPermissionRespB\x06Z\x04./pbb\x06proto3"
+	"\x0fCheckPermission\x12\x16.pb.CheckPermissionReq\x1a\x17.pb.CheckPermissionResp\x12'\n" +
+	"\x06Logout\x12\r.pb.LogoutReq\x1a\x0e.pb.LogoutRespB\x06Z\x04./pbb\x06proto3"
 
 var (
 	file_users_proto_rawDescOnce sync.Once
@@ -1360,7 +1610,7 @@ func file_users_proto_rawDescGZIP() []byte {
 	return file_users_proto_rawDescData
 }
 
-var file_users_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
+var file_users_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
 var file_users_proto_goTypes = []any{
 	(*Users)(nil),                 // 0: pb.Users
 	(*AddUsersReq)(nil),           // 1: pb.AddUsersReq
@@ -1381,6 +1631,10 @@ var file_users_proto_goTypes = []any{
 	(*ValidateTokenResp)(nil),     // 16: pb.ValidateTokenResp
 	(*CheckPermissionReq)(nil),    // 17: pb.CheckPermissionReq
 	(*CheckPermissionResp)(nil),   // 18: pb.CheckPermissionResp
+	(*RegisterReq)(nil),           // 19: pb.RegisterReq
+	(*RegisterResp)(nil),          // 20: pb.RegisterResp
+	(*LogoutReq)(nil),             // 21: pb.LogoutReq
+	(*LogoutResp)(nil),            // 22: pb.LogoutResp
 }
 var file_users_proto_depIdxs = []int32{
 	0,  // 0: pb.GetUsersByIdResp.users:type_name -> pb.Users
@@ -1393,19 +1647,23 @@ var file_users_proto_depIdxs = []int32{
 	11, // 7: pb.usercenter.GetUserByUsername:input_type -> pb.GetUserByUsernameReq
 	9,  // 8: pb.usercenter.SearchUsers:input_type -> pb.SearchUsersReq
 	13, // 9: pb.usercenter.Login:input_type -> pb.LoginReq
-	15, // 10: pb.usercenter.ValidateToken:input_type -> pb.ValidateTokenReq
-	17, // 11: pb.usercenter.CheckPermission:input_type -> pb.CheckPermissionReq
-	2,  // 12: pb.usercenter.AddUsers:output_type -> pb.AddUsersResp
-	4,  // 13: pb.usercenter.UpdateUsers:output_type -> pb.UpdateUsersResp
-	6,  // 14: pb.usercenter.DelUsers:output_type -> pb.DelUsersResp
-	8,  // 15: pb.usercenter.GetUsersById:output_type -> pb.GetUsersByIdResp
-	12, // 16: pb.usercenter.GetUserByUsername:output_type -> pb.GetUserByUsernameResp
-	10, // 17: pb.usercenter.SearchUsers:output_type -> pb.SearchUsersResp
-	14, // 18: pb.usercenter.Login:output_type -> pb.LoginResp
-	16, // 19: pb.usercenter.ValidateToken:output_type -> pb.ValidateTokenResp
-	18, // 20: pb.usercenter.CheckPermission:output_type -> pb.CheckPermissionResp
-	12, // [12:21] is the sub-list for method output_type
-	3,  // [3:12] is the sub-list for method input_type
+	19, // 10: pb.usercenter.Register:input_type -> pb.RegisterReq
+	15, // 11: pb.usercenter.ValidateToken:input_type -> pb.ValidateTokenReq
+	17, // 12: pb.usercenter.CheckPermission:input_type -> pb.CheckPermissionReq
+	21, // 13: pb.usercenter.Logout:input_type -> pb.LogoutReq
+	2,  // 14: pb.usercenter.AddUsers:output_type -> pb.AddUsersResp
+	4,  // 15: pb.usercenter.UpdateUsers:output_type -> pb.UpdateUsersResp
+	6,  // 16: pb.usercenter.DelUsers:output_type -> pb.DelUsersResp
+	8,  // 17: pb.usercenter.GetUsersById:output_type -> pb.GetUsersByIdResp
+	12, // 18: pb.usercenter.GetUserByUsername:output_type -> pb.GetUserByUsernameResp
+	10, // 19: pb.usercenter.SearchUsers:output_type -> pb.SearchUsersResp
+	14, // 20: pb.usercenter.Login:output_type -> pb.LoginResp
+	20, // 21: pb.usercenter.Register:output_type -> pb.RegisterResp
+	16, // 22: pb.usercenter.ValidateToken:output_type -> pb.ValidateTokenResp
+	18, // 23: pb.usercenter.CheckPermission:output_type -> pb.CheckPermissionResp
+	22, // 24: pb.usercenter.Logout:output_type -> pb.LogoutResp
+	14, // [14:25] is the sub-list for method output_type
+	3,  // [3:14] is the sub-list for method input_type
 	3,  // [3:3] is the sub-list for extension type_name
 	3,  // [3:3] is the sub-list for extension extendee
 	0,  // [0:3] is the sub-list for field type_name
@@ -1422,7 +1680,7 @@ func file_users_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_users_proto_rawDesc), len(file_users_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   19,
+			NumMessages:   23,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

app/users/rpc/pb/users_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.5.1
-// - protoc             v6.32.0
+// - protoc-gen-go-grpc v1.6.1
+// - protoc             v5.29.6
 // source: users.proto
 
 package pb
@@ -26,8 +26,10 @@ const (
 	Usercenter_GetUserByUsername_FullMethodName = "/pb.usercenter/GetUserByUsername"
 	Usercenter_SearchUsers_FullMethodName       = "/pb.usercenter/SearchUsers"
 	Usercenter_Login_FullMethodName             = "/pb.usercenter/Login"
+	Usercenter_Register_FullMethodName          = "/pb.usercenter/Register"
 	Usercenter_ValidateToken_FullMethodName     = "/pb.usercenter/ValidateToken"
 	Usercenter_CheckPermission_FullMethodName   = "/pb.usercenter/CheckPermission"
+	Usercenter_Logout_FullMethodName            = "/pb.usercenter/Logout"
 )
 
 // UsercenterClient is the client API for Usercenter service.
@@ -42,8 +44,10 @@ type UsercenterClient interface {
 	GetUserByUsername(ctx context.Context, in *GetUserByUsernameReq, opts ...grpc.CallOption) (*GetUserByUsernameResp, error)
 	SearchUsers(ctx context.Context, in *SearchUsersReq, opts ...grpc.CallOption) (*SearchUsersResp, error)
 	Login(ctx context.Context, in *LoginReq, opts ...grpc.CallOption) (*LoginResp, error)
+	Register(ctx context.Context, in *RegisterReq, opts ...grpc.CallOption) (*RegisterResp, error)
 	ValidateToken(ctx context.Context, in *ValidateTokenReq, opts ...grpc.CallOption) (*ValidateTokenResp, error)
 	CheckPermission(ctx context.Context, in *CheckPermissionReq, opts ...grpc.CallOption) (*CheckPermissionResp, error)
+	Logout(ctx context.Context, in *LogoutReq, opts ...grpc.CallOption) (*LogoutResp, error)
 }
 
 type usercenterClient struct {
@@ -124,6 +128,16 @@ func (c *usercenterClient) Login(ctx context.Context, in *LoginReq, opts ...grpc
 	return out, nil
 }
 
+func (c *usercenterClient) Register(ctx context.Context, in *RegisterReq, opts ...grpc.CallOption) (*RegisterResp, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(RegisterResp)
+	err := c.cc.Invoke(ctx, Usercenter_Register_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *usercenterClient) ValidateToken(ctx context.Context, in *ValidateTokenReq, opts ...grpc.CallOption) (*ValidateTokenResp, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(ValidateTokenResp)
@@ -144,6 +158,16 @@ func (c *usercenterClient) CheckPermission(ctx context.Context, in *CheckPermiss
 	return out, nil
 }
 
+func (c *usercenterClient) Logout(ctx context.Context, in *LogoutReq, opts ...grpc.CallOption) (*LogoutResp, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(LogoutResp)
+	err := c.cc.Invoke(ctx, Usercenter_Logout_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // UsercenterServer is the server API for Usercenter service.
 // All implementations must embed UnimplementedUsercenterServer
 // for forward compatibility.
@@ -156,8 +180,10 @@ type UsercenterServer interface {
 	GetUserByUsername(context.Context, *GetUserByUsernameReq) (*GetUserByUsernameResp, error)
 	SearchUsers(context.Context, *SearchUsersReq) (*SearchUsersResp, error)
 	Login(context.Context, *LoginReq) (*LoginResp, error)
+	Register(context.Context, *RegisterReq) (*RegisterResp, error)
 	ValidateToken(context.Context, *ValidateTokenReq) (*ValidateTokenResp, error)
 	CheckPermission(context.Context, *CheckPermissionReq) (*CheckPermissionResp, error)
+	Logout(context.Context, *LogoutReq) (*LogoutResp, error)
 	mustEmbedUnimplementedUsercenterServer()
 }
 
@@ -169,31 +195,37 @@ type UsercenterServer interface {
 type UnimplementedUsercenterServer struct{}
 
 func (UnimplementedUsercenterServer) AddUsers(context.Context, *AddUsersReq) (*AddUsersResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AddUsers not implemented")
+	return nil, status.Error(codes.Unimplemented, "method AddUsers not implemented")
 }
 func (UnimplementedUsercenterServer) UpdateUsers(context.Context, *UpdateUsersReq) (*UpdateUsersResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UpdateUsers not implemented")
+	return nil, status.Error(codes.Unimplemented, "method UpdateUsers not implemented")
 }
 func (UnimplementedUsercenterServer) DelUsers(context.Context, *DelUsersReq) (*DelUsersResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DelUsers not implemented")
+	return nil, status.Error(codes.Unimplemented, "method DelUsers not implemented")
 }
 func (UnimplementedUsercenterServer) GetUsersById(context.Context, *GetUsersByIdReq) (*GetUsersByIdResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetUsersById not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetUsersById not implemented")
 }
 func (UnimplementedUsercenterServer) GetUserByUsername(context.Context, *GetUserByUsernameReq) (*GetUserByUsernameResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetUserByUsername not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetUserByUsername not implemented")
 }
 func (UnimplementedUsercenterServer) SearchUsers(context.Context, *SearchUsersReq) (*SearchUsersResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SearchUsers not implemented")
+	return nil, status.Error(codes.Unimplemented, "method SearchUsers not implemented")
 }
 func (UnimplementedUsercenterServer) Login(context.Context, *LoginReq) (*LoginResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Login not implemented")
+	return nil, status.Error(codes.Unimplemented, "method Login not implemented")
+}
+func (UnimplementedUsercenterServer) Register(context.Context, *RegisterReq) (*RegisterResp, error) {
+	return nil, status.Error(codes.Unimplemented, "method Register not implemented")
 }
 func (UnimplementedUsercenterServer) ValidateToken(context.Context, *ValidateTokenReq) (*ValidateTokenResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ValidateToken not implemented")
+	return nil, status.Error(codes.Unimplemented, "method ValidateToken not implemented")
 }
 func (UnimplementedUsercenterServer) CheckPermission(context.Context, *CheckPermissionReq) (*CheckPermissionResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CheckPermission not implemented")
+	return nil, status.Error(codes.Unimplemented, "method CheckPermission not implemented")
+}
+func (UnimplementedUsercenterServer) Logout(context.Context, *LogoutReq) (*LogoutResp, error) {
+	return nil, status.Error(codes.Unimplemented, "method Logout not implemented")
 }
 func (UnimplementedUsercenterServer) mustEmbedUnimplementedUsercenterServer() {}
 func (UnimplementedUsercenterServer) testEmbeddedByValue()                    {}
@@ -206,7 +238,7 @@ type UnsafeUsercenterServer interface {
 }
 
 func RegisterUsercenterServer(s grpc.ServiceRegistrar, srv UsercenterServer) {
-	// If the following call pancis, it indicates UnimplementedUsercenterServer was
+	// If the following call panics, it indicates UnimplementedUsercenterServer was
 	// embedded by pointer and is nil.  This will cause panics if an
 	// unimplemented method is ever invoked, so we test this at initialization
 	// time to prevent it from happening at runtime later due to I/O.
@@ -342,6 +374,24 @@ func _Usercenter_Login_Handler(srv interface{}, ctx context.Context, dec func(in
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Usercenter_Register_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RegisterReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UsercenterServer).Register(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Usercenter_Register_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UsercenterServer).Register(ctx, req.(*RegisterReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Usercenter_ValidateToken_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(ValidateTokenReq)
 	if err := dec(in); err != nil {
@@ -378,6 +428,24 @@ func _Usercenter_CheckPermission_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Usercenter_Logout_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(LogoutReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(UsercenterServer).Logout(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Usercenter_Logout_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(UsercenterServer).Logout(ctx, req.(*LogoutReq))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Usercenter_ServiceDesc is the grpc.ServiceDesc for Usercenter service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -413,6 +481,10 @@ var Usercenter_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "Login",
 			Handler:    _Usercenter_Login_Handler,
 		},
+		{
+			MethodName: "Register",
+			Handler:    _Usercenter_Register_Handler,
+		},
 		{
 			MethodName: "ValidateToken",
 			Handler:    _Usercenter_ValidateToken_Handler,
@@ -421,6 +493,10 @@ var Usercenter_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "CheckPermission",
 			Handler:    _Usercenter_CheckPermission_Handler,
 		},
+		{
+			MethodName: "Logout",
+			Handler:    _Usercenter_Logout_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "users.proto",

app/users/rpc/usercenter/usercenter.go

@@ -26,6 +26,10 @@ type (
 	GetUsersByIdResp      = pb.GetUsersByIdResp
 	LoginReq              = pb.LoginReq
 	LoginResp             = pb.LoginResp
+	LogoutReq             = pb.LogoutReq
+	LogoutResp            = pb.LogoutResp
+	RegisterReq           = pb.RegisterReq
+	RegisterResp          = pb.RegisterResp
 	SearchUsersReq        = pb.SearchUsersReq
 	SearchUsersResp       = pb.SearchUsersResp
 	UpdateUsersReq        = pb.UpdateUsersReq
@@ -43,8 +47,10 @@ type (
 		GetUserByUsername(ctx context.Context, in *GetUserByUsernameReq, opts ...grpc.CallOption) (*GetUserByUsernameResp, error)
 		SearchUsers(ctx context.Context, in *SearchUsersReq, opts ...grpc.CallOption) (*SearchUsersResp, error)
 		Login(ctx context.Context, in *LoginReq, opts ...grpc.CallOption) (*LoginResp, error)
+		Register(ctx context.Context, in *RegisterReq, opts ...grpc.CallOption) (*RegisterResp, error)
 		ValidateToken(ctx context.Context, in *ValidateTokenReq, opts ...grpc.CallOption) (*ValidateTokenResp, error)
 		CheckPermission(ctx context.Context, in *CheckPermissionReq, opts ...grpc.CallOption) (*CheckPermissionResp, error)
+		Logout(ctx context.Context, in *LogoutReq, opts ...grpc.CallOption) (*LogoutResp, error)
 	}
 
 	defaultUsercenter struct {
@@ -94,6 +100,11 @@ func (m *defaultUsercenter) Login(ctx context.Context, in *LoginReq, opts ...grp
 	return client.Login(ctx, in, opts...)
 }
 
+func (m *defaultUsercenter) Register(ctx context.Context, in *RegisterReq, opts ...grpc.CallOption) (*RegisterResp, error) {
+	client := pb.NewUsercenterClient(m.cli.Conn())
+	return client.Register(ctx, in, opts...)
+}
+
 func (m *defaultUsercenter) ValidateToken(ctx context.Context, in *ValidateTokenReq, opts ...grpc.CallOption) (*ValidateTokenResp, error) {
 	client := pb.NewUsercenterClient(m.cli.Conn())
 	return client.ValidateToken(ctx, in, opts...)
@@ -103,3 +114,8 @@ func (m *defaultUsercenter) CheckPermission(ctx context.Context, in *CheckPermis
 	client := pb.NewUsercenterClient(m.cli.Conn())
 	return client.CheckPermission(ctx, in, opts...)
 }
+
+func (m *defaultUsercenter) Logout(ctx context.Context, in *LogoutReq, opts ...grpc.CallOption) (*LogoutResp, error) {
+	client := pb.NewUsercenterClient(m.cli.Conn())
+	return client.Logout(ctx, in, opts...)
+}