From 44884cb89f26d538c1d0729f9ac41e8b1f7571ae Mon Sep 17 00:00:00 2001 From: PVillela Date: Wed, 31 Mar 2021 06:13:08 -0400 Subject: [PATCH] Synced go.mod with original vendors.json, additional minor clean-up. --- .gitignore | 4 +- articles/routers.go | 2 +- articles/serializers.go | 2 +- articles/validators.go | 2 +- common/database.go | 4 +- common/unit_test.go | 2 +- common/utils.go | 2 +- go.mod | 30 ++++++++----- go.mod-generated_by_mod_init | 32 -------------- go.sum | 86 ++++++++++++++++-------------------- hello.go | 2 +- readme.md | 4 +- users/middlewares.go | 2 +- users/routers.go | 2 +- users/serializers.go | 2 +- users/unit_test.go | 2 +- users/validators.go | 2 +- 17 files changed, 72 insertions(+), 110 deletions(-) delete mode 100644 go.mod-generated_by_mod_init diff --git a/.gitignore b/.gitignore index 79ae7eb..43edf79 100644 --- a/.gitignore +++ b/.gitignore @@ -16,8 +16,8 @@ .DS_Store Thumbs.db -vendorx/* -!vendorx/vendor.json +vendor/* +!vendor/vendor.json tmp/* gorm.db diff --git a/articles/routers.go b/articles/routers.go index e0d75a7..80f090d 100644 --- a/articles/routers.go +++ b/articles/routers.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/gothinkster/golang-gin-realworld-example-app/common" "github.com/gothinkster/golang-gin-realworld-example-app/users" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" "net/http" "strconv" ) diff --git a/articles/serializers.go b/articles/serializers.go index 5fb236e..d189af9 100644 --- a/articles/serializers.go +++ b/articles/serializers.go @@ -3,7 +3,7 @@ package articles import ( "github.com/gosimple/slug" "github.com/gothinkster/golang-gin-realworld-example-app/users" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" ) type TagSerializer struct { diff --git a/articles/validators.go b/articles/validators.go index 212ba7d..70fefed 100644 --- a/articles/validators.go +++ b/articles/validators.go @@ -4,7 +4,7 @@ import ( "github.com/gosimple/slug" "github.com/gothinkster/golang-gin-realworld-example-app/common" "github.com/gothinkster/golang-gin-realworld-example-app/users" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" ) type ArticleModelValidator struct { diff --git a/common/database.go b/common/database.go index fb5aad3..57aa3af 100644 --- a/common/database.go +++ b/common/database.go @@ -17,7 +17,7 @@ var DB *gorm.DB func Init() *gorm.DB { db, err := gorm.Open("sqlite3", "./../gorm.db") if err != nil { - fmt.Println("db err: (Init) ", err) + fmt.Println("db err: ", err) } db.DB().SetMaxIdleConns(10) //db.LogMode(true) @@ -29,7 +29,7 @@ func Init() *gorm.DB { func TestDBInit() *gorm.DB { test_db, err := gorm.Open("sqlite3", "./../gorm_test.db") if err != nil { - fmt.Println("db err: (TestDBInit) ", err) + fmt.Println("db err: ", err) } test_db.DB().SetMaxIdleConns(3) test_db.LogMode(true) diff --git a/common/unit_test.go b/common/unit_test.go index 87384a4..71b4997 100644 --- a/common/unit_test.go +++ b/common/unit_test.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" "github.com/stretchr/testify/assert" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" "net/http" "net/http/httptest" "os" diff --git a/common/utils.go b/common/utils.go index 6e4bade..0c8bfa2 100644 --- a/common/utils.go +++ b/common/utils.go @@ -10,7 +10,7 @@ import ( "gopkg.in/go-playground/validator.v8" "github.com/gin-gonic/gin/binding" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" ) var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") diff --git a/go.mod b/go.mod index dfbfc56..99f66f9 100644 --- a/go.mod +++ b/go.mod @@ -3,25 +3,31 @@ module github.com/gothinkster/golang-gin-realworld-example-app go 1.15 require ( + github.com/davecgh/go-spew v1.1.1-0.20170711183451-adab96458c51 // indirect github.com/denisenkom/go-mssqldb v0.9.0 // indirect - github.com/dgrijalva/jwt-go v3.2.0+incompatible + github.com/dgrijalva/jwt-go v3.0.1-0.20170608005149-a539ee1a749a+incompatible github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect - github.com/gin-contrib/sse v0.1.0 // indirect + github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 // indirect github.com/gin-gonic/gin v1.1.5-0.20170716034208-93b3a0d7ec95 github.com/go-sql-driver/mysql v1.5.0 // indirect - github.com/golang/protobuf v1.5.1 // indirect - github.com/gosimple/slug v1.9.0 + github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 // indirect + github.com/gosimple/slug v1.1.0 github.com/jinzhu/gorm v0.0.0-20170703134954-2a1463811ee1 - github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d // indirect github.com/jinzhu/now v1.1.2 // indirect - github.com/json-iterator/go v1.1.10 // indirect + github.com/json-iterator/go v0.0.0-20170711230430-b9dc3ebda73c // indirect github.com/lib/pq v1.10.0 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect - github.com/mattn/go-sqlite3 v1.14.6 // indirect - github.com/stretchr/testify v1.7.0 - github.com/ugorji/go v1.2.4 // indirect + github.com/mattn/go-isatty v0.0.2 // indirect + github.com/mattn/go-sqlite3 v1.2.1-0.20170710140056-47fc4e5e9153 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect + github.com/stretchr/testify v1.1.5-0.20170714215325-05e8a0eda380 + github.com/ugorji/go v0.0.0-20170620104852-5efa3251c7f7 // indirect golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect + gopkg.in/gin-gonic/gin.v1 v1.1.5-0.20170702092826-d459835d2b07 gopkg.in/go-playground/assert.v1 v1.2.1 // indirect - gopkg.in/go-playground/validator.v8 v8.18.2 - gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/go-playground/validator.v8 v8.18.1 + gopkg.in/yaml.v2 v2.0.0-20170712054546-1be3d31502d6 // indirect ) diff --git a/go.mod-generated_by_mod_init b/go.mod-generated_by_mod_init deleted file mode 100644 index 2a8c09e..0000000 --- a/go.mod-generated_by_mod_init +++ /dev/null @@ -1,32 +0,0 @@ -module github.com/gothinkster/golang-gin-realworld-example-app - -go 1.15 - -require ( - github.com/Pallinder/go-randomdata v0.0.0-20170410161340-8c3362a5e678 - github.com/davecgh/go-spew v1.1.1-0.20170711183451-adab96458c51 - github.com/dgrijalva/jwt-go v3.0.1-0.20170608005149-a539ee1a749a+incompatible - github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 - github.com/gin-gonic/contrib v0.0.0-20170529062310-d4fc5a96cc0d - github.com/gin-gonic/gin v1.1.5-0.20170716034208-93b3a0d7ec95 - github.com/go-playground/locales v0.11.2-0.20170327191450-1e5f1161c641 - github.com/go-playground/universal-translator v0.16.1-0.20170327191703-71201497bace - github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 - github.com/gosimple/slug v1.1.0 - github.com/jinzhu/gorm v0.0.0-20170703134954-2a1463811ee1 - github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d - github.com/json-iterator/go v0.0.0-20170711230430-b9dc3ebda73c - github.com/mattn/go-isatty v0.0.2 - github.com/mattn/go-sqlite3 v1.2.1-0.20170710140056-47fc4e5e9153 - github.com/pmezard/go-difflib v1.0.0 - github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be - github.com/stretchr/objx v0.0.0-20150928122152-1a9d0bb9f541 - github.com/stretchr/testify v1.1.5-0.20170714215325-05e8a0eda380 - github.com/ugorji/go v0.0.0-20170620104852-5efa3251c7f7 - golang.org/x/net v0.0.0-20170711181219-f01ecb60fe38 - golang.org/x/sys v0.0.0-20170710161658-abf9c25f5445 - gopkg.in/gin-gonic/gin.v1 v1.1.5-0.20170702092826-d459835d2b07 - gopkg.in/go-playground/validator.v8 v8.18.1 - gopkg.in/stretchr/testify.v1 v1.1.4 - gopkg.in/yaml.v2 v2.0.0-20170712054546-1be3d31502d6 -) diff --git a/go.sum b/go.sum index 9166575..22a16c7 100644 --- a/go.sum +++ b/go.sum @@ -1,82 +1,70 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1-0.20170711183451-adab96458c51 h1:Tci31o5/xMI4El+SZhrKl5Uod6VfetSApCF/aXU0wig= +github.com/davecgh/go-spew v1.1.1-0.20170711183451-adab96458c51/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.9.0 h1:RSohk2RsiZqLZ0zCjtfn3S4Gp4exhpBWHyQ7D0yGjAk= github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgrijalva/jwt-go v3.0.1-0.20170608005149-a539ee1a749a+incompatible h1:lwWnUpbS8H6DbUpe9VIY8G0vOupN8pnCPs68g9oxAJI= +github.com/dgrijalva/jwt-go v3.0.1-0.20170608005149-a539ee1a749a+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 h1:AzN37oI0cOS+cougNAV9szl6CVoj2RYwzS3DpUQNtlY= +github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-gonic/gin v1.1.5-0.20170716034208-93b3a0d7ec95 h1:sIbRUfQ2deJ7FBWMCYemeGy82ZiuGL/uSPnYpjcr8zw= github.com/gin-gonic/gin v1.1.5-0.20170716034208-93b3a0d7ec95/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1 h1:jAbXjIeW2ZSW2AwFxlGTDoc2CjI2XujLkV3ArsZFCvc= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/gosimple/slug v1.9.0 h1:r5vDcYrFz9BmfIAMC829un9hq7hKM4cHUrsv36LbEqs= -github.com/gosimple/slug v1.9.0/go.mod h1:AMZ+sOVe65uByN3kgEyf9WEBKBCSS+dJjMX9x4vDJbg= +github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7 h1:ulJ2cj/xlDlrwLCvWH4UeV9vJ/jXP6wEGgTSF7EOnmQ= +github.com/golang/protobuf v0.0.0-20170712042213-0a4f71a498b7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/gosimple/slug v1.1.0 h1:qazuiO8Pq90VbYCUh8/iNY8ShifnkXhRY6LOT8ZtNa4= +github.com/gosimple/slug v1.1.0/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0= github.com/jinzhu/gorm v0.0.0-20170703134954-2a1463811ee1 h1:sWeCm69jE8uwB/gHLNG65Szf24KebYqoWq1boLccYcQ= github.com/jinzhu/gorm v0.0.0-20170703134954-2a1463811ee1/go.mod h1:Vla75njaFJ8clLU1W44h34PjIkijhjHIYnZxMqCdxqo= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d h1:jRQLvyVGL+iVtDElaEIDdKwpPqUIZJfzkNLV34htpEc= +github.com/jinzhu/inflection v0.0.0-20170102125226-1c35d901db3d/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI= github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v0.0.0-20170711230430-b9dc3ebda73c h1:x3oKqNE0z7njySl+5qrdEWUovQL4t8pu4wXKPeCjcbY= +github.com/json-iterator/go v0.0.0-20170711230430-b9dc3ebda73c/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.10.0 h1:Zx5DJFEYQXio93kgXnQ09fXNiUKsqv4OUEu2UtGcB1E= github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= -github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mattn/go-isatty v0.0.2 h1:F+DnWktyadxnOrohKLNUC9/GjFii5RJgY4GFG6ilggw= +github.com/mattn/go-isatty v0.0.2/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-sqlite3 v1.2.1-0.20170710140056-47fc4e5e9153 h1:FHnIp/MYhWs7XwMs4HGxJzvUjEXWRGQTWg5+Enc6fwM= +github.com/mattn/go-sqlite3 v1.2.1-0.20170710140056-47fc4e5e9153/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be h1:ta7tUOvsPHVHGom5hKW5VXNc2xZIkfCKP8iaqOyYtUQ= github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be/go.mod h1:MIDFMn7db1kT65GmV94GzpX9Qdi7N/pQlwb+AN8wh+Q= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/ugorji/go v1.2.4 h1:cTciPbZ/VSOzCLKclmssnfQ/jyoVyOcJ3aoJyUV1Urc= -github.com/ugorji/go v1.2.4/go.mod h1:EuaSCk8iZMdIspsu6HXH7X2UGKw1ezO4wCfGszGmmo4= -github.com/ugorji/go/codec v1.2.4 h1:C5VurWRRCKjuENsbM6GYVw8W++WVW9rSxoACKIvxzz8= -github.com/ugorji/go/codec v1.2.4/go.mod h1:bWBu1+kIRWcF8uMklKaJrR6fTWQOwAlrIzX22pHwryA= +github.com/stretchr/testify v1.1.5-0.20170714215325-05e8a0eda380 h1:QrEXaPwRc95QTv2wXmZw3D8vgYvD555iAG69DLhAam8= +github.com/stretchr/testify v1.1.5-0.20170714215325-05e8a0eda380/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/ugorji/go v0.0.0-20170620104852-5efa3251c7f7 h1:VtqNxrWGmleRhhDwCE2E98hD6Qn47lM06TOq4NTF9h0= +github.com/ugorji/go v0.0.0-20170620104852-5efa3251c7f7/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/gin-gonic/gin.v1 v1.1.5-0.20170702092826-d459835d2b07 h1:xditn5+9QdyB5pC9oz4QzEflRMQqfEwcV2z5ZxZ3jJs= +gopkg.in/gin-gonic/gin.v1 v1.1.5-0.20170702092826-d459835d2b07/go.mod h1:Eljh74A/zAvUOQ835v6ySeZ+5gQG6tKjbZTaZ9iWU3A= gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ= -gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/go-playground/validator.v8 v8.18.1 h1:F8SLY5Vqesjs1nI1EL4qmF1PQZ1sitsmq0rPYXLyfGU= +gopkg.in/go-playground/validator.v8 v8.18.1/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/yaml.v2 v2.0.0-20170712054546-1be3d31502d6 h1:CvAnnm1XvMjfib69SZzDwgWfOk+PxYz0hA0HBupilBA= +gopkg.in/yaml.v2 v2.0.0-20170712054546-1be3d31502d6/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= diff --git a/hello.go b/hello.go index 53895b2..6ec38f9 100644 --- a/hello.go +++ b/hello.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" "github.com/jinzhu/gorm" "github.com/gothinkster/golang-gin-realworld-example-app/articles" diff --git a/readme.md b/readme.md index a737445..7125bbf 100644 --- a/readme.md +++ b/readme.md @@ -1,8 +1,8 @@ # ![RealWorld Example App](logo.png) -[![Build Status](https://travis-ci.org/wangzitian0/golang-gin-realworld-example-app.svg?branch=master)](https://travis-ci.org/wangzitian0/golang-gin-realworld-example-app) -[![codecov](https://codecov.io/gh/wangzitian0/golang-gin-realworld-example-app/branch/master/graph/badge.svg)](https://codecov.io/gh/wangzitian0/golang-gin-realworld-example-app) +[![Build Status](https://travis-ci.org/wangzitian0/golang-gin-starter-kit.svg?branch=master)](https://travis-ci.org/wangzitian0/golang-gin-starter-kit) +[![codecov](https://codecov.io/gh/wangzitian0/golang-gin-starter-kit/branch/master/graph/badge.svg)](https://codecov.io/gh/wangzitian0/golang-gin-starter-kit) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/gothinkster/golang-gin-realworld-example-app/blob/master/LICENSE) [![GoDoc](https://godoc.org/github.com/gothinkster/golang-gin-realworld-example-app?status.svg)](https://godoc.org/github.com/gothinkster/golang-gin-realworld-example-app) diff --git a/users/middlewares.go b/users/middlewares.go index 97e89ec..8a2a597 100644 --- a/users/middlewares.go +++ b/users/middlewares.go @@ -4,7 +4,7 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go/request" "github.com/gothinkster/golang-gin-realworld-example-app/common" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" "net/http" "strings" ) diff --git a/users/routers.go b/users/routers.go index 4906813..5990d1d 100644 --- a/users/routers.go +++ b/users/routers.go @@ -3,7 +3,7 @@ package users import ( "errors" "github.com/gothinkster/golang-gin-realworld-example-app/common" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" "net/http" ) diff --git a/users/serializers.go b/users/serializers.go index e80d218..d148084 100644 --- a/users/serializers.go +++ b/users/serializers.go @@ -1,7 +1,7 @@ package users import ( - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" "github.com/gothinkster/golang-gin-realworld-example-app/common" ) diff --git a/users/unit_test.go b/users/unit_test.go index 7cf3b2a..889d900 100644 --- a/users/unit_test.go +++ b/users/unit_test.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/jinzhu/gorm" "github.com/gothinkster/golang-gin-realworld-example-app/common" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" "net/http" "net/http/httptest" "os" diff --git a/users/validators.go b/users/validators.go index 3646423..c8bd50b 100644 --- a/users/validators.go +++ b/users/validators.go @@ -2,7 +2,7 @@ package users import ( "github.com/gothinkster/golang-gin-realworld-example-app/common" - "github.com/gin-gonic/gin" + "gopkg.in/gin-gonic/gin.v1" ) // *ModelValidator containing two parts: