Merge pull request #10 from qit-team/f_fix_xorm

upd:fix xorm bugs and upgrade modules

Author: ACoderHIT

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.1.19(2020-06-16)
+
+### New Features
+- 升级work包v0.3.4->v0.3.9，对列轮询机制修改为滚动递增
+
+### Bug Fix
+- 升级xorm包v0.7.4->v1.0.2，修复若干bug
+
 ## v0.1.17(2019-11-18)
 
 ### New Features

db/db.go

@@ -7,7 +7,7 @@ import (
 	//_ "github.com/denisenkom/go-mssqldb" //mssql
 	"errors"
 	"fmt"
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 	"github.com/qit-team/snow-core/config"
 	"time"
 	"xorm.io/core"

db/db_test.go

@@ -2,7 +2,7 @@ package db
 
 import (
 	"fmt"
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 	"github.com/qit-team/snow-core/config"
 	"testing"
 	//go test时需要开启

db/model.go

@@ -2,7 +2,7 @@ package db
 
 import (
 	"errors"
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 var (

db/provider.go

@@ -3,7 +3,7 @@ package db
 import (
 	"errors"
 	"fmt"
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 	"github.com/qit-team/snow-core/config"
 	"github.com/qit-team/snow-core/helper"
 	"github.com/qit-team/snow-core/kernel/container"

go.mod

@@ -3,22 +3,24 @@ module github.com/qit-team/snow-core
 go 1.12
 
 require (
-	github.com/aliyun/aliyun-mns-go-sdk v0.0.0-20190430032852-b20726f9b783
+	github.com/aliyun/aliyun-mns-go-sdk v0.0.0-20191205082232-b251b9d95415
 	github.com/aliyunmq/mq-http-go-sdk v0.0.0-20190610035126-ef50af8ccc77
 	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
 	github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6
 	github.com/gin-gonic/gin v1.4.0
-	github.com/go-sql-driver/mysql v1.4.1
-	github.com/go-xorm/xorm v0.7.4
-	github.com/gogap/errors v0.0.0-20160523102334-149c546090d0
+	github.com/go-sql-driver/mysql v1.5.0
+	github.com/gogap/errors v0.0.0-20200228125012-531a6449b28c
 	github.com/gogap/stack v0.0.0-20150131034635-fef68dddd4f8 // indirect
 	github.com/google/uuid v1.1.1
 	github.com/hetiansu5/accesslog v1.0.0
 	github.com/hetiansu5/cores v1.0.0
 	github.com/hetiansu5/go-redis-pool v1.1.4
-	github.com/qit-team/work v0.3.4
+	github.com/klauspost/compress v1.10.7 // indirect
+	github.com/qit-team/work v0.3.9
 	github.com/robfig/cron v1.2.0
-	github.com/sirupsen/logrus v1.4.2
-	github.com/valyala/fasthttp v1.3.0 // indirect
-	xorm.io/core v0.6.3
+	github.com/sirupsen/logrus v1.6.0
+	github.com/valyala/fasthttp v1.13.1 // indirect
+	golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
+	xorm.io/core v0.7.3
+	xorm.io/xorm v1.0.2
 )