From 3f36a3cddcb89c1fd64758f266c293d044032bb0 Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Fri, 19 May 2023 14:08:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=87=BA=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E4=BC=98=E5=8C=96=E5=8F=8A=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/configs/config.define.go | 14 ++++++ .../config/configs/config.go | 47 ++++++++++++++++++ .../simple-server-config/config/系统配置.xlsx | Bin 0 -> 10332 bytes examples/simple-server-config/main.go | 29 +++++++++++ planner/configexport/configexport.go | 4 +- planner/configexport/example/config.go | 20 ++++---- planner/configexport/internal/template.go | 12 ++--- 7 files changed, 108 insertions(+), 18 deletions(-) create mode 100644 examples/simple-server-config/config/configs/config.define.go create mode 100644 examples/simple-server-config/config/configs/config.go create mode 100644 examples/simple-server-config/config/系统配置.xlsx create mode 100644 examples/simple-server-config/main.go diff --git a/examples/simple-server-config/config/configs/config.define.go b/examples/simple-server-config/config/configs/config.define.go new file mode 100644 index 0000000..0a1756b --- /dev/null +++ b/examples/simple-server-config/config/configs/config.define.go @@ -0,0 +1,14 @@ +// Code generated by minotaur-config-export. DO NOT EDIT. +package configs + // SystemConfig 系统 +type SystemConfig struct { + Addr string // 监听地址 + Finish string // 启动完成 +} + + // WelcomeConfig 欢迎词 +type WelcomeConfig struct { + Id int // ID + Text string // 内容 +} + diff --git a/examples/simple-server-config/config/configs/config.go b/examples/simple-server-config/config/configs/config.go new file mode 100644 index 0000000..eda19c5 --- /dev/null +++ b/examples/simple-server-config/config/configs/config.go @@ -0,0 +1,47 @@ +// Code generated by minotaur-config-export. DO NOT EDIT. +package configs +import ( + jsonIter "github.com/json-iterator/go" + "github.com/kercylan98/minotaur/utils/log" + "go.uber.org/zap" + "os" +) + +var json = jsonIter.ConfigCompatibleWithStandardLibrary +var ( + ISystemConfig *SystemConfig + iSystemConfig *SystemConfig + IWelcomeConfig map[int]*WelcomeConfig + iWelcomeConfig map[int]*WelcomeConfig +) + +func LoadConfig(handle func(filename string, config any) error) { + var err error + iSystemConfig = new(SystemConfig) + if err = handle("SystemConfig.json", iSystemConfig); err != nil { + log.Error("Config", zap.String("Name", "SystemConfig"), zap.Bool("Invalid", true), zap.Error(err)) + } + + iWelcomeConfig = make(map[int]*WelcomeConfig) + if err = handle("WelcomeConfig.json", &iWelcomeConfig); err != nil { + log.Error("Config", zap.String("Name", "WelcomeConfig"), zap.Bool("Invalid", true), zap.Error(err)) + } + +} + +func Refresh() { + ISystemConfig = iSystemConfig + IWelcomeConfig = iWelcomeConfig +} + +func DefaultLoad(filepath string) { + LoadConfig(func(filename string, config any) error { + bytes, err := os.ReadFile(filepath) + if err != nil { + return err + } + + return json.Unmarshal(bytes, &config) + }) +} + diff --git a/examples/simple-server-config/config/系统配置.xlsx b/examples/simple-server-config/config/系统配置.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..41170a96035403763985e378ee2ff732e0dfce04 GIT binary patch literal 10332 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 literal 0 HcmV?d00001 diff --git a/examples/simple-server-config/main.go b/examples/simple-server-config/main.go new file mode 100644 index 0000000..7a47853 --- /dev/null +++ b/examples/simple-server-config/main.go @@ -0,0 +1,29 @@ +package main + +import ( + "github.com/kercylan98/minotaur/config" + "github.com/kercylan98/minotaur/examples/simple-server-config/config/configs" + "github.com/kercylan98/minotaur/planner/configexport" + "github.com/kercylan98/minotaur/utils/log" + "go.uber.org/zap" + "path/filepath" +) + +const ( + workdir = "./examples/simple-server-config" +) + +func main() { + export() + config.Init(filepath.Join(workdir, "config", "json"), configs.LoadConfig, configs.Refresh) + config.Load() + config.Refresh() + log.Info("Config", zap.Any("SystemConfig", configs.ISystemConfig)) + log.Info("Config", zap.Any("WelcomeConfig", configs.IWelcomeConfig)) +} + +func export() { + c := configexport.New(filepath.Join(workdir, "config", "系统配置.xlsx")) + c.ExportGo("", filepath.Join(workdir, "config", "configs")) + c.ExportServer("", filepath.Join(workdir, "config", "json")) +} diff --git a/planner/configexport/configexport.go b/planner/configexport/configexport.go index 685ad9e..b5e46a4 100644 --- a/planner/configexport/configexport.go +++ b/planner/configexport/configexport.go @@ -39,7 +39,7 @@ func (slf *ConfigExport) ExportClient(prefix, outputDir string) { if len(prefix) > 0 { config.Prefix = fmt.Sprintf("%s.", prefix) } - if err := file.WriterFile(filepath.Join(outputDir, fmt.Sprintf("%s.%s.json", prefix, config.Name)), config.JsonClient()); err != nil { + if err := file.WriterFile(filepath.Join(outputDir, fmt.Sprintf("%s%s.json", prefix, config.Name)), config.JsonClient()); err != nil { panic(err) } } @@ -51,7 +51,7 @@ func (slf *ConfigExport) ExportServer(prefix, outputDir string) { if len(prefix) > 0 { config.Prefix = fmt.Sprintf("%s.", prefix) } - if err := file.WriterFile(filepath.Join(outputDir, fmt.Sprintf("%s.%s.json", prefix, config.Name)), config.JsonServer()); err != nil { + if err := file.WriterFile(filepath.Join(outputDir, fmt.Sprintf("%s%s.json", prefix, config.Name)), config.JsonServer()); err != nil { panic(err) } } diff --git a/planner/configexport/example/config.go b/planner/configexport/example/config.go index d37ca0e..7af7e4e 100644 --- a/planner/configexport/example/config.go +++ b/planner/configexport/example/config.go @@ -9,29 +9,29 @@ import ( var json = jsonIter.ConfigCompatibleWithStandardLibrary var ( - GameIndexConfig map[int]map[string]*IndexConfig - gameIndexConfig map[int]map[string]*IndexConfig - GameEasyConfig *EasyConfig - gameEasyConfig *EasyConfig + IIndexConfig map[int]map[string]*IndexConfig + iIndexConfig map[int]map[string]*IndexConfig + IEasyConfig *EasyConfig + iEasyConfig *EasyConfig ) func LoadConfig(handle func(filename string, config any) error) { var err error - gameIndexConfig = make(map[int]map[string]*IndexConfig) - if err = handle("server.IndexConfig.json", &gameIndexConfig); err != nil { + iIndexConfig = make(map[int]map[string]*IndexConfig) + if err = handle("server.IndexConfig.json", &iIndexConfig); err != nil { log.Error("Config", zap.String("Name", "IndexConfig"), zap.Bool("Invalid", true), zap.Error(err)) } - gameEasyConfig = new(EasyConfig) - if err = handle("server.EasyConfig.json", gameEasyConfig); err != nil { + iEasyConfig = new(EasyConfig) + if err = handle("server.EasyConfig.json", iEasyConfig); err != nil { log.Error("Config", zap.String("Name", "EasyConfig"), zap.Bool("Invalid", true), zap.Error(err)) } } func Refresh() { - GameIndexConfig = gameIndexConfig - GameEasyConfig = gameEasyConfig + IIndexConfig = iIndexConfig + IEasyConfig = iEasyConfig } func DefaultLoad(filepath string) { diff --git a/planner/configexport/internal/template.go b/planner/configexport/internal/template.go index d5485af..8b1b748 100644 --- a/planner/configexport/internal/template.go +++ b/planner/configexport/internal/template.go @@ -37,21 +37,21 @@ var json = jsonIter.ConfigCompatibleWithStandardLibrary var ( {{range $index, $config := .Configs}} - Game{{$config.Name}} {{$config.GetVariable}} - game{{$config.Name}} {{$config.GetVariable}} + I{{$config.Name}} {{$config.GetVariable}} + i{{$config.Name}} {{$config.GetVariable}} {{end}} ) func LoadConfig(handle func(filename string, config any) error) { var err error {{range $index, $config := .Configs}} - game{{$config.Name}} = {{$config.GetVariableGen}} + i{{$config.Name}} = {{$config.GetVariableGen}} {{if eq $config.IndexCount 0}} - if err = handle("{{$config.Prefix}}{{$config.Name}}.json", game{{$config.Name}}); err != nil { + if err = handle("{{$config.Prefix}}{{$config.Name}}.json", i{{$config.Name}}); err != nil { log.Error("Config", zap.String("Name", "{{$config.Name}}"), zap.Bool("Invalid", true), zap.Error(err)) } {{else}} - if err = handle("{{$config.Prefix}}{{$config.Name}}.json", &game{{$config.Name}}); err != nil { + if err = handle("{{$config.Prefix}}{{$config.Name}}.json", &i{{$config.Name}}); err != nil { log.Error("Config", zap.String("Name", "{{$config.Name}}"), zap.Bool("Invalid", true), zap.Error(err)) } {{end}} @@ -60,7 +60,7 @@ func LoadConfig(handle func(filename string, config any) error) { func Refresh() { {{range $index, $config := .Configs}} - Game{{$config.Name}} = game{{$config.Name}} + I{{$config.Name}} = i{{$config.Name}} {{end}} }