diff --git a/DONATOR.MD b/DONATOR.MD index 6a73fc3a9..74a72290c 100644 --- a/DONATOR.MD +++ b/DONATOR.MD @@ -68,6 +68,7 @@ We currently accept donation by Alipay/WechatPay, please note your github/gitee |金毛|alipay|¥100.00| |1*1x|wechat|¥100.00| |[ywanbing](https://github.com/ywanbing)|wechat|¥66.66| +|[侯哥](http://www.macnie.com)|wechat|¥10.00| diff --git a/os/gfile/gfile_size.go b/os/gfile/gfile_size.go index 9b4a2bf19..402ddbb0c 100644 --- a/os/gfile/gfile_size.go +++ b/os/gfile/gfile_size.go @@ -47,21 +47,21 @@ func StrToSize(sizeStr string) int64 { switch strings.ToLower(unit) { case "b", "bytes": return int64(number) - case "k", "kb", "kib", "kilobyte": + case "k", "kb", "ki", "kib", "kilobyte": return int64(number * 1024) - case "m", "mb", "mib", "mebibyte": + case "m", "mb", "mi", "mib", "mebibyte": return int64(number * 1024 * 1024) - case "g", "gb", "gib", "gigabyte": + case "g", "gb", "gi", "gib", "gigabyte": return int64(number * 1024 * 1024 * 1024) - case "t", "tb", "tib", "terabyte": + case "t", "tb", "ti", "tib", "terabyte": return int64(number * 1024 * 1024 * 1024 * 1024) - case "p", "pb", "pib", "petabyte": + case "p", "pb", "pi", "pib", "petabyte": return int64(number * 1024 * 1024 * 1024 * 1024 * 1024) - case "e", "eb", "eib", "exabyte": + case "e", "eb", "ei", "eib", "exabyte": return int64(number * 1024 * 1024 * 1024 * 1024 * 1024 * 1024) - case "z", "zb", "zib", "zettabyte": + case "z", "zb", "zi", "zib", "zettabyte": return int64(number * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024) - case "y", "yb", "yib", "yottabyte": + case "y", "yb", "yi", "yib", "yottabyte": return int64(number * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024) case "bb", "brontobyte": return int64(number * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024) diff --git a/os/glog/glog_z_unit_rotate_test.go b/os/glog/glog_z_unit_rotate_test.go index b14859fba..efba93398 100644 --- a/os/glog/glog_z_unit_rotate_test.go +++ b/os/glog/glog_z_unit_rotate_test.go @@ -18,7 +18,6 @@ import ( ) func Test_Rotate_Size(t *testing.T) { - t.Parallel() gtest.C(t, func(t *gtest.T) { l := glog.New() p := gfile.Join(gfile.TempDir(), gtime.TimestampNanoStr()) @@ -57,7 +56,6 @@ func Test_Rotate_Size(t *testing.T) { } func Test_Rotate_Expire(t *testing.T) { - t.Parallel() gtest.C(t, func(t *gtest.T) { l := glog.New() p := gfile.Join(gfile.TempDir(), gtime.TimestampNanoStr())