Skip to content

Commit 1e12d5c

Browse files
tonybasetonybase
authored
Deps/update kratos (#77)
* update kratos to v0.6.0
1 parent 5a80d90 commit 1e12d5c

20 files changed

+126
-69
lines changed

‎cmd/discovery/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/bilibili/discovery/conf"
1111
"github.com/bilibili/discovery/discovery"
1212
"github.com/bilibili/discovery/http"
13-
log "github.com/bilibili/kratos/pkg/log"
13+
log "github.com/go-kratos/kratos/pkg/log"
1414
)
1515

1616
func main() {

‎conf/conf.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package conf
22

33
import (
44
"github.com/BurntSushi/toml"
5-
"github.com/bilibili/kratos/pkg/conf/env"
6-
"github.com/bilibili/kratos/pkg/conf/paladin"
7-
log "github.com/bilibili/kratos/pkg/log"
8-
http "github.com/bilibili/kratos/pkg/net/http/blademaster"
5+
"github.com/go-kratos/kratos/pkg/conf/env"
6+
"github.com/go-kratos/kratos/pkg/conf/paladin"
7+
log "github.com/go-kratos/kratos/pkg/log"
8+
http "github.com/go-kratos/kratos/pkg/net/http/blademaster"
99
)
1010

1111
var (

‎discovery/discovery.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/bilibili/discovery/conf"
99
"github.com/bilibili/discovery/registry"
10-
http "github.com/bilibili/kratos/pkg/net/http/blademaster"
10+
http "github.com/go-kratos/kratos/pkg/net/http/blademaster"
1111
)
1212

1313
// Discovery discovery.

‎discovery/register.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ import (
55

66
"github.com/bilibili/discovery/model"
77
"github.com/bilibili/discovery/registry"
8-
"github.com/bilibili/kratos/pkg/ecode"
9-
10-
log "github.com/bilibili/kratos/pkg/log"
8+
"github.com/go-kratos/kratos/pkg/ecode"
9+
log "github.com/go-kratos/kratos/pkg/log"
1110
)
1211

1312
// Register a new instance.

‎discovery/register_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
dc "github.com/bilibili/discovery/conf"
1212
"github.com/bilibili/discovery/model"
1313

14-
"github.com/bilibili/kratos/pkg/conf/paladin"
15-
"github.com/bilibili/kratos/pkg/ecode"
16-
http "github.com/bilibili/kratos/pkg/net/http/blademaster"
17-
xtime "github.com/bilibili/kratos/pkg/time"
14+
"github.com/go-kratos/kratos/pkg/conf/paladin"
15+
"github.com/go-kratos/kratos/pkg/ecode"
16+
http "github.com/go-kratos/kratos/pkg/net/http/blademaster"
17+
xtime "github.com/go-kratos/kratos/pkg/time"
1818
. "github.com/smartystreets/goconvey/convey"
1919
gock "gopkg.in/h2non/gock.v1"
2020
)

‎discovery/syncup.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ import (
99
"github.com/bilibili/discovery/conf"
1010
"github.com/bilibili/discovery/model"
1111
"github.com/bilibili/discovery/registry"
12-
"github.com/bilibili/kratos/pkg/ecode"
13-
14-
log "github.com/bilibili/kratos/pkg/log"
12+
"github.com/go-kratos/kratos/pkg/ecode"
13+
log "github.com/go-kratos/kratos/pkg/log"
1514
)
1615

1716
var (

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.12
44

55
require (
66
github.com/BurntSushi/toml v0.3.1
7-
github.com/bilibili/kratos v0.3.3
7+
github.com/go-kratos/kratos v0.6.0
88
github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
99
github.com/jtolds/gls v4.20.0+incompatible // indirect
1010
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 // indirect

‎go.sum

+83-24
Large diffs are not rendered by default.

‎http/discovery.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/bilibili/discovery/model"
99

10-
"github.com/bilibili/kratos/pkg/ecode"
11-
log "github.com/bilibili/kratos/pkg/log"
12-
bm "github.com/bilibili/kratos/pkg/net/http/blademaster"
10+
"github.com/go-kratos/kratos/pkg/ecode"
11+
log "github.com/go-kratos/kratos/pkg/log"
12+
bm "github.com/go-kratos/kratos/pkg/net/http/blademaster"
1313
)
1414

1515
const (

‎http/http.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"github.com/bilibili/discovery/conf"
77
"github.com/bilibili/discovery/discovery"
88

9-
log "github.com/bilibili/kratos/pkg/log"
10-
bm "github.com/bilibili/kratos/pkg/net/http/blademaster"
9+
log "github.com/go-kratos/kratos/pkg/log"
10+
bm "github.com/go-kratos/kratos/pkg/net/http/blademaster"
1111
)
1212

1313
var (

‎model/instance.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"sync"
66
"time"
77

8-
"github.com/bilibili/kratos/pkg/ecode"
9-
log "github.com/bilibili/kratos/pkg/log"
8+
"github.com/go-kratos/kratos/pkg/ecode"
9+
log "github.com/go-kratos/kratos/pkg/log"
1010
)
1111

1212
// InstanceStatus Status of instance

‎naming/client.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"sync/atomic"
1414
"time"
1515

16-
ecode "github.com/bilibili/kratos/pkg/ecode"
17-
log "github.com/bilibili/kratos/pkg/log"
18-
http "github.com/bilibili/kratos/pkg/net/http/blademaster"
19-
xtime "github.com/bilibili/kratos/pkg/time"
16+
ecode "github.com/go-kratos/kratos/pkg/ecode"
17+
log "github.com/go-kratos/kratos/pkg/log"
18+
http "github.com/go-kratos/kratos/pkg/net/http/blademaster"
19+
xtime "github.com/go-kratos/kratos/pkg/time"
2020
)
2121

2222
const (

‎naming/client_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/bilibili/discovery/discovery"
1515
"github.com/bilibili/discovery/http"
1616

17-
"github.com/bilibili/kratos/pkg/conf/paladin"
18-
xhttp "github.com/bilibili/kratos/pkg/net/http/blademaster"
19-
xtime "github.com/bilibili/kratos/pkg/time"
17+
"github.com/go-kratos/kratos/pkg/conf/paladin"
18+
xhttp "github.com/go-kratos/kratos/pkg/net/http/blademaster"
19+
xtime "github.com/go-kratos/kratos/pkg/time"
2020
. "github.com/smartystreets/goconvey/convey"
2121
)
2222

‎naming/grpc/resolver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/bilibili/discovery/naming"
1111

12-
log "github.com/bilibili/kratos/pkg/log"
12+
log "github.com/go-kratos/kratos/pkg/log"
1313
"google.golang.org/grpc/resolver"
1414
)
1515

‎registry/guard.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"sync"
55
"sync/atomic"
66

7-
log "github.com/bilibili/kratos/pkg/log"
7+
log "github.com/go-kratos/kratos/pkg/log"
88
)
99

1010
const (

‎registry/node.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
"github.com/bilibili/discovery/conf"
1212
"github.com/bilibili/discovery/model"
13-
"github.com/bilibili/kratos/pkg/ecode"
14-
log "github.com/bilibili/kratos/pkg/log"
15-
http "github.com/bilibili/kratos/pkg/net/http/blademaster"
13+
"github.com/go-kratos/kratos/pkg/ecode"
14+
log "github.com/go-kratos/kratos/pkg/log"
15+
http "github.com/go-kratos/kratos/pkg/net/http/blademaster"
1616
)
1717

1818
const (

‎registry/node_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99

1010
dc "github.com/bilibili/discovery/conf"
1111
"github.com/bilibili/discovery/model"
12-
"github.com/bilibili/kratos/pkg/ecode"
13-
bm "github.com/bilibili/kratos/pkg/net/http/blademaster"
14-
"github.com/bilibili/kratos/pkg/net/http/blademaster/binding"
15-
xtime "github.com/bilibili/kratos/pkg/time"
12+
"github.com/go-kratos/kratos/pkg/ecode"
13+
bm "github.com/go-kratos/kratos/pkg/net/http/blademaster"
14+
"github.com/go-kratos/kratos/pkg/net/http/blademaster/binding"
15+
xtime "github.com/go-kratos/kratos/pkg/time"
1616

1717
. "github.com/smartystreets/goconvey/convey"
1818
gock "gopkg.in/h2non/gock.v1"

‎registry/registry.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/bilibili/discovery/conf"
1010
"github.com/bilibili/discovery/model"
1111

12-
"github.com/bilibili/kratos/pkg/ecode"
13-
log "github.com/bilibili/kratos/pkg/log"
12+
"github.com/go-kratos/kratos/pkg/ecode"
13+
log "github.com/go-kratos/kratos/pkg/log"
1414
)
1515

1616
const (

‎registry/registry_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"github.com/bilibili/discovery/conf"
1212
"github.com/bilibili/discovery/model"
13-
"github.com/bilibili/kratos/pkg/conf/paladin"
14-
"github.com/bilibili/kratos/pkg/ecode"
13+
"github.com/go-kratos/kratos/pkg/conf/paladin"
14+
"github.com/go-kratos/kratos/pkg/ecode"
1515

1616
. "github.com/smartystreets/goconvey/convey"
1717
)

‎registry/scheduler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sync"
77

88
"github.com/bilibili/discovery/model"
9-
"github.com/bilibili/kratos/pkg/conf/paladin"
9+
"github.com/go-kratos/kratos/pkg/conf/paladin"
1010
)
1111

1212
// Scheduler info.

0 commit comments

Comments
 (0)