适配UTF-8 with BOM编码配置文件

devzhi · devzhi · commit 8a254348da6a · 2024-07-11T09:31:27.000+08:00
diff --git a/config/config.go b/config/config.go
@@ -30,7 +30,12 @@ func GetConfig() *Config {
 		if err != nil {
 			log.Fatalln(err)
 		}
-		_, err = toml.Decode(string(tomlData), &conf)
+		tomlStr := string(tomlData)
+		// 检测编码是否为UTF-8 with BOM
+		if tomlStr[0] == 0xEF && tomlStr[1] == 0xBB && tomlStr[2] == 0xBF {
+			tomlStr = tomlStr[3:]
+		}
+		_, err = toml.Decode(tomlStr, &conf)
 		if err != nil {
 			log.Fatalln("配置文件错误：", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,12 @@ func GetConfig() *Config {`
`30`	`30`	`if err != nil {`
`31`	`31`	`log.Fatalln(err)`
`32`	`32`	`}`
`33`		`- _, err = toml.Decode(string(tomlData), &conf)`
	`33`	`+ tomlStr := string(tomlData)`
	`34`	`+ // 检测编码是否为UTF-8 with BOM`
	`35`	`+ if tomlStr[0] == 0xEF && tomlStr[1] == 0xBB && tomlStr[2] == 0xBF {`
	`36`	`+ tomlStr = tomlStr[3:]`
	`37`	`+ }`
	`38`	`+ _, err = toml.Decode(tomlStr, &conf)`
`34`	`39`	`if err != nil {`
`35`	`40`	`log.Fatalln("配置文件错误：", err)`
`36`	`41`	`}`