diff --git a/db/conn.go b/db/conn.go index b0304dc9..a0e81dcd 100644 --- a/db/conn.go +++ b/db/conn.go @@ -14,7 +14,7 @@ import ( . "github.com/polaris1119/config" _ "github.com/go-sql-driver/mysql" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "xorm.io/core" ) diff --git a/go.mod b/go.mod index 8ffa04d4..9eaaa5d2 100644 --- a/go.mod +++ b/go.mod @@ -19,8 +19,8 @@ require ( github.com/garyburd/redigo v1.6.0 github.com/go-sql-driver/mysql v1.4.1 github.com/go-validator/validator v0.0.0-20180514200540-135c24b11c19 - github.com/go-xorm/xorm v0.7.5 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect + github.com/golang/protobuf v1.3.1 // indirect github.com/gorilla/context v1.1.1 github.com/gorilla/feeds v1.1.1 github.com/gorilla/schema v1.1.0 @@ -57,5 +57,6 @@ require ( golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 golang.org/x/text v0.3.2 gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19 // indirect - xorm.io/core v0.7.0 + xorm.io/core v0.7.2 + xorm.io/xorm v0.8.0 ) diff --git a/go.sum b/go.sum index 9b2f89c5..6bc8b3d5 100644 --- a/go.sum +++ b/go.sum @@ -18,8 +18,6 @@ github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9Pq github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= -github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= 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= @@ -62,8 +60,6 @@ github.com/go-validator/validator v0.0.0-20180514200540-135c24b11c19 h1:+213K32f github.com/go-validator/validator v0.0.0-20180514200540-135c24b11c19/go.mod h1:Z6CPSxOS2fR8d1fAFPKiF/q3d7pRDmLowc7I1l0f4Oc= github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y= github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM= -github.com/go-xorm/xorm v0.7.5 h1:LfwmkxCQ6NAqbz/SS44MB0DrT6NiPlvmxwJkayWtbkE= -github.com/go-xorm/xorm v0.7.5/go.mod h1:nqz2TAsuOHWH2yk4FYWtacCGgdbrcdZ5mF1XadqEHls= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -100,10 +96,6 @@ github.com/huichen/sego v0.0.0-20180617034105-3f3c8a8cfacc h1:3LXYtoxQGFSjIL5ZJA github.com/huichen/sego v0.0.0-20180617034105-3f3c8a8cfacc/go.mod h1:+/Bm7uk1bnJJMi9l6P88FgHeGtscOQiYbxW1j+BmgBY= github.com/issue9/assert v1.3.3 h1:3Xz5rGafXcaOpz7x6X2X3kBQVYxs1l9HFHSwmuDQ3KM= github.com/issue9/assert v1.3.3/go.mod h1:9Ger+iz8X7r1zMYYwEhh++2wMGWcNN2oVI+zIQXxcio= -github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc= -github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= -github.com/jackc/pgx v3.3.0+incompatible h1:Wa90/+qsITBAPkAZjiByeIGHFcj3Ztu+VzrrIpHjL90= -github.com/jackc/pgx v3.3.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43 h1:jTkyeF7NZ5oIr0ESmcrpiDgAfoidCBF4F5kJhjtaRwE= github.com/jaytaylor/html2text v0.0.0-20190408195923-01ec452cbe43/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk= github.com/jmcvetta/randutil v0.0.0-20150817122601-2bb1b664bcff h1:6NvhExg4omUC9NfA+l4Oq3ibNNeJUdiAF3iBVB0PlDk= @@ -148,8 +140,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/polaris1119/config v0.0.0-20160609095218-06a751e884f3 h1:ql/tT34m2dfi00D38NSRu6us2ykhsDtUsEEFNjEpjBo= @@ -186,10 +176,6 @@ github.com/qiniu/rpc v0.0.0-20140728010754-30c22466d920/go.mod h1:vUC++Z6RsGp85+ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= -github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE= -github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -203,6 +189,8 @@ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/sundy-li/html2article v0.0.0-20170724020440-d0b6c083441f h1:zx8a5HQgs9SltyIFdhA+Y94Wgk9D5agl/UMN2+oHiKM= github.com/sundy-li/html2article v0.0.0-20170724020440-d0b6c083441f/go.mod h1:qEPne4GSiuwCg1E5EuIjpk+O6ZAMwpDZnzqu1I5WEGU= github.com/tidwall/gjson v1.3.2 h1:+7p3qQFaH3fOMXAJSrdZwGKcOO/lYdGS0HqGhPqDdTI= @@ -241,8 +229,6 @@ golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65 h1:+rhAzEzT3f4JtomfC371qB+0Ola2caSKcY69NUBZrRQ= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190607181551-461777fb6f67 h1:rJJxsykSlULwd2P2+pg/rtnwN2FrWp4IuCxOSyS0V00= golang.org/x/net v0.0.0-20190607181551-461777fb6f67/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -276,7 +262,6 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190608022120-eacb66d2a7c3/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -297,11 +282,14 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19 h1:WB265cn5OpO+hK3pikC9hpP1zI/KTwmyMFKloW9eOVc= gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19/go.mod h1:o4V0GXN9/CAmCsvJ0oXYZvrZOe7syiDZSN1GWGZTGzc= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -xorm.io/builder v0.3.5 h1:EilU39fvWDxjb1cDaELpYhsF+zziRBhew8xk4pngO+A= -xorm.io/builder v0.3.5/go.mod h1:ZFbByS/KxZI1FKRjL05PyJ4YrK2bcxlUaAxdum5aTR8= -xorm.io/core v0.7.0 h1:hKxuOKWZNeiFQsSuGet/KV8HZ788hclvAl+7azx3tkM= -xorm.io/core v0.7.0/go.mod h1:TuOJjIVa7e3w/rN8tDcAvuLBMtwzdHPbyOzE6Gk1EUI= +xorm.io/builder v0.3.6 h1:ha28mQ2M+TFx96Hxo+iq6tQgnkC9IZkM6D8w9sKHHF8= +xorm.io/builder v0.3.6/go.mod h1:LEFAPISnRzG+zxaxj2vPicRwz67BdhFreKg8yv8/TgU= +xorm.io/core v0.7.2 h1:mEO22A2Z7a3fPaZMk6gKL/jMD80iiyNwRrX5HOv3XLw= +xorm.io/core v0.7.2/go.mod h1:jJfd0UAEzZ4t87nbQYtVjmqpIODugN6PD2D9E+dJvdM= +xorm.io/xorm v0.8.0 h1:iALxgJrX8O00f8Jk22GbZwPmxJNgssV5Mv4uc2HL9PM= +xorm.io/xorm v0.8.0/go.mod h1:ZkJLEYLoVyg7amJK/5r779bHyzs2AU8f8VMiP6BM7uY= diff --git a/logic/article.go b/logic/article.go index 1628ac06..5e7d5fa9 100644 --- a/logic/article.go +++ b/logic/article.go @@ -17,7 +17,7 @@ import ( "time" "github.com/PuerkitoBio/goquery" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "github.com/jaytaylor/html2text" "github.com/polaris1119/config" "github.com/polaris1119/goutils" diff --git a/logic/feed.go b/logic/feed.go index 9aecc95f..c57149c6 100644 --- a/logic/feed.go +++ b/logic/feed.go @@ -18,7 +18,7 @@ import ( "github.com/studygolang/studygolang/model" "github.com/studygolang/studygolang/util" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "github.com/polaris1119/set" ) diff --git a/logic/gift.go b/logic/gift.go index 9c38c869..3ef023bf 100644 --- a/logic/gift.go +++ b/logic/gift.go @@ -15,7 +15,7 @@ import ( . "github.com/studygolang/studygolang/db" "github.com/studygolang/studygolang/model" - "github.com/go-xorm/xorm" + "xorm.io/xorm" ) type GiftLogic struct{} diff --git a/logic/message.go b/logic/message.go index 0613580c..243b4535 100644 --- a/logic/message.go +++ b/logic/message.go @@ -15,7 +15,7 @@ import ( . "github.com/studygolang/studygolang/db" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "github.com/polaris1119/goutils" "github.com/polaris1119/logger" "github.com/polaris1119/set" diff --git a/logic/mission.go b/logic/mission.go index 891847e9..1a94a82a 100644 --- a/logic/mission.go +++ b/logic/mission.go @@ -17,7 +17,7 @@ import ( . "github.com/studygolang/studygolang/db" "github.com/studygolang/studygolang/model" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "github.com/polaris1119/goutils" "github.com/polaris1119/times" "golang.org/x/net/context" diff --git a/logic/topic.go b/logic/topic.go index f3b773f5..9f0183ac 100644 --- a/logic/topic.go +++ b/logic/topic.go @@ -19,7 +19,7 @@ import ( . "github.com/studygolang/studygolang/db" "github.com/fatih/structs" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "github.com/polaris1119/goutils" "github.com/polaris1119/logger" "github.com/polaris1119/set" diff --git a/logic/user.go b/logic/user.go index 8dbd453c..316786cf 100644 --- a/logic/user.go +++ b/logic/user.go @@ -21,7 +21,7 @@ import ( "github.com/polaris1119/slices" "github.com/go-validator/validator" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "github.com/polaris1119/config" "github.com/polaris1119/goutils" "github.com/polaris1119/logger" diff --git a/logic/user_rich.go b/logic/user_rich.go index 836aa2a7..f54701b8 100644 --- a/logic/user_rich.go +++ b/logic/user_rich.go @@ -17,7 +17,7 @@ import ( . "github.com/studygolang/studygolang/db" "github.com/garyburd/redigo/redis" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "github.com/polaris1119/goutils" "github.com/polaris1119/logger" "github.com/polaris1119/nosql" diff --git a/model/article.go b/model/article.go index 3c5f4afe..2d6a7b7a 100644 --- a/model/article.go +++ b/model/article.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "github.com/polaris1119/logger" ) diff --git a/model/gctt.go b/model/gctt.go index 09772ec9..7679ebdf 100644 --- a/model/gctt.go +++ b/model/gctt.go @@ -9,7 +9,7 @@ package model import ( "time" - "github.com/go-xorm/xorm" + "xorm.io/xorm" ) const ( diff --git a/model/gift.go b/model/gift.go index 8050b89e..e35f0df0 100644 --- a/model/gift.go +++ b/model/gift.go @@ -9,7 +9,7 @@ package model import ( "time" - "github.com/go-xorm/xorm" + "xorm.io/xorm" ) const ( diff --git a/model/morning_reading.go b/model/morning_reading.go index 8ac856a5..a9902f95 100644 --- a/model/morning_reading.go +++ b/model/morning_reading.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/go-xorm/xorm" + "xorm.io/xorm" ) const ( diff --git a/model/openproject.go b/model/openproject.go index 36b6c240..1a48d7bc 100644 --- a/model/openproject.go +++ b/model/openproject.go @@ -9,7 +9,7 @@ package model import ( "time" - "github.com/go-xorm/xorm" + "xorm.io/xorm" ) const ( diff --git a/model/user.go b/model/user.go index 7a426633..4a97b41b 100644 --- a/model/user.go +++ b/model/user.go @@ -12,7 +12,7 @@ import ( "math/rand" "time" - "github.com/go-xorm/xorm" + "xorm.io/xorm" "github.com/polaris1119/goutils" ) diff --git a/model/user_rich.go b/model/user_rich.go index c6f31fbd..010022a5 100644 --- a/model/user_rich.go +++ b/model/user_rich.go @@ -9,7 +9,7 @@ package model import ( "time" - "github.com/go-xorm/xorm" + "xorm.io/xorm" ) var BalanceTypeMap = map[int]string{ diff --git a/model/website_setting.go b/model/website_setting.go index 45b28268..03f23e4d 100644 --- a/model/website_setting.go +++ b/model/website_setting.go @@ -12,7 +12,7 @@ import ( "strings" "time" - "github.com/go-xorm/xorm" + "xorm.io/xorm" ) type DocMenu struct {