feat: role.

controllers/login.go

@@ -15,8 +15,13 @@ type LoginRequest struct {
 }
 
 type RegisterRequest struct {
-	Username string `json:"username" form:"username"`
-	Password string `json:"password" form:"password"`
+	Username   string                `json:"username" form:"username"`
+	Password   string                `json:"password" form:"password"`
+	Email      *string               `json:"email" form:"email"`
+	Phone      *string               `json:"phone" form:"phone"`
+	Role       models.UserRole       `json:"role" form:"role"`
+	FlavorType models.UserFlavorType `json:"flavorType" form:"flavorType"`
+	RegionIDs  []uint32              `json:"regionIds" form:"regionIds"`
 }
 
 type AuthResponse struct {
@@ -41,8 +46,13 @@ func Register(c *gin.Context) {
 
 	// 创建新用户
 	user := models.User{
-		Username: req.Username,
-		Password: req.Password, // BeforeCreate钩子会自动加密
+		Username:   req.Username,
+		Email:      req.Email,
+		Phone:      req.Phone,
+		Password:   req.Password, // BeforeCreate钩子会自动加密
+		Role:       req.Role,
+		FlavorType: req.FlavorType,
+		Regions:    buildUserRegionBindings(req.RegionIDs),
 	}
 
 	if result := config.DB.Create(&user); result.Error != nil {
@@ -51,7 +61,7 @@ func Register(c *gin.Context) {
 	}
 
 	// 生成Token
-	token, err := util.GenerateToken(user.ID, user.Username)
+	token, err := util.GenerateToken(&user)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to generate token"})
 		return
@@ -73,7 +83,7 @@ func Login(c *gin.Context) {
 
 	// 查找用户
 	var user models.User
-	result := config.DB.Where("username = ?", req.Username).First(&user)
+	result := config.DB.Preload("Regions").Where("username = ?", req.Username).First(&user)
 
 	if result.Error != nil {
 		c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid username or password"})
@@ -85,9 +95,13 @@ func Login(c *gin.Context) {
 		c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid username or password"})
 		return
 	}
+	if !user.IsActive {
+		c.JSON(http.StatusForbidden, gin.H{"error": "User is disabled"})
+		return
+	}
 
 	// 生成JWT Token
-	token, err := util.GenerateToken(user.ID, user.Username)
+	token, err := util.GenerateToken(&user)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to generate token"})
 		return
@@ -108,10 +122,29 @@ func GetProfile(c *gin.Context) {
 	}
 
 	var user models.User
-	if result := config.DB.First(&user, userID); result.Error != nil {
+	if result := config.DB.Preload("Regions").First(&user, userID); result.Error != nil {
 		c.JSON(http.StatusNotFound, gin.H{"error": "User not found"})
 		return
 	}
 
 	c.JSON(http.StatusOK, user)
 }
+
+func buildUserRegionBindings(regionIDs []uint32) []models.UserRegionBinding {
+	if len(regionIDs) == 0 {
+		return nil
+	}
+	seen := make(map[uint32]struct{}, len(regionIDs))
+	regions := make([]models.UserRegionBinding, 0, len(regionIDs))
+	for _, regionID := range regionIDs {
+		if regionID == 0 {
+			continue
+		}
+		if _, exists := seen[regionID]; exists {
+			continue
+		}
+		seen[regionID] = struct{}{}
+		regions = append(regions, models.UserRegionBinding{RegionID: regionID})
+	}
+	return regions
+}