From 0ad7304eca254b0b5eecd6717c255c43aa3456f7 Mon Sep 17 00:00:00 2001
From: black1552 <black1552@163.com>
Date: Wed, 4 Feb 2026 14:59:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(valid):=20=E6=B7=BB=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=AA=8C=E8=AF=81=E5=B9=B6=E8=BF=94=E5=9B=9Emap?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增ValidAndMap函数用于验证参数并返回map类型
- 修改ValidAndStruct函数优化对象绑定逻辑
- 添加gconv包导入支持map转换功能
- 更新IDE缓存配置添加新的验证类型映射
---
 .idea/GOHCache.xml | 38 +++++++++++++++++++++++++++++++++++++-
 valid/valid.go     | 21 +++++++++++++++++----
 2 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/.idea/GOHCache.xml b/.idea/GOHCache.xml
index c5e93b7..142c763 100644
--- a/.idea/GOHCache.xml
+++ b/.idea/GOHCache.xml
@@ -87,6 +87,20 @@
             </set>
           </value>
         </entry>
+        <entry key="NewsOne">
+          <value>
+            <set>
+              <option value="file://$PROJECT_DIR$/../gin_test/req/new.go" />
+            </set>
+          </value>
+        </entry>
+        <entry key="NewsSave">
+          <value>
+            <set>
+              <option value="file://$PROJECT_DIR$/../gin_test/req/new.go" />
+            </set>
+          </value>
+        </entry>
         <entry key="Paginate">
           <value>
             <set>
@@ -326,7 +340,7 @@
         <entry key="file://$PROJECT_DIR$/valid/valid.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1770185876649" />
+              <option name="lastModified" value="1770188345045" />
             </ScannedPath>
           </value>
         </entry>
@@ -352,6 +366,26 @@
             </ScannedPath>
           </value>
         </entry>
+        <entry key="file://$PROJECT_DIR$/../gin_test/req/new.go">
+          <value>
+            <ScannedPath>
+              <option name="lastModified" value="1770186504009" />
+              <option name="schema">
+                <list>
+                  <option value="NewsOne" />
+                  <option value="NewsSave" />
+                </list>
+              </option>
+            </ScannedPath>
+          </value>
+        </entry>
+        <entry key="file://$PROJECT_DIR$/../gin_test/router/router.go">
+          <value>
+            <ScannedPath>
+              <option name="lastModified" value="1770187001756" />
+            </ScannedPath>
+          </value>
+        </entry>
       </map>
     </option>
     <option name="tableStructMapping">
@@ -368,6 +402,8 @@
         <entry key="jwt_config" value="JwtConfig" />
         <entry key="manager" value="Manager" />
         <entry key="msg" value="Msg" />
+        <entry key="news_one" value="NewsOne" />
+        <entry key="news_save" value="NewsSave" />
         <entry key="paginate" value="Paginate" />
         <entry key="response" value="response" />
         <entry key="server_config" value="ServerConfig" />
diff --git a/valid/valid.go b/valid/valid.go
index c6bd916..8647d0f 100644
--- a/valid/valid.go
+++ b/valid/valid.go
@@ -4,16 +4,29 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 // ValidAndStruct 验证参数并返回结构体
 func ValidAndStruct[T any](c *gin.Context) (object *T) {
-	object = new(T)
-	if err := c.BindJSON(object); err != nil {
+	obj := new(T)
+	if err := c.BindJSON(obj); err != nil {
 		panic(err)
 	}
-	if err := g.Validator().Data(object).Run(c); err != nil {
+	if err := g.Validator().Data(obj).Run(c); err != nil {
 		panic(gerror.Current(err).Error())
 	}
-	return
+	return obj
+}
+
+// ValidAndMap 验证参数并返回map
+func ValidAndMap[T any](c *gin.Context) (object map[string]any) {
+	obj := new(T)
+	if err := c.BindJSON(obj); err != nil {
+		panic(err)
+	}
+	if err := g.Validator().Data(obj).Run(c); err != nil {
+		panic(gerror.Current(err).Error())
+	}
+	return gconv.Map(obj)
 }