Fix http auth and sdk errors

This commit is contained in:
若海
2024-01-10 09:59:47 +08:00
parent f705ee72cc
commit cd19e7d3f8
15 changed files with 195 additions and 252 deletions
+18 -18
View File
@@ -12,36 +12,36 @@ var Debug bool
var Efs *embed.FS
// Http 服务参数
var Httpd = struct {
Address string `yaml:"address"`
Token string `yaml:"token"`
Swag bool `yaml:"swag"`
}{
Address: "127.0.0.1:7600",
Swag: true,
}
// 日志参数
var Logger = struct {
Dir string
Level string
Target string
Dir string `yaml:"dir"`
Level string `yaml:"level"`
Target string `yaml:"target"`
}{
Dir: "logs",
Level: "info",
Target: "stdout",
}
// Http 服务参数
var Httpd = struct {
Address string
Token string
Swag bool
}{
Address: "127.0.0.1:7600",
Swag: true,
}
// Wcf 服务参数
var Wcf = struct {
Address string
SdkLibrary string
WeChatAuto bool
MsgPrint bool
Address string `yaml:"address"`
SdkLibrary string `yaml:"sdkLibrary"`
WeChatAuto bool `yaml:"wechatAuto"`
MsgPrinter bool `yaml:"msgPrinter"`
}{
Address: "127.0.0.1:10080",
SdkLibrary: "sdk.dll",
+4
View File
@@ -28,7 +28,11 @@ func (c *Config) Init() *Config {
Delim: ".",
})
c.Parser = yaml.Parser()
c.File = "config.yml"
if len(os.Args) > 1 {
c.File = os.Args[1]
}
return c
+2 -2
View File
@@ -12,8 +12,8 @@ func (c *Config) Unmarshal() {
// 读取默认配置
mp := map[string]any{
"logger": &Logger,
"httpd": &Httpd,
"logger": &Logger,
"wcf": &Wcf,
}
c.Koanf.Load(confmap.Provider(mp, "."), nil)
@@ -35,7 +35,7 @@ func (c *Config) Unmarshal() {
Level: Logger.Level,
Target: Logger.Target,
Storage: Logger.Dir,
Filename: "rest",
Filename: "wrest",
})
// 写入配置文件