Merge pull request #86 from org0000h/master

for  updating

Author: org0000h

cmd/rtu/model/connectormongomodel.go

@@ -5,7 +5,6 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/prometheus/common/log"
 	"github.com/tal-tech/go-zero/core/logx"
 )
 
@@ -172,7 +171,7 @@ func (mongo *ConnectorMongo) setValueMap(vm ValueMap, table *SQLTable) {
 		default:
 			tmp, err := json.Marshal(v)
 			if err != nil {
-				log.Error(err)
+				logx.Error(err)
 				delete(vm, k)
 				continue
 			}
@@ -215,7 +214,7 @@ func (mongo *ConnectorMongo) setValueMap(vm ValueMap, table *SQLTable) {
 				if val, ok := vm[k].(map[string]interface{}); ok {
 					tmp, err := json.Marshal(val)
 					if err != nil {
-						log.Error(err)
+						logx.Error(err)
 						delete(vm, k)
 						continue
 					}
@@ -234,7 +233,7 @@ func (mongo *ConnectorMongo) setValueMap(vm ValueMap, table *SQLTable) {
 				if val, ok := vm[k].(string); ok {
 					tmp, err := strconv.Atoi(val)
 					if err != nil {
-						log.Error(err)
+						logx.Error(err)
 					}
 					vm[k] = tmp
 				}

go.mod

@@ -3,30 +3,36 @@ module github.com/tal-tech/cds
 go 1.14
 
 require (
-	github.com/ClickHouse/clickhouse-go v1.4.3
+	github.com/ClickHouse/clickhouse-go v1.4.5
+	github.com/aws/aws-sdk-go v1.38.65 // indirect
 	github.com/dchest/siphash v1.2.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/frankban/quicktest v1.10.2 // indirect
 	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
-	github.com/go-sql-driver/mysql v1.5.0
+	github.com/go-sql-driver/mysql v1.6.0
 	github.com/go-xorm/builder v0.3.4
+	github.com/golang/mock v1.6.0 // indirect
+	github.com/google/uuid v1.2.0 // indirect
 	github.com/json-iterator/go v1.1.11
-	github.com/klauspost/compress v1.11.0 // indirect
+	github.com/klauspost/compress v1.13.1 // indirect
 	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/pierrec/lz4 v2.5.2+incompatible // indirect
+	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/prometheus/client_golang v1.11.0
-	github.com/prometheus/common v0.26.0
-	github.com/segmentio/kafka-go v0.4.8
+	github.com/prometheus/common v0.29.0
+	github.com/segmentio/kafka-go v0.4.16
 	github.com/sirupsen/logrus v1.7.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/tal-tech/go-zero v1.1.8-0.20210623065737-9ccb997ed85c
+	github.com/xdg/scram v1.0.3 // indirect
+	github.com/xdg/stringprep v1.0.3 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
 	go.etcd.io/etcd/client/v3 v3.5.0
-	go.mongodb.org/mongo-driver v1.4.3
-	go.uber.org/atomic v1.7.0
+	go.mongodb.org/mongo-driver v1.5.3
+	go.uber.org/atomic v1.8.0
 	go.uber.org/automaxprocs v1.4.0 // indirect
-	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
+	go.uber.org/multierr v1.7.0 // indirect
+	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
+	golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 )