1. 调整目录结构

2. 实现user_controller

internal/app/controller/response.go

@@ -0,0 +1,30 @@
+package controller
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+// Response 定义统一的API响应结构体
+type Response struct {
+	Code    int         `json:"code"`    // 业务状态码
+	Message string      `json:"message"` // 提示信息
+	Data    interface{} `json:"data"`    // 业务数据
+}
+
+// SendResponse 发送统一格式的JSON响应
+// httpStatus 参数现在将几乎总是 http.StatusOK，业务状态码通过 Response.Code 传递
+func SendResponse(ctx *gin.Context, code int, message string, data interface{}) {
+	ctx.JSON(http.StatusOK, Response{
+		Code:    code,
+		Message: message,
+		Data:    data,
+	})
+}
+
+// SendErrorResponse 发送统一格式的错误响应
+// 错误响应通常不包含业务数据，因此 data 参数固定为 nil
+func SendErrorResponse(ctx *gin.Context, code int, message string) {
+	SendResponse(ctx, code, message, nil)
+}

internal/app/controller/user/user_controller.go

@@ -0,0 +1,149 @@
+package user
+
+import (
+	"net/http"
+	"time"
+
+	"git.huangwc.com/pig/pig-farm-controller/internal/app/controller"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
+	"github.com/gin-gonic/gin"
+	"github.com/golang-jwt/jwt/v5"
+	"gorm.io/gorm"
+)
+
+// jwtSecret 是用于签名 JWT 的密钥。在生产环境中，这应该从环境变量或安全配置中读取。
+var jwtSecret = []byte("your_super_secret_jwt_key")
+
+// Controller 用户控制器
+type Controller struct {
+	userRepo repository.UserRepository
+	logger   *logs.Logger
+}
+
+// NewController 创建用户控制器实例
+func NewController(userRepo repository.UserRepository, logger *logs.Logger) *Controller {
+	return &Controller{
+		userRepo: userRepo,
+		logger:   logger,
+	}
+}
+
+// CreateUserRequest 定义创建用户请求的结构体
+type CreateUserRequest struct {
+	Username string `json:"username" binding:"required"`
+	Password string `json:"password" binding:"required,min=6"`
+}
+
+// LoginRequest 定义登录请求的结构体
+type LoginRequest struct {
+	Username string `json:"username" binding:"required"`
+	Password string `json:"password" binding:"required"`
+}
+
+// CreateUserResponse 定义创建用户成功响应的结构体
+type CreateUserResponse struct {
+	Username string `json:"username"`
+	ID       uint   `json:"id"`
+}
+
+// LoginResponse 定义登录成功响应的结构体
+type LoginResponse struct {
+	Username string `json:"username"`
+	ID       uint   `json:"id"`
+	Token    string `json:"token"`
+}
+
+// generateToken 为给定用户生成 JWT
+func generateToken(userID uint, username string) (string, error) {
+	expirationTime := time.Now().Add(24 * time.Hour) // Token 24 小时后过期
+	claims := jwt.MapClaims{
+		"user_id":  userID,
+		"username": username,
+		"exp":      expirationTime.Unix(),
+	}
+
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	tokenString, err := token.SignedString(jwtSecret)
+	if err != nil {
+		return "", err
+	}
+
+	return tokenString, nil
+}
+
+// CreateUser 处理创建用户的请求
+func (c *Controller) CreateUser(ctx *gin.Context) {
+	var req CreateUserRequest
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		c.logger.Errorf("CreateUser: 参数绑定失败: %v", err)
+		controller.SendErrorResponse(ctx, http.StatusBadRequest, err.Error())
+		return
+	}
+
+	user := &models.User{
+		Username: req.Username,
+		Password: req.Password, // 密码会在 BeforeSave 钩子中哈希
+	}
+
+	if err := c.userRepo.Create(user); err != nil {
+		c.logger.Errorf("CreateUser: 创建用户失败: %v", err)
+
+		// 尝试查询用户，以判断是否是用户名重复导致的错误
+		_, findErr := c.userRepo.FindByUsername(req.Username)
+		if findErr == nil { // 如果能找到用户，说明是用户名重复
+			controller.SendErrorResponse(ctx, http.StatusConflict, "用户名已存在")
+			return
+		}
+
+		// 其他创建失败的情况
+		controller.SendErrorResponse(ctx, http.StatusInternalServerError, "创建用户失败")
+		return
+	}
+
+	controller.SendResponse(ctx, http.StatusOK, "用户创建成功", CreateUserResponse{
+		Username: user.Username,
+		ID:       user.ID,
+	})
+}
+
+// Login 处理用户登录请求
+func (c *Controller) Login(ctx *gin.Context) {
+	var req LoginRequest
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		c.logger.Errorf("Login: 参数绑定失败: %v", err)
+		controller.SendErrorResponse(ctx, http.StatusBadRequest, err.Error())
+		return
+	}
+
+	user, err := c.userRepo.FindByUsername(req.Username)
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			controller.SendErrorResponse(ctx, http.StatusUnauthorized, "用户名或密码不正确")
+			return
+		}
+		c.logger.Errorf("Login: 查询用户失败: %v", err)
+		controller.SendErrorResponse(ctx, http.StatusInternalServerError, "登录失败")
+		return
+	}
+
+	if !user.CheckPassword(req.Password) {
+		controller.SendErrorResponse(ctx, http.StatusUnauthorized, "用户名或密码不正确")
+		return
+	}
+
+	// 登录成功，生成 JWT token
+	tokenString, err := generateToken(user.ID, user.Username)
+	if err != nil {
+		c.logger.Errorf("Login: 生成 token 失败: %v", err)
+		controller.SendErrorResponse(ctx, http.StatusInternalServerError, "登录失败，无法生成认证信息")
+		return
+	}
+
+	controller.SendResponse(ctx, http.StatusOK, "登录成功", LoginResponse{
+		Username: user.Username,
+		ID:       user.ID,
+		Token:    tokenString,
+	})
+}

internal/core/application.go

@@ -7,17 +7,17 @@ import (
 	"os/signal"
 	"syscall"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/config"
-	"git.huangwc.com/pig/pig-farm-controller/internal/logs"
-	"git.huangwc.com/pig/pig-farm-controller/internal/storage/db"
-	"git.huangwc.com/pig/pig-farm-controller/internal/task"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/config"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/database"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/task"
 )
 
 // Application 是整个应用的核心，封装了所有组件和生命周期。
 type Application struct {
 	Config   *config.Config
 	Logger   *logs.Logger
-	Storage  db.Storage
+	Storage  database.Storage
 	Executor *task.Executor
 }
 
@@ -89,9 +89,9 @@ func (app *Application) Stop() error {
 }
 
 // initStorage 封装了数据库的初始化、连接和迁移逻辑。
-func initStorage(cfg config.DatabaseConfig, logger *logs.Logger) (db.Storage, error) {
+func initStorage(cfg config.DatabaseConfig, logger *logs.Logger) (database.Storage, error) {
 	// 创建存储实例
-	storage := db.NewStorage(cfg, logger)
+	storage := database.NewStorage(cfg, logger)
 	if err := storage.Connect(); err != nil {
 		// 错误已在 Connect 内部被记录，这里只需包装并返回
 		return nil, fmt.Errorf("数据库连接失败: %w", err)

internal/infra/database/postgres.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"time"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/logs"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 )

internal/infra/database/storage.go

@@ -6,8 +6,8 @@ package database
 import (
 	"fmt"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/config"
-	"git.huangwc.com/pig/pig-farm-controller/internal/logs"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/config"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
 	"gorm.io/gorm"
 )
 

internal/infra/logs/logs.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/config"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/config"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"

internal/infra/logs/logs_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/config"
-	"git.huangwc.com/pig/pig-farm-controller/internal/logs"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/config"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"

internal/infra/models/user_test.go

@@ -4,7 +4,7 @@ package models_test
 import (
 	"testing"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/models"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/crypto/bcrypt"
 )

internal/infra/repository/user_repository.go

@@ -2,7 +2,7 @@
 package repository
 
 import (
-	"git.huangwc.com/pig/pig-farm-controller/internal/models"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
 	"gorm.io/gorm"
 )
 

internal/infra/repository/user_repository_test.go

@@ -4,8 +4,8 @@ package repository_test
 import (
 	"testing"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/models"
-	"git.huangwc.com/pig/pig-farm-controller/internal/repository"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
 	"github.com/stretchr/testify/assert"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"

internal/infra/task/task.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/logs"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
 )
 
 // Task 代表一个任务接口

internal/infra/task/task_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"git.huangwc.com/pig/pig-farm-controller/internal/config"
-	"git.huangwc.com/pig/pig-farm-controller/internal/logs"
-	"git.huangwc.com/pig/pig-farm-controller/internal/task"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/config"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/task"
 	"github.com/stretchr/testify/assert"
 )