升级Twikoo版本

zhaoyangkun · Nov 11, 2023 · b2d6f26 · b2d6f26
1 parent 3c2dd32
commit b2d6f26
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/config/setting/setting.go b/config/setting/setting.go
@@ -4,7 +4,6 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"strings"
 	"time"
 
 	"github.com/88250/lute"
@@ -83,19 +82,19 @@ type smtp struct {
 // InitSetting 读取 yaml 配置文件
 func (s *Setting) InitSetting() {
 	/* 开发环境 */
-	// 获取当前项目根目录
-	rootPath, _ := os.Getwd()
-	// 解决 GoLand 默认单元测试环境下，读取配置文件失败的问题
-	rootPath = strings.Replace(rootPath, "test", "", -1)
-	// 拼接配置文件访问路径
-	yamlPath := filepath.Join(rootPath, "config", "develop.yaml")
+	//// 获取当前项目根目录
+	//rootPath, _ := os.Getwd()
+	//// 解决 GoLand 默认单元测试环境下，读取配置文件失败的问题
+	//rootPath = strings.Replace(rootPath, "test", "", -1)
+	//// 拼接配置文件访问路径
+	//yamlPath := filepath.Join(rootPath, "config", "develop.yaml")
 
 	/* 生产环境 */
-	//homeDir, err := os.UserHomeDir()
-	//if err != nil {
-	//	log.Panicln("获取用户主目录失败：", err.Error())
-	//}
-	//yamlPath := filepath.Join(homeDir, ".aries", "aries.yaml")
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		log.Panicln("获取用户主目录失败：", err.Error())
+	}
+	yamlPath := filepath.Join(homeDir, ".aries", "aries.yaml")
 
 	log.Println("配置文件路径：", yamlPath)
 	// 读取配置文件