From 89373ebcd6e57aa478916a2edec57ce29ee4485b Mon Sep 17 00:00:00 2001 From: pibigstar <741047261@qq.com> Date: Wed, 19 Jun 2019 11:07:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 + vet.sh | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 vet.sh diff --git a/.travis.yml b/.travis.yml index f522ba548..f42126af6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ addons: before_install: - pwd +- /bin/bash vet.sh install: - cat /etc/hosts diff --git a/vet.sh b/vet.sh new file mode 100644 index 000000000..c5362f6a4 --- /dev/null +++ b/vet.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +cd "${GOPATH}/src/github.com/pibigstar/go-todo" + +find . -name "*.go" -not -path "./third/*" | xargs gofmt -w + +git diff --exit-code From c066fff97179ee3797ae46cbd15d83bb700420f3 Mon Sep 17 00:00:00 2001 From: pibigstar <741047261@qq.com> Date: Wed, 19 Jun 2019 11:17:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vet.sh b/vet.sh index c5362f6a4..a790cf10b 100644 --- a/vet.sh +++ b/vet.sh @@ -1,6 +1,6 @@ #!/bin/bash -cd "${GOPATH}/src/github.com/pibigstar/go-todo" +cd "${GOPATH}/src/github.com/gogf/gf" find . -name "*.go" -not -path "./third/*" | xargs gofmt -w From 5ad809f49e69d245f4dd9f0e9989e4490550f050 Mon Sep 17 00:00:00 2001 From: pibigstar <741047261@qq.com> Date: Tue, 25 Jun 2019 19:10:37 +0800 Subject: [PATCH 3/5] vet the go format --- .travis.yml | 5 ++++- vet.sh | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 vet.sh diff --git a/.travis.yml b/.travis.yml index f42126af6..5c05fa0a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,11 +22,14 @@ addons: before_install: - pwd -- /bin/bash vet.sh install: - cat /etc/hosts +before_script: +- find . -name "*.go" | xargs gofmt -w +- git diff --exit-code + script: - cd g - GOARCH=386 go test -v ./... diff --git a/vet.sh b/vet.sh deleted file mode 100644 index a790cf10b..000000000 --- a/vet.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cd "${GOPATH}/src/github.com/gogf/gf" - -find . -name "*.go" -not -path "./third/*" | xargs gofmt -w - -git diff --exit-code From a9660fe9fa670cf9550383bdb043e46a38cca9ee Mon Sep 17 00:00:00 2001 From: John Date: Thu, 27 Jun 2019 14:33:39 +0800 Subject: [PATCH 4/5] add valid tag for gvalid --- g/util/gvalid/gvalid_check_struct.go | 7 +++++- g/util/gvalid/gvalid_unit_checkstruct_test.go | 22 ++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/g/util/gvalid/gvalid_check_struct.go b/g/util/gvalid/gvalid_check_struct.go index e2750ad3d..cc025d722 100644 --- a/g/util/gvalid/gvalid_check_struct.go +++ b/g/util/gvalid/gvalid_check_struct.go @@ -69,7 +69,12 @@ func CheckStruct(object interface{}, rules interface{}, msgs ...CustomMsg) *Erro continue } params[fieldName] = field.Value() - if tag := field.Tag("gvalid"); tag != "" { + // 同时支持valid和gvalid标签，优先使用valid + tag := field.Tag("valid") + if tag == "" { + tag = field.Tag("gvalid") + } + if tag != "" { // sequence tag == struct tag, 这里的name为别名 name, rule, msg := parseSequenceTag(tag) if len(name) == 0 { diff --git a/g/util/gvalid/gvalid_unit_checkstruct_test.go b/g/util/gvalid/gvalid_unit_checkstruct_test.go index 7094a9b82..40e3178f0 100644 --- a/g/util/gvalid/gvalid_unit_checkstruct_test.go +++ b/g/util/gvalid/gvalid_unit_checkstruct_test.go @@ -7,9 +7,10 @@ package gvalid_test import ( + "testing" + "github.com/gogf/gf/g/test/gtest" "github.com/gogf/gf/g/util/gvalid" - "testing" ) func Test_CheckStruct(t *testing.T) { @@ -51,6 +52,7 @@ func Test_CheckStruct(t *testing.T) { gtest.Assert(err.Maps()["password"]["required"], "登录密码不能为空") }) + // gvalid tag gtest.Case(t, func() { type User struct { Id int `gvalid:"uid@required|min:10#|ID不能为空"` @@ -69,4 +71,22 @@ func Test_CheckStruct(t *testing.T) { gtest.Assert(err.Maps()["uid"]["min"], "ID不能为空") }) + // valid tag + gtest.Case(t, func() { + type User struct { + Id int `valid:"uid@required|min:10#|ID不能为空"` + Age int `valid:"age@required#年龄不能为空"` + Username string `json:"username" gvalid:"username@required#用户名不能为空"` + Password string `json:"password" gvalid:"password@required#登录密码不能为空"` + } + user := &User{ + Id: 1, + Username: "john", + Password: "123456", + } + err := gvalid.CheckStruct(user, nil) + gtest.AssertNE(err, nil) + gtest.Assert(len(err.Maps()), 1) + gtest.Assert(err.Maps()["uid"]["min"], "ID不能为空") + }) } From 0ff31012c8e130b715e42bf09a3d905fde6b3658 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 30 Jun 2019 19:31:18 +0800 Subject: [PATCH 5/5] donator updates --- DONATOR.MD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DONATOR.MD b/DONATOR.MD index 6a9aa30e6..efb01701c 100644 --- a/DONATOR.MD +++ b/DONATOR.MD @@ -12,9 +12,11 @@ |[zhuhuan12](https://gitee.com/zhuhuan12)|gitee|￥50.00 |[zfan_codes](https://gitee.com/zfan_codes)|gitee|￥10.00 |[arden](https://github.com/arden)|alipay|￥10.00 +|x*z|wechat|￥20.00 |潘兄|wechat|￥100.00 |Fly的狐狸|wechat|￥100.00 |土豆相公|alipay|￥66.60 +|Hades|alipay|￥66.66 |蔡蔡|wechat|￥666.00 |上海金保证网络科技|bank|￥2000.00