From c8538d3c9c264c97bdfe931823d9f0398b603e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=87=E7=BF=94?= <178529795@qq.com> Date: Thu, 5 Mar 2020 10:07:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.go | 5 ----- index.go | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/config.go b/config.go index aeb003b..d2ac115 100644 --- a/config.go +++ b/config.go @@ -22,11 +22,6 @@ type PluginConfig struct { Run func() //插件启动函数 } -// Config 程序总体配置结构,初始化从config.toml中读取 -type Config struct { - Plugins map[string]interface{} -} - // InstallPlugin 安装插件 func InstallPlugin(opt *PluginConfig) { log.Printf("install plugin %s version: %s", opt.Name, opt.Version) diff --git a/index.go b/index.go index 8020cd2..b57456d 100644 --- a/index.go +++ b/index.go @@ -16,7 +16,7 @@ var ( // ConfigRaw 配置信息的原始数据 ConfigRaw []byte // Version 引擎版本号 - Version = "1.0.2" + Version = "1.1.0" // EngineInfo 引擎信息 EngineInfo = &struct { Version string @@ -37,10 +37,10 @@ func Run(configFile string) (err error) { return } go Summary.StartSummary() - cg := &Config{Plugins: make(map[string]interface{})} - if _, err = toml.Decode(string(ConfigRaw), cg); err == nil { + var cg map[string]interface{} + if _, err = toml.Decode(string(ConfigRaw), &cg); err == nil { for name, config := range Plugins { - if cfg, ok := cg.Plugins[name]; ok { + if cfg, ok := cg[name]; ok { b, _ := json.Marshal(cfg) if err = json.Unmarshal(b, config.Config); err != nil { log.Println(err)