change

go.mod

@@ -3,12 +3,12 @@ module gadm-task
 go 1.13
 
 require (
+	git.getensh.com/common/gopkgsv2 v0.0.0-20230131080928-800ae85469c5
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/golang/protobuf v1.5.2
 	github.com/json-iterator/go v1.1.11
 	github.com/satori/go.uuid v1.2.0
 	github.com/spf13/viper v1.6.2
-	gitlab.sydip.com/repo/gopkgs v1.1.1
 	go.etcd.io/etcd/client/v3 v3.5.4
 	google.golang.org/grpc v1.39.0
 	gopkg.in/ini.v1 v1.51.0

go.sum

@@ -1,5 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+git.getensh.com/common/gopkgsv2 v0.0.0-20230131080928-800ae85469c5 h1:r30U3RK+DmKPTEcXew5q6bBdq/LpkYPwukh4xPxcy2M=
+git.getensh.com/common/gopkgsv2 v0.0.0-20230131080928-800ae85469c5/go.mod h1:UUV0+J8Z4ciF8NelKsEj6gXkGe68KP0iyw2stJyogfo=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
@@ -101,7 +103,6 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
-github.com/go-redis/redis v6.15.7+incompatible h1:3skhDh95XQMpnqeqNftPkQD9jL9e5e36z/1SUm6dy1U=
 github.com/go-redis/redis v6.15.7+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -185,7 +186,6 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/memberlist v0.1.4/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
 github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
@@ -256,10 +256,8 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.0 h1:XaTQmdKecIbwNHpzOIy0XMoEG5bmv/n0OVyaF1NKUdo=
 github.com/onsi/ginkgo v1.10.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
@@ -377,8 +375,6 @@ github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-gitlab.sydip.com/repo/gopkgs v1.1.1 h1:H/zFJ9ntVHIP+39iX0PJQ7Az6E02sidftrELJWYPOfA=
-gitlab.sydip.com/repo/gopkgs v1.1.1/go.mod h1:rpqokCDwaCmz2GjUlLGKGgNXlQFoxiM6e85+4vcEJ/I=
 go.etcd.io/bbolt v1.3.1-etcd.8/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v3.3.13+incompatible h1:jCejD5EMnlGxFvcGRyEV4VGlENZc7oPQX6o0t7n3xbw=
@@ -558,7 +554,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
@@ -569,7 +564,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24
 gopkg.in/olivere/elastic.v5 v5.0.84/go.mod h1:LXF6q9XNBxpMqrcgax95C6xyARXWbbCXUrtTxrNrxJI=
 gopkg.in/redis.v5 v5.2.9/go.mod h1:6gtv0/+A4iM08kdRfocWYB3bLX2tebpNtfKlFT6H4mY=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

impl/rcvr.go

@@ -12,7 +12,7 @@ import (
 	"gadm-task/impl/v1/check"
 	"gadm-task/impl/v1/task"
 
-	"gitlab.sydip.com/repo/gopkgs/tasker/rpctasker"
+	"git.getensh.com/common/gopkgsv2/tasker/rpctasker"
 	"google.golang.org/grpc"
 )
 

impl/v1/task/offline_task.go

@@ -7,7 +7,7 @@ import (
 	"gadm-task/errors"
 	"context"
 
-	"gitlab.sydip.com/repo/gopkgs/database"
+	"git.getensh.com/common/gopkgsv2/database"
 
 	pb_v1 "gadm-task/pb/v1"
 )

impl/v1/task/task_list.go

@@ -10,7 +10,7 @@ import (
 
 	"gorm.io/gorm"
 
-	"gitlab.sydip.com/repo/gopkgs/database"
+	"git.getensh.com/common/gopkgsv2/database"
 
 	pb_v1 "gadm-task/pb/v1"
 )

main.go

@@ -22,8 +22,8 @@ import (
 	"gadm-task/impl"
 	"gadm-task/parser"
 
-	"gitlab.sydip.com/repo/gopkgs/database"
-	"gitlab.sydip.com/repo/gopkgs/tasker"
+	"git.getensh.com/common/gopkgsv2/database"
+	"git.getensh.com/common/gopkgsv2/tasker"
 
 	"google.golang.org/grpc"
 )

model/sy_brand.go

@@ -1,7 +1,7 @@
 package model
 
 import (
-	"gitlab.sydip.com/repo/gopkgs/database"
+	"git.getensh.com/common/gopkgsv2/database"
 	"gorm.io/gorm"
 )
 

parser/database.go

@@ -6,7 +6,7 @@ package parser
 import (
 	"gadm-task/config"
 
-	"gitlab.sydip.com/repo/gopkgs/database"
+	"git.getensh.com/common/gopkgsv2/database"
 )
 
 var mysqlConfig config.MysqlConfig

parser/logger.go

@@ -7,8 +7,8 @@ import (
 	"gadm-task/config"
 	"fmt"
 
-	"gitlab.sydip.com/repo/gopkgs/logger"
-	"gitlab.sydip.com/repo/gopkgs/tasker"
+	"git.getensh.com/common/gopkgsv2/logger"
+	"git.getensh.com/common/gopkgsv2/tasker"
 )
 
 var logConfig config.LogConfig

parser/redis.go

@@ -8,7 +8,7 @@ import (
 	"gadm-task/config"
 	"strings"
 
-	"gitlab.sydip.com/repo/gopkgs/cache"
+	"git.getensh.com/common/gopkgsv2/cache"
 )
 
 var redisConfig config.RedisConfig

utils/field.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"gitlab.sydip.com/repo/gopkgs/database"
+	"git.getensh.com/common/gopkgsv2/database"
 )
 
 var settingsMutex *sync.RWMutex