移除github.com/prometheus/common/依赖

更新到golang 1.19

Author: tietang

example/consul.go

@@ -3,13 +3,14 @@ package main
 import (
 	"fmt"
 	"github.com/hashicorp/consul/api"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	"github.com/tietang/props/v3/consul"
 	"github.com/tietang/props/v3/kvs"
 	"time"
 )
 
-/**
+/*
+*
 
 conf/ini/demo1 = `
 
@@ -23,25 +24,20 @@ y1=val1
 
 `
 
-
 conf/ini_props/ =
 conf/ini_props/x0 = y0=val0
 y1=val1
 conf/ini_props/x1 = y1=val1
 
-
 conf/kv/ =
 conf/kv/x0/y0 = val0
 conf/kv/x1/y1 = val1
 
-
 conf/props/ =
 conf/props/demo1 = x0.y0=val0
 x1.y1=val1
 conf/props/demo2 = k.y=val0
 k2.y2=val2
-
-
 */
 func main_3() {
 	address := "127.0.0.1:8500"

go.mod

@@ -1,6 +1,6 @@
 module github.com/tietang/props/v3
 
-go 1.12
+go 1.19
 
 //被墙的原因，替换golang.org源为github.com源
 replace (
@@ -16,7 +16,7 @@ replace (
 	golang.org/x/oauth2 => github.com/golang/oauth2 v0.0.0-20190319182350-c85d3e98c914
 	golang.org/x/perf => github.com/golang/perf v0.0.0-20190312170614-0655857e383f
 	golang.org/x/sync => github.com/golang/sync v0.0.0-20190227155943-e225da77a7e6
-	golang.org/x/sys => github.com/golang/sys v0.0.0-20190322080309-f49334f85ddc
+	//golang.org/x/sys => github.com/golang/sys v0.0.0-20190322080309-f49334f85ddc
 	golang.org/x/text => github.com/golang/text v0.3.0
 	golang.org/x/time => github.com/golang/time v0.0.0-20190308202827-9d24e82272b4
 	golang.org/x/tools => github.com/golang/tools v0.0.0-20190327011446-79af862e6737
@@ -27,50 +27,80 @@ replace (
 )
 
 require (
-	github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
+	github.com/coreos/etcd v3.3.13+incompatible
+	github.com/go-ini/ini v1.67.0
+	github.com/hashicorp/consul/api v1.4.0
+	github.com/nacos-group/nacos-sdk-go v1.0.1
+	github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec
+	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
+	github.com/sirupsen/logrus v1.9.0
+	github.com/smartystreets/goconvey v1.6.4
+	github.com/tietang/go-utils v0.1.3
+	github.com/valyala/fasttemplate v1.2.2
+	gopkg.in/yaml.v2 v2.4.0
+)
+
+require (
+	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1704 // indirect
 	github.com/armon/go-metrics v0.3.3 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
 	github.com/coreos/bbolt v1.3.2 // indirect
-	github.com/coreos/etcd v3.3.13+incompatible
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
-	github.com/go-ini/ini v1.57.0
+	github.com/fatih/color v1.9.0 // indirect
+	github.com/go-errors/errors v1.0.1 // indirect
 	github.com/gogo/protobuf v1.2.1 // indirect
 	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
+	github.com/golang/mock v1.6.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/btree v1.0.0 // indirect
 	github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
 	github.com/gorilla/websocket v1.4.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.9.0 // indirect
-	github.com/hashicorp/consul/api v1.4.0
+	github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+	github.com/hashicorp/go-hclog v0.12.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.2.0 // indirect
 	github.com/hashicorp/go-msgpack v0.5.5 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/serf v0.9.2 // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/jtolds/gls v4.20.0+incompatible // indirect
+	github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f // indirect
+	github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect
+	github.com/mattn/go-colorable v0.1.6 // indirect
+	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/mitchellh/mapstructure v1.3.2 // indirect
-	github.com/nacos-group/nacos-sdk-go v1.0.1
-	github.com/prometheus/common v0.10.0
-	github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec
-	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
-	github.com/sirupsen/logrus v1.6.0
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.12.2 // indirect
 	github.com/smartystreets/assertions v1.1.1 // indirect
-	github.com/smartystreets/goconvey v1.6.4
 	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/tietang/go-utils v0.1.3
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
-	github.com/valyala/fasttemplate v1.1.0
+	github.com/toolkits/concurrent v0.0.0-20150624120057-a4371d70e3e3 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	go.etcd.io/bbolt v1.3.2 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4 // indirect
-	golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 // indirect
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
+	golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
+	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/text v0.3.2 // indirect
+	golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
 	google.golang.org/genproto v0.0.0-20190605220351-eb0b1bdb6ae6 // indirect
-	google.golang.org/grpc v1.23.0 // indirect
-	gopkg.in/yaml.v2 v2.2.8
+	google.golang.org/grpc v1.48.0 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/ini.v1 v1.66.2 // indirect
 )
 
 //exclude (

kvs/config_composite.go

@@ -2,7 +2,7 @@ package kvs
 
 import (
 	"errors"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	"github.com/valyala/fasttemplate"
 	"io"
 	"os"
@@ -11,7 +11,6 @@ import (
 	"time"
 )
 
-//
 type CompositeConfigSource struct {
 	ConfName      string
 	ConfigSources []ConfigSource //Set

kvs/eval.go

@@ -2,7 +2,7 @@ package kvs
 
 import (
 	"errors"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	"github.com/valyala/fasttemplate"
 	"io"
 	"regexp"

kvs/helper.go

@@ -5,7 +5,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	"io"
 	"io/ioutil"
 	"os"

yam/helper.go

@@ -1,7 +1,7 @@
 package yam
 
 import (
-	"github.com/prometheus/common/log"
+	log "github.com/sirupsen/logrus"
 	"github.com/tietang/props/v3/kvs"
 	"strings"
 )

zk/zk_source.go

@@ -1,8 +1,8 @@
 package zk
 
 import (
-	"github.com/prometheus/common/log"
 	"github.com/samuel/go-zookeeper/zk"
+	log "github.com/sirupsen/logrus"
 	"github.com/tietang/props/v3/ini"
 	"github.com/tietang/props/v3/kvs"
 	"github.com/tietang/props/v3/yam"
@@ -30,22 +30,24 @@ context: /configs/dev/app
 如果是ContentType=ini_props，则zk nodes:
 
 /configs/dev/app
-    - /jdbc:
-       ```
-        url=tcp(127.0.0.1:3306)/Test?charset=utf8
-        username=root
-        password=root
-        timeout=6s
-
-        ```
-    - /redis:
-       ```
-        host=192.168.1.123
-        port=6379
-        database=2
-        timeout=6s
-        password=password
-        ```
+
+  - /jdbc:
+    ```
+    url=tcp(127.0.0.1:3306)/Test?charset=utf8
+    username=root
+    password=root
+    timeout=6s
+
+    ```
+
+  - /redis:
+    ```
+    host=192.168.1.123
+    port=6379
+    database=2
+    timeout=6s
+    password=password
+    ```
 
 如果是如下中的一个，
 ContentProperties  contentType = "properties"
@@ -55,31 +57,31 @@ ContentYam         contentType = "yam" //yaml 别名
 ContentYml         contentType = "yml" //yaml 别名
 ContentIni         contentType = "ini"
 
-
 则zk nodes,last key以对应的配置格式，就如同文件名一样，
 比如key为mysql，配置格式为yml，则在zookeeper中配置的key为mysql.yml
 那么完成的zk  path就为，/configs/dev/app/mysql.yml=`k/v...`
 
 比如properties，或者props
 
 /configs/dev/app
-    - /jdbc.props:
-       ```
-        jdbc.url=tcp(127.0.0.1:3306)/Test?charset=utf8
-        jdbc.username=root
-        jdbc.password=root
-        jdbc.timeout=6s
-
-        ```
-    - /redis.props:
-       ```
-        redis.host=192.168.1.123
-        redis.port=6379
-        redis.database=2
-        redis.timeout=6s
-        redis.password=password
-        ```
 
+  - /jdbc.props:
+    ```
+    jdbc.url=tcp(127.0.0.1:3306)/Test?charset=utf8
+    jdbc.username=root
+    jdbc.password=root
+    jdbc.timeout=6s
+
+    ```
+
+  - /redis.props:
+    ```
+    redis.host=192.168.1.123
+    redis.port=6379
+    redis.database=2
+    redis.timeout=6s
+    redis.password=password
+    ```
 */
 type ZookeeperConfigSource struct {
 	ZookeeperSource