Merge pull request #26 from wangbokun/dev

Dev
wangbokun · Dec 11, 2019 · 78dc453 · 78dc453
2 parents 3b355af + b491d06
commit 78dc453
Show file tree

Hide file tree

Showing 12 changed files with 388 additions and 148 deletions.
diff --git a/db/mysql/mysql.go b/db/mysql/mysql.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"go/codec"
+	"github.com/wangbokun/go/codec"
 	"github.com/wangbokun/go/log"
 	// mysql driver
 	_ "github.com/go-sql-driver/mysql"
@@ -174,7 +174,7 @@ func (my *MySQL) Get(ctx context.Context, cmd string, handle func(row map[string
 				if values[i] != nil {
 					result[cols[i].Name()] = string(values[i].([]byte))
 				}
-			case "NullInt64", "int", "int8", "int32", "uint32":
+			case "NullInt64", "int", "int8", "int32", "int64","uint32":
 				if values[i] != nil {
 					result[cols[i].Name()], err = strconv.Atoi(string(values[i].([]byte)))
 					if err != nil {

diff --git a/db/mysql/mysql.go.bak b/db/mysql/mysql.go.bak
diff --git a/env/.env b/env/.env
@@ -0,0 +1 @@
+test="hello"
diff --git a/env/README.md b/env/README.md
@@ -0,0 +1 @@
+读取ENV文件到环境变量中，使用os.Getenv("test")直接获取变量值
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		读取ENV文件到环境变量中，使用os.Getenv("test")直接获取变量值