package/token-go
1
0
Fork 0
mirror of https://github.com/weloe/token-go.git synced 2025-10-05 15:36:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: update config.NewConfig to ReadConfig

Browse Source
This commit is contained in:
weloe
2023-06-09 19:59:56 +08:00
parent 446789e261
commit 4aa6df57df
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/reader.go
View File

@@ -44,8 +44,8 @@ func (c *FileConfig) parse(confName string) (err error) {
return err return err
} }
// NewConfig create from file. // ReadConfig create from file.
func NewConfig(confName string) (ConfigInterface, error) { func ReadConfig(confName string) (*FileConfig, error) {
c := &FileConfig{} c := &FileConfig{}
err := c.parse(confName) err := c.parse(confName)
return c, err return c, err

8
config/reader_test.go
View File

@@ -3,21 +3,21 @@ package config
import "testing" import "testing"
func TestNewConfig(t *testing.T) { func TestNewConfig(t *testing.T) {
config, err := NewConfig("../examples/token_conf.yaml") config, err := ReadConfig("../examples/token_conf.yaml")
if err != nil { if err != nil {
t.Errorf("read error: %v", err) t.Errorf("read error: %v", err)
} }
tokenConfig := config.(*FileConfig).TokenConfig tokenConfig := config.TokenConfig
t.Log(tokenConfig) t.Log(tokenConfig)
} }
func TestNewIniConfig(t *testing.T) { func TestNewIniConfig(t *testing.T) {
config, err := NewConfig("../examples/token_conf.ini") config, err := ReadConfig("../examples/token_conf.ini")
if err != nil { if err != nil {
t.Errorf("read error: %v", err) t.Errorf("read error: %v", err)
} }
tokenConfig := config.(*FileConfig).TokenConfig tokenConfig := config.TokenConfig
t.Log(tokenConfig) t.Log(tokenConfig)
} }

4
enforcer.go
View File

@@ -71,11 +71,11 @@ func InitWithFile(conf string, adapter persist.Adapter) (*Enforcer, error) {
if conf == "" || adapter == nil { if conf == "" || adapter == nil {
return nil, errors.New("InitWithFile() failed: parameters cannot be nil") return nil, errors.New("InitWithFile() failed: parameters cannot be nil")
} }
newConfig, err := config.NewConfig(conf) newConfig, err := config.ReadConfig(conf)
if err != nil { if err != nil {
return nil, err return nil, err
} }
enforcer, err := InitWithConfig(newConfig.(*config.FileConfig).TokenConfig, adapter) enforcer, err := InitWithConfig(newConfig.TokenConfig, adapter)
enforcer.conf = conf enforcer.conf = conf
return enforcer, err return enforcer, err
} }