Skip to content

Commit 4c74dc6

Browse files
kevwankevwan
committed
upgrade go-zero to v1.3.0
1 parent 8efe28f commit 4c74dc6

File tree

114 files changed

+199
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+199
-211
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Data syncing in golang for ClickHouse.
77

88

9-
based on [go-zero](https://github.com/tal-tech/go-zero)
9+
based on [go-zero](https://github.com/zeromicro/go-zero)
1010

1111
### ARCH
1212

‎cmd/dm/choperator/choperator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package choperator
22

33
import (
4-
"github.com/tal-tech/go-zero/core/logx"
54
"github.com/zeromicro/cds/cmd/dm/util"
65
"github.com/zeromicro/cds/pkg/ckgroup"
76
ckcfg "github.com/zeromicro/cds/pkg/ckgroup/config"
7+
"github.com/zeromicro/go-zero/core/logx"
88
)
99

1010
type ChOperator interface {

‎cmd/dm/choperator/chproxyoperator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"database/sql"
55
"time"
66

7-
"github.com/tal-tech/go-zero/core/logx"
87
"github.com/zeromicro/cds/cmd/dm/util"
8+
"github.com/zeromicro/go-zero/core/logx"
99
)
1010

1111
type (

‎cmd/dm/choperator/ckgroupoperator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package choperator
33
import (
44
"time"
55

6-
"github.com/tal-tech/go-zero/core/logx"
76
"github.com/zeromicro/cds/cmd/dm/util"
87
"github.com/zeromicro/cds/pkg/ckgroup"
8+
"github.com/zeromicro/go-zero/core/logx"
99
)
1010

1111
type (

‎cmd/dm/cmd/sync/config/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package config
22

33
import (
4-
"github.com/tal-tech/go-zero/core/logx"
5-
"github.com/tal-tech/go-zero/core/prometheus"
4+
"github.com/zeromicro/go-zero/core/logx"
5+
"github.com/zeromicro/go-zero/core/prometheus"
66
)
77

88
type (

‎cmd/dm/cmd/sync/dm.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"time"
88

99
_ "github.com/go-sql-driver/mysql"
10-
"github.com/tal-tech/go-zero/core/conf"
11-
"github.com/tal-tech/go-zero/core/logx"
1210
"github.com/zeromicro/cds/cmd/dm/cmd/sync/config"
1311
"github.com/zeromicro/cds/cmd/dm/module"
1412
"github.com/zeromicro/cds/pkg/strx"
13+
"github.com/zeromicro/go-zero/core/conf"
14+
"github.com/zeromicro/go-zero/core/logx"
1515
clientv3 "go.etcd.io/etcd/client/v3"
1616
"go.etcd.io/etcd/client/v3/concurrency"
1717
)

‎cmd/dm/data/mongo2clickhouse.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"strings"
99
"time"
1010

11-
"github.com/tal-tech/go-zero/core/logx"
1211
"github.com/zeromicro/cds/cmd/dm/choperator"
1312
"github.com/zeromicro/cds/cmd/dm/cmd/sync/config"
1413
"github.com/zeromicro/cds/cmd/dm/util"
1514
"github.com/zeromicro/cds/pkg/mongodbx"
15+
"github.com/zeromicro/go-zero/core/logx"
1616
"go.mongodb.org/mongo-driver/bson/primitive"
1717
"go.mongodb.org/mongo-driver/mongo"
1818
"go.mongodb.org/mongo-driver/mongo/options"

‎cmd/dm/data/mysql2clickhouse.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/tal-tech/go-zero/core/logx"
1312
"github.com/zeromicro/cds/cmd/dm/choperator"
1413
"github.com/zeromicro/cds/cmd/dm/cmd/sync/config"
1514
"github.com/zeromicro/cds/cmd/dm/util"
15+
"github.com/zeromicro/go-zero/core/logx"
1616
)
1717

1818
type (

‎cmd/dm/module/dmprometheus.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package module
22

33
import (
44
prometheus2 "github.com/prometheus/client_golang/prometheus"
5-
"github.com/tal-tech/go-zero/core/logx"
6-
"github.com/tal-tech/go-zero/core/prometheus"
5+
"github.com/zeromicro/go-zero/core/logx"
6+
"github.com/zeromicro/go-zero/core/prometheus"
77
)
88

99
type DmPrometheus struct {

‎cmd/dm/module/manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"strconv"
99
"time"
1010

11-
"github.com/tal-tech/go-zero/core/logx"
1211
"github.com/zeromicro/cds/cmd/dm/cmd/sync/config"
12+
"github.com/zeromicro/go-zero/core/logx"
1313
"go.etcd.io/etcd/client/v3/concurrency"
1414
)
1515

‎cmd/dm/module/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"errors"
77
"regexp"
88

9-
"github.com/tal-tech/go-zero/core/logx"
109
"github.com/zeromicro/cds/cmd/dm/choperator"
1110
"github.com/zeromicro/cds/cmd/dm/cmd/sync/config"
1211
"github.com/zeromicro/cds/cmd/dm/data"
1312
"github.com/zeromicro/cds/pkg/mongodbx"
13+
"github.com/zeromicro/go-zero/core/logx"
1414
"go.etcd.io/etcd/client/v3/concurrency"
1515
"gopkg.in/mgo.v2/bson"
1616
)

‎cmd/dm/util/clickhousetypeconv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strings"
88
"time"
99

10-
"github.com/tal-tech/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/core/logx"
1111
)
1212

1313
func RepairData(mp map[string]interface{}, name2Type map[string]string) ([]interface{}, string, int, error) {

‎cmd/dm/util/mysqltypeconv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"time"
1010

11-
"github.com/tal-tech/go-zero/core/logx"
11+
"github.com/zeromicro/go-zero/core/logx"
1212
)
1313

1414
type (

‎cmd/galaxy/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Galaxy控制台简介
22

3-
本模块基于[go-zero](https://github.com/tal-tech/go-zero)构建，是一个简洁的数据同步后台管理系统。
3+
本模块基于[go-zero](https://github.com/zeromicro/go-zero)构建，是一个简洁的数据同步后台管理系统。
44

55
简单来说，它可以很方便的在Clickhouse建表、全量同步数据和增量同步数据。
66

‎cmd/galaxy/galaxy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"flag"
55
"fmt"
66

7-
"github.com/tal-tech/go-zero/core/conf"
8-
"github.com/tal-tech/go-zero/rest"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/config"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/handler"
119
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
10+
"github.com/zeromicro/go-zero/core/conf"
11+
"github.com/zeromicro/go-zero/rest"
1212
)
1313

1414
var configFile = flag.String("f", "etc/galaxy-api.yaml", "the config file")

‎cmd/galaxy/internal/clients/dmclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"errors"
77
"time"
88

9-
"github.com/tal-tech/go-zero/core/logx"
109
"github.com/zeromicro/cds/cmd/dm/cmd/sync/config"
1110
"github.com/zeromicro/cds/pkg/strx"
11+
"github.com/zeromicro/go-zero/core/logx"
1212
clientv3 "go.etcd.io/etcd/client/v3"
1313
)
1414

‎cmd/galaxy/internal/clients/rtuclient.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"errors"
77
"time"
88

9-
"github.com/tal-tech/go-zero/core/logx"
109
"github.com/zeromicro/cds/cmd/rtu/cmd/sync/config"
1110
"github.com/zeromicro/cds/pkg/strx"
11+
"github.com/zeromicro/go-zero/core/logx"
1212
clientv3 "go.etcd.io/etcd/client/v3"
1313
)
1414

‎cmd/galaxy/internal/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package config
22

3-
import "github.com/tal-tech/go-zero/rest"
3+
import "github.com/zeromicro/go-zero/rest"
44

55
type Config struct {
66
rest.RestConf

‎cmd/galaxy/internal/handler/addhandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func addHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/connectoraddhandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func connectorAddHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/connectordeletehandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func connectorDeleteHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/connectorlisthandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func connectorListHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/databaselisthandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func databaseListHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/dmaddhandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func dmAddHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/dmdeletehandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func dmDeleteHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/dmlisthandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func dmListHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/dmredohandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func dmRedoHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/dmstophandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func dmStopHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/execsqlhandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func execSqlHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/generatecreatesqlhandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func generateCreateSqlHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/getuserinfohandler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/rest/httpx"
76
"github.com/zeromicro/cds/cmd/galaxy/internal/logic"
87
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
98
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/rest/httpx"
1010
)
1111

1212
func getUserInfoHandler(ctx *svc.ServiceContext) http.HandlerFunc {

‎cmd/galaxy/internal/handler/listtablehandler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package handler
33
import (
44
"net/http"
55

6-
"github.com/tal-tech/go-zero/core/logx"
7-
"github.com/tal-tech/go-zero/rest/httpx"
86
logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic"
97
"github.com/zeromicro/cds/cmd/galaxy/internal/svc"
108
"github.com/zeromicro/cds/cmd/galaxy/internal/types"
9+
"github.com/zeromicro/go-zero/core/logx"
10+
"github.com/zeromicro/go-zero/rest/httpx"
1111
)
1212

1313
func listTableHandler(ctx *svc.ServiceContext) http.HandlerFunc {

0 commit comments

Comments
 (0)