Quellcode durchsuchen

1.写文档

2.增加二级直接解释的功能
tags/v1.1.0
liangzy vor 4 Jahren
Ursprung
Commit
93682ad23c
7 geänderte Dateien mit 95 neuen und 9 gelöschten Zeilen
  1. +37
    -1
      README.md
  2. +8
    -0
      conf/db.yaml
  3. +8
    -0
      conf/dev/db.yaml
  4. +0
    -1
      conf/test.yaml
  5. +6
    -3
      grconfig.go
  6. +31
    -4
      grconfig_test.go
  7. +5
    -0
      yaml.go

+ 37
- 1
README.md Datei anzeigen

@@ -1,3 +1,39 @@
# grconfig

111
使用方法直接看 `grconfig_test.go`

```go
import "golib.gaore.com/GaoreGo/grconfig"
```

```go
type Dsn struct {
User string `yaml:"user"`
Pass string `yaml:"pass"`
Host string `yaml:"host"`
Port int `yaml:"port"`
Name string `yaml:"name"`
Driver string `yaml:"driver"`
Prefix string `yaml:"prefix"`
}

var items = make(map[string]*Dsn)

// 一级
gr := New("conf/")
fmt.Println(gr.Item("db", &items))
fmt.Printf("%+v\n", items["default"])

// 二级
a := new(Dsn)
gr.Item("db.default", &a)
fmt.Printf("%+v\n", a)

// 解释字符串
fmt.Println("直接解释字符串", gr.String("db.default.host"))

// item形式解释符串
var s string
gr.Item("db.default.host", &s)
fmt.Println("item形式解释符串:", s)
```

+ 8
- 0
conf/db.yaml Datei anzeigen

@@ -0,0 +1,8 @@
default:
user: "jenkins"
pass: "123412412"
host: "rm-w23232z93xv4dds00rl.mysql.rds.aliyuncs.com"
port: 3306
name: "gr_jenkins"
driver: "mysql"
prefix: "gr_"

+ 8
- 0
conf/dev/db.yaml Datei anzeigen

@@ -0,0 +1,8 @@
default:
user: "jenkins"
pass: "123412412"
host: "rm-w23232z93xv4dds00rl.mysql.rds.aliyuncs.com"
port: 3306
name: "gr_jenkins"
driver: "mysql"
prefix: "gr_"

+ 0
- 1
conf/test.yaml Datei anzeigen

@@ -1 +0,0 @@
Aa: "hello world"

+ 6
- 3
grconfig.go Datei anzeigen

@@ -29,8 +29,8 @@ func (conf *Configer) getData(item string) (ch ConfigerChannelInterface, err err
env := os.Getenv("CENTER_RUNMODE")
chunks := strings.SplitN(item, ".", 2)

if len(chunks) < 2 {
panic("Item string error")
if len(chunks) < 1 {
panic("Item string error chunk len must more than 1")
}

if strings.TrimSpace(env) == "" {
@@ -82,6 +82,10 @@ func (conf *Configer) String(item string) string {

func recursiveParse(item string, v interface{}) interface{} {

if item == "" {
return v
}

chunks := strings.SplitN(item, ".", 2)

if n, err := strconv.Atoi(chunks[0]); err == nil {
@@ -90,7 +94,6 @@ func recursiveParse(item string, v interface{}) interface{} {
v = tmp[n]
}
} else {

if tmp, ok := v.(map[interface{}]interface{}); reflect.TypeOf(v).Kind() == reflect.Map && ok {
v = tmp[chunks[0]]
}


+ 31
- 4
grconfig_test.go Datei anzeigen

@@ -1,12 +1,39 @@
package grconfig

import (
"log"
"lot.gaore.com/library/grconfig"
"fmt"
"testing"
)

func TestNew(t *testing.T) {
gr := grconfig.New("conf/")
log.Println(gr.String("test.a"))

type Dsn struct {
User string `yaml:"user"`
Pass string `yaml:"pass"`
Host string `yaml:"host"`
Port int `yaml:"port"`
Name string `yaml:"name"`
Driver string `yaml:"driver"`
Prefix string `yaml:"prefix"`
}

var items = make(map[string]*Dsn)

// 一级
gr := New("conf/")
fmt.Println(gr.Item("db", &items))
fmt.Printf("%+v\n", items["default"])

// 二级
a := new(Dsn)
gr.Item("db.default", &a)
fmt.Printf("%+v\n", a)

// 解释字符串
fmt.Println("直接解释字符串", gr.String("db.default.host"))

// item形式解释符串
var s string
gr.Item("db.default.host", &s)
fmt.Println("item形式解释符串:", s)
}

+ 5
- 0
yaml.go Datei anzeigen

@@ -25,6 +25,11 @@ func (conf *ConfigerChannelYAML) String(item string) string {

func (conf *ConfigerChannelYAML) Item(item string, t interface{}) (err error) {
chunks := strings.SplitN(item, ".", 2)

if len(chunks) == 1 {
chunks = append(chunks, "")
}

target := recursiveParse(chunks[1], conf.tmp)
if target == nil {
err = errors.New("item doesn't exists")


Laden…
Abbrechen
Speichern