team/tyapi-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
liangzai
2025-12-04 13:20:03 +08:00
parent 619deeb456
commit a8a4ff2d37
4 changed files with 145 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
internal/shared/pdf/resources_path.go
View File

@@ -3,8 +3,17 @@ package pdf
import (
"os"
"path/filepath"
"go.uber.org/zap"
)
var globalLogger *zap.Logger
// SetGlobalLogger 设置全局logger（用于资源路径查找）
func SetGlobalLogger(logger *zap.Logger) {
globalLogger = logger
}
// GetResourcesPDFDir 获取resources/pdf目录路径
// resources目录和可执行文件同级，例如：
// /app/tyapi-server (可执行文件)
@@ -20,9 +29,22 @@ func GetResourcesPDFDir() string {
// resources目录和可执行文件同级
resourcesPath := filepath.Join(execDir, "resources", "pdf")
if absPath, err := filepath.Abs(resourcesPath); err == nil {
absPath, err := filepath.Abs(resourcesPath)
if err == nil {
if globalLogger != nil {
globalLogger.Debug("尝试从可执行文件目录查找资源",
zap.String("exec_path", execPath),
zap.String("exec_dir", execDir),
zap.String("resources_path", absPath),
)
}
if _, err := os.Stat(absPath); err == nil {
if globalLogger != nil {
globalLogger.Info("找到resources/pdf目录", zap.String("path", absPath))
}
return absPath
} else if globalLogger != nil {
globalLogger.Debug("资源目录不存在", zap.String("path", absPath), zap.Error(err))
}
}
}
@@ -30,28 +52,55 @@ func GetResourcesPDFDir() string {
// 后备方案：从工作目录查找（开发环境）
if workDir, err := os.Getwd(); err == nil {
resourcesPath := filepath.Join(workDir, "resources", "pdf")
if absPath, err := filepath.Abs(resourcesPath); err == nil {
absPath, err := filepath.Abs(resourcesPath)
if err == nil {
if globalLogger != nil {
globalLogger.Debug("尝试从工作目录查找资源",
zap.String("work_dir", workDir),
zap.String("resources_path", absPath),
)
}
if _, err := os.Stat(absPath); err == nil {
if globalLogger != nil {
globalLogger.Info("找到resources/pdf目录", zap.String("path", absPath))
}
return absPath
}
}
// 开发环境可能在工作目录的子目录
resourcesPath = filepath.Join(workDir, "tyapi-server-gin", "resources", "pdf")
if absPath, err := filepath.Abs(resourcesPath); err == nil {
absPath, err = filepath.Abs(resourcesPath)
if err == nil {
if globalLogger != nil {
globalLogger.Debug("尝试从工作目录子目录查找资源",
zap.String("resources_path", absPath),
)
}
if _, err := os.Stat(absPath); err == nil {
if globalLogger != nil {
globalLogger.Info("找到resources/pdf目录", zap.String("path", absPath))
}
return absPath
}
}
}
// 最后的后备：返回相对路径
// 最后的后备：返回绝对路径（即使目录不存在）
if workDir, err := os.Getwd(); err == nil {
resourcesPath := filepath.Join(workDir, "resources", "pdf")
if absPath, err := filepath.Abs(resourcesPath); err == nil {
if globalLogger != nil {
globalLogger.Warn("未找到resources/pdf目录，返回后备路径", zap.String("path", absPath))
}
return absPath
}
}
// 最后的最后：返回相对路径（不推荐）
if globalLogger != nil {
globalLogger.Error("无法确定resources/pdf目录路径")
}
return filepath.Join("resources", "pdf")
}