From 8927551779bfcf254f85b81d27a43e3993d42bca Mon Sep 17 00:00:00 2001
From: black1552 <black1552@163.com>
Date: Wed, 4 Feb 2026 15:05:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor(valid):=20=E9=87=8D=E6=9E=84=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=87=BD=E6=95=B0=E5=91=BD=E5=90=8D=E5=92=8C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 ValidAndStruct 函数重命名为 ValidToStruct
- 将 ValidAndMap 函数重命名为 ValidToStructAndMap
- 修改 ValidToStructAndMap 函数返回结构体和映射两个值
- 更新 .idea/GOHCache.xml 中的文件修改时间戳
---
 .idea/GOHCache.xml |  4 ++--
 valid/valid.go     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.idea/GOHCache.xml b/.idea/GOHCache.xml
index 142c763..829d21b 100644
--- a/.idea/GOHCache.xml
+++ b/.idea/GOHCache.xml
@@ -340,7 +340,7 @@
         <entry key="file://$PROJECT_DIR$/valid/valid.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1770188345045" />
+              <option name="lastModified" value="1770188678912" />
             </ScannedPath>
           </value>
         </entry>
@@ -382,7 +382,7 @@
         <entry key="file://$PROJECT_DIR$/../gin_test/router/router.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1770187001756" />
+              <option name="lastModified" value="1770188593199" />
             </ScannedPath>
           </value>
         </entry>
diff --git a/valid/valid.go b/valid/valid.go
index 8647d0f..b0f4c68 100644
--- a/valid/valid.go
+++ b/valid/valid.go
@@ -7,8 +7,8 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
-// ValidAndStruct 验证参数并返回结构体
-func ValidAndStruct[T any](c *gin.Context) (object *T) {
+// ValidToStruct 验证参数并返回结构体
+func ValidToStruct[T any](c *gin.Context) (object *T) {
 	obj := new(T)
 	if err := c.BindJSON(obj); err != nil {
 		panic(err)
@@ -19,8 +19,8 @@ func ValidAndStruct[T any](c *gin.Context) (object *T) {
 	return obj
 }
 
-// ValidAndMap 验证参数并返回map
-func ValidAndMap[T any](c *gin.Context) (object map[string]any) {
+// ValidToStructAndMap 验证参数并返回map
+func ValidToStructAndMap[T any](c *gin.Context) (stru *T, object map[string]any) {
 	obj := new(T)
 	if err := c.BindJSON(obj); err != nil {
 		panic(err)
@@ -28,5 +28,5 @@ func ValidAndMap[T any](c *gin.Context) (object map[string]any) {
 	if err := g.Validator().Data(obj).Run(c); err != nil {
 		panic(gerror.Current(err).Error())
 	}
-	return gconv.Map(obj)
+	return obj, gconv.Map(obj)
 }