From 4084d5a5d4da52aeef9f5344f23df663a0e5365a Mon Sep 17 00:00:00 2001 From: Gzx1999 Date: Mon, 13 Dec 2021 17:19:53 +0800 Subject: [PATCH] change config format from json to yaml --- .gitignore | 1 + config.json.templete | 21 ------------------ config.yaml.templete | 16 ++++++++++++++ go.mod | 4 +++- go.sum | 12 +++++++++-- pkg/config/config.go | 43 +++++++++++++++++++------------------ pkg/logger/logger2.go | 50 ------------------------------------------- 7 files changed, 52 insertions(+), 95 deletions(-) delete mode 100644 config.json.templete create mode 100644 config.yaml.templete delete mode 100644 pkg/logger/logger2.go diff --git a/.gitignore b/.gitignore index 804d8249..878df222 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,5 @@ yarn-error.log* /log # Local config +config.yaml config.json diff --git a/config.json.templete b/config.json.templete deleted file mode 100644 index f26a4f1d..00000000 --- a/config.json.templete +++ /dev/null @@ -1,21 +0,0 @@ -{ - "log_opts": { - "log_level":"debug", - "log_driver": "stdout", - "log_path": "/var/log/pilotgo", - "max_file": 1, - "max_size": 10485760 - }, - "server":{ - "server_port":8888 - }, - "max_age":1800, - "session_count":100, - "db_info":{ - "host_name":"127.0.0.1", - "user_name":"", - "password":"", - "data_base":"PilotGo", - "port":3306 - } -} diff --git a/config.yaml.templete b/config.yaml.templete new file mode 100644 index 00000000..4bda233f --- /dev/null +++ b/config.yaml.templete @@ -0,0 +1,16 @@ +server: + server_port: 8888 +log_opts: + log_level: debug + log_driver: stdout + log_path: /var/log/pilotgo + max_file: 1 + max_size: 10485760 +db_info: + host_name: 127.0.0.1 + user_name: '' + password: '' + data_base: PilotGo + port: 3306 +max_age: 1800 +session_count: 100 \ No newline at end of file diff --git a/go.mod b/go.mod index 0b1a67c7..3408daa7 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,9 @@ require ( github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.2.1 github.com/spf13/viper v1.9.0 - github.com/valyala/fastjson v1.6.3 + github.com/tklauser/go-sysconf v0.3.9 // indirect + github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/crypto v0.0.0-20211202192323-5770296d904e golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 // indirect + gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 2ad5d371..eb1bf111 100644 --- a/go.sum +++ b/go.sum @@ -98,6 +98,8 @@ github.com/gin-gonic/gin v1.7.1/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjX github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= @@ -340,17 +342,21 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo= +github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= +github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ= +github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= -github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc= -github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= @@ -494,6 +500,7 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -538,6 +545,7 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc= diff --git a/pkg/config/config.go b/pkg/config/config.go index 706e0b6b..c4468fad 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -7,60 +7,61 @@ package config */ import ( - "encoding/json" "fmt" "io" "io/ioutil" "github.com/fsnotify/fsnotify" "github.com/spf13/viper" + "gopkg.in/yaml.v2" ) const ( configType = "yaml" ) -var pilogo_config_file_name = "./config.json" +var pilogo_config_file_name = "./config.yaml" type LogOpts struct { - LogLevel string `json:"log_level"` - LogDriver string `json:"log_driver"` - LogPath string `json:"log_path"` - MaxFile int `json:"max_file"` - MaxSize int `json:"max_size"` + LogLevel string `yaml:"log_level"` + LogDriver string `yaml:"log_driver"` + LogPath string `yaml:"log_path"` + MaxFile int `yaml:"max_file"` + MaxSize int `yaml:"max_size"` } type Server struct { - ServerPort int `json:"server_port"` + ServerPort int `yaml:"server_port"` } type DbInfo struct { - HostName string `json:"host_name"` - UserName string `json:"user_name"` - Password string `json:"password"` - DataBase string `json:"data_base"` - Port int `json:"port"` + HostName string `yaml:"host_name"` + UserName string `yaml:"user_name"` + Password string `yaml:"password"` + DataBase string `yaml:"data_base"` + Port int `yaml:"port"` } type Configure struct { - Logopts LogOpts `json:"log_opts"` - S Server `json:"server"` - MaxAge int `json:"max_age"` - SessionCount int `json:"session_count"` - Dbinfo DbInfo `json:"db_info"` + Logopts LogOpts `yaml:"log_opts"` + S Server `yaml:"server"` + MaxAge int `yaml:"max_age"` + SessionCount int `yaml:"session_count"` + Dbinfo DbInfo `yaml:"db_info"` } func Load() (*Configure, error) { - var config Configure + config := Configure{} bytes, err := ioutil.ReadFile(pilogo_config_file_name) if err != nil { fmt.Printf("open %s failed! err = %s\n", pilogo_config_file_name, err.Error()) return nil, err } - err = json.Unmarshal(bytes, &config) + err = yaml.Unmarshal(bytes, &config) if err != nil { - fmt.Printf("json.Unmarshal %s failed!\n", string(bytes)) + fmt.Printf("yaml Unmarshal %s failed!\n", string(bytes)) return nil, err } + fmt.Printf("config: %v", config) return &config, nil } diff --git a/pkg/logger/logger2.go b/pkg/logger/logger2.go deleted file mode 100644 index 3c447ffd..00000000 --- a/pkg/logger/logger2.go +++ /dev/null @@ -1,50 +0,0 @@ -package logger - -import ( - "github.com/sirupsen/logrus" -) - -type LoggerConf struct { - Level int - Path string - MaxSize int - MaxFile int - Driver string -} - -type Logger struct { - config *LoggerConf - inst *logrus.Logger -} - -func (l *Logger) Init() { - - l.inst = &logrus.Logger{} - - // TODO： 创建路径、初始化日志文件等 -} - -func (l *Logger) SetLevel() { - -} - -func (l *Logger) Trace() {} - -func (l *Logger) Debug() {} - -func (l *Logger) Info() {} - -func (l *Logger) Warn() {} - -func (l *Logger) Error() {} - -func (l *Logger) Fatal() {} - -func CreateLogger(conf *LoggerConf) *Logger { - l := &Logger{ - config: conf, - } - l.Init() - - return l -} -- Gitee