From a1a2785c71db7fc135e8133eea02d06da8f0cee6 Mon Sep 17 00:00:00 2001
From: black1552 <black1552@163.com>
Date: Wed, 4 Feb 2026 14:18:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(valid):=20=E9=87=8D=E6=9E=84=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E6=A8=A1=E5=9D=97=E4=BD=BF=E7=94=A8Goframe=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除原有的validator和国际化翻译相关代码
- 使用Goframe的g.Validator进行参数验证
- 简化ValidAndStruct函数实现
- 更新依赖包从validator切换到gogf
- 删除不再使用的ValidateError工具函数
- 移除init函数中的翻译器初始化逻辑
---
 .idea/GOHCache.xml | 203 +--------------------------------------------
 valid/index.go     |   1 -
 valid/valid.go     |  75 +++--------------
 3 files changed, 13 insertions(+), 266 deletions(-)
 delete mode 100644 valid/index.go

diff --git a/.idea/GOHCache.xml b/.idea/GOHCache.xml
index 5f5b4de..c5e93b7 100644
--- a/.idea/GOHCache.xml
+++ b/.idea/GOHCache.xml
@@ -10,13 +10,6 @@
             </set>
           </value>
         </entry>
-        <entry key="ApiResponse">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/valid/valid.go" />
-            </set>
-          </value>
-        </entry>
         <entry key="BaseConfig">
           <value>
             <set>
@@ -52,25 +45,10 @@
             </set>
           </value>
         </entry>
-        <entry key="Crud">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/dao/dao.go" />
-            </set>
-          </value>
-        </entry>
-        <entry key="Cs1News">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/../gin_test/model/news.go" />
-            </set>
-          </value>
-        </entry>
         <entry key="Curd">
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/curd/curd.go" />
-              <option value="file://$PROJECT_DIR$/dao/dao.go" />
             </set>
           </value>
         </entry>
@@ -109,39 +87,10 @@
             </set>
           </value>
         </entry>
-        <entry key="News">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/../gin_test/model/news.go" />
-            </set>
-          </value>
-        </entry>
-        <entry key="NewsDb">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/../gin_test/model/news.go" />
-            </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>
               <option value="file://$PROJECT_DIR$/curd/curd.go" />
-              <option value="file://$PROJECT_DIR$/dao/dao.go" />
             </set>
           </value>
         </entry>
@@ -187,27 +136,6 @@
             </set>
           </value>
         </entry>
-        <entry key="sNewsDao">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/../gin_test/dao/newsDao.go" />
-            </set>
-          </value>
-        </entry>
-        <entry key="sNewsDb">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/../gin_test/model/news.go" />
-            </set>
-          </value>
-        </entry>
-        <entry key="userDao">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/../gin_test/dao/userDao.go" />
-            </set>
-          </value>
-        </entry>
       </map>
     </option>
     <option name="scannedPathMapping">
@@ -254,19 +182,6 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/dao/dao.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770086496457" />
-              <option name="schema">
-                <list>
-                  <option value="Paginate" />
-                  <option value="Curd" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/database/database.go">
           <value>
             <ScannedPath>
@@ -408,22 +323,10 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/valid/index.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770109401228" />
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/valid/valid.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1770109758999" />
-              <option name="schema">
-                <list>
-                  <option value="ApiResponse" />
-                </list>
-              </option>
+              <option name="lastModified" value="1770185876649" />
             </ScannedPath>
           </value>
         </entry>
@@ -449,133 +352,31 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/../gin_test/dao/dao.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770085772445" />
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/../gin_test/dao/newsDao.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770097580598" />
-              <option name="schema">
-                <list>
-                  <option value="sNewsDao" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/../gin_test/dao/userDao.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770087884880" />
-              <option name="schema">
-                <list>
-                  <option value="userDao" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/../gin_test/main.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770097796404" />
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/../gin_test/migrate/index.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770097713976" />
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/../gin_test/migrate/migrate.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770097831261" />
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/../gin_test/model/index.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770083071840" />
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/../gin_test/model/news.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770103134469" />
-              <option name="schema">
-                <list>
-                  <option value="News" />
-                  <option value="sNewsDb" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/../gin_test/req/new.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1770109333290" />
-              <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="1770109774053" />
-            </ScannedPath>
-          </value>
-        </entry>
       </map>
     </option>
     <option name="tableStructMapping">
       <map>
         <entry key="api" value="Api" />
-        <entry key="api_response" value="ApiResponse" />
         <entry key="base_config" value="BaseConfig" />
         <entry key="client" value="Client" />
         <entry key="config" value="Config" />
         <entry key="connection" value="Connection" />
         <entry key="connection_pool" value="ConnectionPool" />
-        <entry key="crud" value="Crud" />
-        <entry key="cs1_news" value="Cs1News" />
         <entry key="curd" value="Curd" />
         <entry key="data_base_config" value="DataBaseConfig" />
         <entry key="jwt_claims" value="JWTClaims" />
         <entry key="jwt_config" value="JwtConfig" />
         <entry key="manager" value="Manager" />
         <entry key="msg" value="Msg" />
-        <entry key="news" value="News" />
-        <entry key="news_db" value="NewsDb" />
-        <entry key="news_one" value="NewsOne" />
-        <entry key="news_save" value="NewsSave" />
         <entry key="paginate" value="Paginate" />
         <entry key="response" value="response" />
-        <entry key="s_news_dao" value="sNewsDao" />
-        <entry key="s_news_db" value="sNewsDb" />
         <entry key="server_config" value="ServerConfig" />
         <entry key="tcp_connection" value="TcpConnection" />
         <entry key="tcp_message" value="TcpMessage" />
         <entry key="tcp_pool_config" value="TcpPoolConfig" />
         <entry key="tcp_server" value="TCPServer" />
-        <entry key="user_dao" value="userDao" />
       </map>
     </option>
-    <option name="lastTimeChecked" value="1770082491799" />
+    <option name="lastTimeChecked" value="1770185677345" />
   </component>
 </project>
\ No newline at end of file
diff --git a/valid/index.go b/valid/index.go
deleted file mode 100644
index 691266c..0000000
--- a/valid/index.go
+++ /dev/null
@@ -1 +0,0 @@
-package valid
diff --git a/valid/valid.go b/valid/valid.go
index ffbacfc..c6bd916 100644
--- a/valid/valid.go
+++ b/valid/valid.go
@@ -1,72 +1,19 @@
 package valid
 
 import (
-	"errors"
-	"reflect"
-	"strings"
-
-	"github.com/gin-gonic/gin/binding"
-	"github.com/go-playground/locales/zh"
-	ut "github.com/go-playground/universal-translator"
-	"github.com/go-playground/validator/v10"
-	zh_translations "github.com/go-playground/validator/v10/translations/zh"
+	"github.com/gin-gonic/gin"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
-// -------------------------- 全局变量（翻译器+验证器） --------------------------
-var (
-	trans    ut.Translator       // 全局中文翻译器
-	validate *validator.Validate // 全局验证器实例
-	found    bool
-)
-
-// -------------------------- 初始化全局验证器+中文翻译器（关键：与Gin关联） --------------------------
-func init() {
-	// 1. 初始化中文本地化
-	zhLocale := zh.New()
-	uni := ut.New(zhLocale, zhLocale)
-
-	// 2. 获取中文翻译器
-	var err error
-	trans, found = uni.GetTranslator("zh")
-	if !found {
-		panic("获取中文翻译器失败")
+// ValidAndStruct 验证参数并返回结构体
+func ValidAndStruct[T any](c *gin.Context) (object *T) {
+	object = new(T)
+	if err := c.BindJSON(object); err != nil {
+		panic(err)
 	}
-
-	// 3. 关键：获取 Gin 内置的 validator 实例（而非手动创建 new(validator.Validate)）
-	// 保证 Gin 绑定参数时使用的是我们注册了翻译的这个验证器
-	if v, ok := binding.Validator.Engine().(*validator.Validate); ok {
-		validate = v
-	} else {
-		panic("获取 Gin 内置验证器失败")
+	if err := g.Validator().Data(object).Run(c); err != nil {
+		panic(gerror.Current(err).Error())
 	}
-
-	// 4. 注册中文翻译（核心：将验证器与中文翻译器绑定）
-	err = zh_translations.RegisterDefaultTranslations(validate, trans)
-	if err != nil {
-		panic("注册中文翻译失败：" + err.Error())
-	}
-
-	// 5. 注册字段名映射：用 json 标签替换结构体字段名（解决报错中的 Title -> title 问题）
-	validate.RegisterTagNameFunc(func(fld reflect.StructField) string {
-		// 提取 json 标签，忽略 ,omitempty 等附加选项
-		jsonTag := strings.SplitN(fld.Tag.Get("json"), ",", 2)[0]
-		if jsonTag == "-" {
-			return ""
-		}
-		return jsonTag
-	})
-}
-
-// ValidateError -------------------------- 工具函数：解析第一条验证错误（中文翻译） --------------------------
-func ValidateError(err error) string {
-	// 1. 断言错误类型为 validator.ValidationErrors
-	var validateErrors validator.ValidationErrors
-	ok := errors.As(err, &validateErrors)
-	if !ok {
-		// 非参数验证错误，直接返回
-		return "参数格式错误：" + err.Error()
-	}
-
-	// 2. 只返回第一条中文翻译错误
-	return validateErrors[0].Translate(trans)
+	return
 }