1. 小程序端

2. 视频优化

server/config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"bytes"
 	"fmt"
 	"log"
 	"os"
@@ -17,37 +18,102 @@ var DB *gorm.DB
 // JWTSecret is the secret key used for signing JWT tokens
 var JWTSecret = "your-secret-key" // Default value, should be set via JWT_SECRET environment variable in production
 
-// LoadEnvFile 从可执行文件同级目录加载 .env 文件
-func LoadEnvFile() {
-	// 获取可执行文件路径
-	execPath, err := os.Executable()
+// utf8BOM 用于剥离 Windows 编辑器常写入的 UTF-8 BOM，否则 godotenv 会解析失败
+var utf8BOM = []byte{0xEF, 0xBB, 0xBF}
+
+// tryLoadEnv 尝试加载指定路径的 .env；成功则记录日志并返回 true。
+// 会先去掉 UTF-8 BOM，再按 godotenv 默认语义：不覆盖已存在的 OS 环境变量。
+func tryLoadEnv(path string) bool {
+	if path == "" {
+		return false
+	}
+	raw, err := os.ReadFile(path)
 	if err != nil {
-		log.Printf("Warning: Failed to get executable path: %v. Using current working directory.", err)
-		// 如果获取可执行文件路径失败，使用当前工作目录
-		if err := godotenv.Load(".env"); err != nil {
-			log.Printf("Info: .env file not found in current directory: %v", err)
-		} else {
-			log.Println("Loaded .env file from current directory")
+		return false
+	}
+	raw = bytes.TrimPrefix(raw, utf8BOM)
+	envMap, err := godotenv.Parse(bytes.NewReader(raw))
+	if err != nil {
+		log.Printf("Warning: found .env at %s but failed to parse: %v", path, err)
+		return false
+	}
+	applied := 0
+	for k, v := range envMap {
+		if os.Getenv(k) == "" {
+			_ = os.Setenv(k, v)
+			applied++
 		}
-		return
+	}
+	log.Printf("Loaded .env file from %s (%d keys applied)", path, applied)
+	return true
+}
+
+// collectEnvCandidates 收集候选 .env 路径：可执行文件旁、cwd、cwd/server、向上 3 级
+func collectEnvCandidates() []string {
+	seen := map[string]struct{}{}
+	var list []string
+	add := func(p string) {
+		abs, err := filepath.Abs(p)
+		if err != nil {
+			abs = p
+		}
+		if _, ok := seen[abs]; ok {
+			return
+		}
+		seen[abs] = struct{}{}
+		list = append(list, abs)
 	}
 
-	// 获取可执行文件所在目录
-	execDir := filepath.Dir(execPath)
-	envPath := filepath.Join(execDir, ".env")
-
-	// 检查 .env 文件是否存在
-	if _, err := os.Stat(envPath); os.IsNotExist(err) {
-		log.Printf("Info: .env file not found at %s, using environment variables or defaults", envPath)
-		return
-	}
-
-	// 加载 .env 文件
-	if err := godotenv.Load(envPath); err != nil {
-		log.Printf("Warning: Failed to load .env file from %s: %v", envPath, err)
+	if execPath, err := os.Executable(); err == nil {
+		add(filepath.Join(filepath.Dir(execPath), ".env"))
 	} else {
-		log.Printf("Loaded .env file from %s", envPath)
+		log.Printf("Warning: Failed to get executable path: %v", err)
 	}
+
+	cwd, err := os.Getwd()
+	if err != nil {
+		log.Printf("Warning: Failed to get working directory: %v", err)
+		cwd = "."
+	}
+	add(filepath.Join(cwd, ".env"))
+	add(filepath.Join(cwd, "server", ".env")) // 从仓库根启动时
+
+	// 向上最多 3 级父目录查找 .env 与 server/.env
+	dir := cwd
+	for i := 0; i < 3; i++ {
+		parent := filepath.Dir(dir)
+		if parent == dir {
+			break
+		}
+		dir = parent
+		add(filepath.Join(dir, ".env"))
+		add(filepath.Join(dir, "server", ".env"))
+	}
+	return list
+}
+
+// LoadEnvFile 依次尝试多个路径加载 .env（后加载补缺，不覆盖已有 OS 环境变量）
+func LoadEnvFile() {
+	loadedPaths := []string{}
+	for _, p := range collectEnvCandidates() {
+		if tryLoadEnv(p) {
+			loadedPaths = append(loadedPaths, p)
+		}
+	}
+
+	if len(loadedPaths) == 0 {
+		log.Println("Info: no .env loaded; relying on process environment variables")
+	} else {
+		log.Printf("Env load summary: %d file(s) loaded", len(loadedPaths))
+	}
+
+	appID := os.Getenv("WECHAT_APP_ID")
+	secret := os.Getenv("WECHAT_APP_SECRET")
+	log.Printf(
+		"WeChat env: APP_ID_set=%v SECRET_set=%v",
+		appID != "",
+		secret != "",
+	)
 }
 
 func InitDB() {

server/handlers/attachment.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	"github.com/niangaodev/art-code/models"
@@ -31,12 +32,21 @@ func AdminUploadAttachment(c *gin.Context) {
 		}
 	}
 
-	// 获取存储类型：Env 齐全时默认 aliyun
-	defaultStorage := "local"
-	if utils.HasAliyunEnvConfig() {
-		defaultStorage = "aliyun"
+	// 存储类型解析：客户端显式传入 > 数据库启用配置 > Aliyun Env > local
+	storageType := strings.TrimSpace(c.PostForm("storageType"))
+	var ossConfig *models.OSSConfig
+	usedEnvConfig := false
+
+	if storageType == "" {
+		if cfg, cfgErr := repositories.GetActiveOSSConfig(""); cfgErr == nil && cfg != nil {
+			storageType = cfg.StorageType
+			ossConfig = cfg // 复用，避免下方再查
+		} else if utils.HasAliyunEnvConfig() {
+			storageType = "aliyun"
+		} else {
+			storageType = "local"
+		}
 	}
-	storageType := c.DefaultPostForm("storageType", defaultStorage)
 
 	// 打开文件
 	src, err := file.Open()
@@ -51,10 +61,8 @@ func AdminUploadAttachment(c *gin.Context) {
 		StorageType: storageType,
 	}
 
-	var ossConfig *models.OSSConfig
-	usedEnvConfig := false
-
-	if storageType == "aliyun" {
+	// 仅在无库配置时才用 Env 阿里云（库配置优先）
+	if storageType == "aliyun" && ossConfig == nil {
 		if envCfg, ok := utils.LoadAliyunConfigFromEnv(); ok {
 			config = envCfg
 			usedEnvConfig = true
@@ -62,10 +70,12 @@ func AdminUploadAttachment(c *gin.Context) {
 	}
 
 	if !usedEnvConfig && storageType != "local" {
-		ossConfig, err = repositories.GetActiveOSSConfig(storageType)
-		if err != nil || ossConfig == nil {
-			utils.Error(c, 400, "OSS config not found or not active")
-			return
+		if ossConfig == nil {
+			ossConfig, err = repositories.GetActiveOSSConfig(storageType)
+			if err != nil || ossConfig == nil {
+				utils.Error(c, 400, "OSS config not found or not active")
+				return
+			}
 		}
 
 		// 根据存储类型从专用字段或通用字段读取配置

server/handlers/post.go

@@ -224,6 +224,28 @@ func GetPost(c *gin.Context) {
 	}()
 }
 
+// AdminGetPost 后台按 ID 获取文章详情（含未发布），供编辑表单加载
+func AdminGetPost(c *gin.Context) {
+	idStr := c.Param("id")
+	var id uint
+	if _, err := fmt.Sscanf(idStr, "%d", &id); err != nil {
+		utils.Error(c, 400, "Invalid post ID")
+		return
+	}
+
+	post, err := repositories.GetPostByIDAdmin(id)
+	if err != nil {
+		utils.ServerError(c, err)
+		return
+	}
+	if post == nil {
+		utils.Error(c, 404, "Post not found")
+		return
+	}
+
+	utils.Success(c, repositories.BuildPostResponse(post, true))
+}
+
 // 获取所有文章（包括未发布的，后台用）
 func AdminGetPosts(c *gin.Context) {
 	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))

server/main.go

@@ -27,6 +27,7 @@ func main() {
 	repositories.MigratePostUserID()
 	repositories.MigrateUserAvatar()
 	repositories.MigrateUserProfileFields()
+	repositories.MigrateUserWxOpenID()
 	repositories.MigrateVideoModule()
 	repositories.MigratePptTemplates()
 	repositories.MigrateOSSConfigFields()
@@ -118,6 +119,16 @@ func main() {
 		api.POST("/inquiries", handlers.SubmitInquiry)
 		api.GET("/email-suffixes", handlers.GetEmailSuffixes)
 
+		// 微信小程序静默登录
+		api.POST("/auth/wx-login", handlers.WxLogin)
+
+		// 需登录：游客合并到管理员账号
+		authUser := api.Group("")
+		authUser.Use(middleware.AuthMiddleware())
+		{
+			authUser.POST("/auth/merge-account", handlers.MergeAccount)
+		}
+
 		// 用户公开资料
 		api.GET("/users/:id/profile", handlers.GetUserProfile)
 		api.GET("/users/:id/posts", handlers.GetUserPosts)
@@ -205,6 +216,7 @@ func main() {
 
 			// 文章管理
 			authAdmin.GET("/posts", middleware.PermissionMiddleware("posts", "read"), handlers.AdminGetPosts)
+			authAdmin.GET("/posts/:id", middleware.PermissionMiddleware("posts", "read"), handlers.AdminGetPost)
 			authAdmin.POST("/posts", middleware.PermissionMiddleware("posts", "create"), handlers.AdminCreatePost)
 			authAdmin.PUT("/posts/:id", middleware.PermissionMiddleware("posts", "update"), handlers.AdminUpdatePost)
 			authAdmin.PATCH("/posts/:id/relations", middleware.PermissionMiddleware("posts", "update"), handlers.AdminUpdatePostRelations) // 更新文章关联关系

server/models/user.go

@@ -16,6 +16,7 @@ type User struct {
 	Phone        string `json:"phone" gorm:"column:phone"`
 	Wechat       string `json:"wechat" gorm:"column:wechat"`
 	WechatQrcode string `json:"wechatQrcode" gorm:"column:wechat_qrcode"`
+	WxOpenID     string `json:"-" gorm:"column:wx_openid;uniqueIndex"`
 	Password     string `json:"password,omitempty" gorm:"-"` // Virtual field for input
 	PasswordHash string `json:"-" gorm:"column:password_hash"`
 	RoleID       uint   `json:"roleId" gorm:"column:role_id"`
@@ -109,3 +110,8 @@ type LoginResponse struct {
 	User   UserResponse `json:"user"`
 	Expire int64        `json:"expire"`
 }
+
+// WxLoginRequest 微信小程序登录
+type WxLoginRequest struct {
+	Code string `json:"code" binding:"required"`
+}

server/repositories/log_repository.go

@@ -54,9 +54,10 @@ func CreateAccessLog(log *models.AccessLog) error {
 }
 
 // UVTrendData UV趋势数据
+// Count 的 SQL 别名与 gorm column 均为 value，与 json 对齐，避免 Scan 落成 0
 type UVTrendData struct {
 	Date  string  `json:"date"`
-	Count int     `json:"value"`
+	Count int     `json:"value" gorm:"column:value"`
 	YoY   float64 `json:"yoy"`
 	MoM   float64 `json:"mom"`
 }
@@ -83,7 +84,7 @@ func GetDailyUV(startDate, endDate string) ([]UVTrendData, error) {
 
 	// 查询数据库
 	query := config.DB.Model(&models.UserAccessLog{}).
-		Select("FROM_UNIXTIME(access_time, '%Y-%m-%d') as date, COUNT(DISTINCT user_ip) as count").
+		Select("FROM_UNIXTIME(access_time, '%Y-%m-%d') as date, COUNT(DISTINCT user_ip) as value").
 		Where("access_time >= ?", startTime.Unix()).
 		Where("access_time <= ?", endTime.Unix())
 

server/repositories/migration.go

@@ -197,6 +197,16 @@ func MigrateUserProfileFields() {
 	}
 }
 
+// MigrateUserWxOpenID adds wx_openid for mini-program silent login.
+func MigrateUserWxOpenID() {
+	if columnExists("users", "wx_openid") {
+		return
+	}
+	log.Printf("Adding users.wx_openid...")
+	execSQL("ALTER TABLE `users` ADD COLUMN `wx_openid` VARCHAR(64) NULL DEFAULT NULL COMMENT '微信小程序openid' AFTER `wechat_qrcode`")
+	execSQL("CREATE UNIQUE INDEX `idx_users_wx_openid` ON `users` (`wx_openid`)")
+}
+
 // MigrateVideoModule 创建视频模块表及作品视频字段
 func MigrateVideoModule() {
 	log.Printf("Migrating video module...")

server/repositories/post_repository.go

@@ -15,9 +15,10 @@ import (
 )
 
 // TrendData 趋势数据
+// Count 的 SQL 别名与 gorm column 均为 value，与 json 对齐，避免 Scan 落成 0
 type TrendData struct {
 	Date  string  `json:"date"`
-	Count int     `json:"value"`
+	Count int     `json:"value" gorm:"column:value"`
 	YoY   float64 `json:"yoy"`
 	MoM   float64 `json:"mom"`
 }
@@ -621,7 +622,7 @@ func GetNewPostsTrend(startDate, endDate string) ([]TrendData, error) {
 
 	// 查询数据库
 	query := config.DB.Model(&models.Post{}).
-		Select("FROM_UNIXTIME(created_at, '%Y-%m-%d') as date, COUNT(*) as count").
+		Select("FROM_UNIXTIME(created_at, '%Y-%m-%d') as date, COUNT(*) as value").
 		Where("deleted_at = ?", 0).
 		Where("created_at >= ?", startTime.Unix()).
 		Where("created_at <= ?", endTime.Unix())

server/repositories/user_repository.go

@@ -29,6 +29,29 @@ func GetUserByUsername(username string) (*models.User, error) {
 	return &user, nil
 }
 
+// GetUserByWxOpenID 根据微信 openid 获取用户
+func GetUserByWxOpenID(openid string) (*models.User, error) {
+	if openid == "" {
+		return nil, nil
+	}
+	var user models.User
+	err := config.DB.Model(&models.User{}).
+		Select("users.*, COALESCE(roles.name, users.role) as role").
+		Joins("LEFT JOIN roles ON users.role_id = roles.id").
+		Where("users.wx_openid = ? AND users.deleted_at = ?", openid, 0).
+		First(&user).Error
+
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		}
+		log.Printf("Error getting user by wx_openid: %v", err)
+		return nil, err
+	}
+
+	return &user, nil
+}
+
 // GetUserByID 根据ID获取用户
 func GetUserByID(id uint) (*models.User, error) {
 	var user models.User
@@ -179,6 +202,36 @@ func UpdateUserPassword(id uint, passwordHash string) error {
 	return nil
 }
 
+// ClearUserWxOpenID 清空用户微信 openid（写 NULL，避免 unique 索引与空串冲突）
+func ClearUserWxOpenID(id uint) error {
+	err := config.DB.Model(&models.User{}).
+		Where("id = ?", id).
+		Updates(map[string]interface{}{
+			"wx_openid":  nil,
+			"updated_at": time.Now().Unix(),
+		}).Error
+	if err != nil {
+		log.Printf("Error clearing user wx_openid: %v", err)
+		return err
+	}
+	return nil
+}
+
+// SetUserWxOpenID 将微信 openid 绑定到指定用户
+func SetUserWxOpenID(id uint, openid string) error {
+	err := config.DB.Model(&models.User{}).
+		Where("id = ? AND deleted_at = ?", id, 0).
+		Updates(map[string]interface{}{
+			"wx_openid":  openid,
+			"updated_at": time.Now().Unix(),
+		}).Error
+	if err != nil {
+		log.Printf("Error setting user wx_openid: %v", err)
+		return err
+	}
+	return nil
+}
+
 // DeleteUser 删除用户 (Soft Delete)
 func DeleteUser(id uint) error {
 	err := config.DB.Model(&models.User{}).