Compare commits

...

5 Commits

Author SHA1 Message Date
black1552 60f0d8053d fix(database): 优化SQLite数据库初始化逻辑
- 在创建数据库文件前先检查文件是否存在
- 避免重复创建已存在的数据库文件
- 更新项目配置文件中的文件修改时间戳
2026-02-05 10:30:56 +08:00
black1552 258112d38e feat(valid): 更新验证功能支持多种绑定方式
- 修改 ValidToStruct 函数使用 c.Bind 替代 c.BindJSON
- 新增 ValidToMap 函数支持将参数验证后转换为 map 类型
- 更新 ValidToStructAndMap 函数使用 c.Bind 进行参数绑定
- 添加相应的错误处理和类型转换逻辑
- 更新项目缓存配置文件中的文件扫描路径信息
2026-02-04 16:19:36 +08:00
black1552 8927551779 refactor(valid): 重构验证函数命名和返回值
- 将 ValidAndStruct 函数重命名为 ValidToStruct
- 将 ValidAndMap 函数重命名为 ValidToStructAndMap
- 修改 ValidToStructAndMap 函数返回结构体和映射两个值
- 更新 .idea/GOHCache.xml 中的文件修改时间戳
2026-02-04 15:05:09 +08:00
black1552 0ad7304eca feat(valid): 添加参数验证并返回map功能
- 新增ValidAndMap函数用于验证参数并返回map类型
- 修改ValidAndStruct函数优化对象绑定逻辑
- 添加gconv包导入支持map转换功能
- 更新IDE缓存配置添加新的验证类型映射
2026-02-04 14:59:26 +08:00
black1552 a1a2785c71 refactor(valid): 重构验证模块使用Goframe验证器
- 移除原有的validator和国际化翻译相关代码
- 使用Goframe的g.Validator进行参数验证
- 简化ValidAndStruct函数实现
- 更新依赖包从validator切换到gogf
- 删除不再使用的ValidateError工具函数
- 移除init函数中的翻译器初始化逻辑
2026-02-04 14:18:10 +08:00
4 changed files with 58 additions and 205 deletions

View File

@ -10,13 +10,6 @@
</set> </set>
</value> </value>
</entry> </entry>
<entry key="ApiResponse">
<value>
<set>
<option value="file://$PROJECT_DIR$/valid/valid.go" />
</set>
</value>
</entry>
<entry key="BaseConfig"> <entry key="BaseConfig">
<value> <value>
<set> <set>
@ -52,25 +45,10 @@
</set> </set>
</value> </value>
</entry> </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"> <entry key="Curd">
<value> <value>
<set> <set>
<option value="file://$PROJECT_DIR$/curd/curd.go" /> <option value="file://$PROJECT_DIR$/curd/curd.go" />
<option value="file://$PROJECT_DIR$/dao/dao.go" />
</set> </set>
</value> </value>
</entry> </entry>
@ -109,23 +87,10 @@
</set> </set>
</value> </value>
</entry> </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"> <entry key="NewsOne">
<value> <value>
<set> <set>
<option value="file://$PROJECT_DIR$/../gin_test/api/new.go" />
<option value="file://$PROJECT_DIR$/../gin_test/req/new.go" /> <option value="file://$PROJECT_DIR$/../gin_test/req/new.go" />
</set> </set>
</value> </value>
@ -133,6 +98,7 @@
<entry key="NewsSave"> <entry key="NewsSave">
<value> <value>
<set> <set>
<option value="file://$PROJECT_DIR$/../gin_test/api/new.go" />
<option value="file://$PROJECT_DIR$/../gin_test/req/new.go" /> <option value="file://$PROJECT_DIR$/../gin_test/req/new.go" />
</set> </set>
</value> </value>
@ -141,7 +107,6 @@
<value> <value>
<set> <set>
<option value="file://$PROJECT_DIR$/curd/curd.go" /> <option value="file://$PROJECT_DIR$/curd/curd.go" />
<option value="file://$PROJECT_DIR$/dao/dao.go" />
</set> </set>
</value> </value>
</entry> </entry>
@ -187,27 +152,6 @@
</set> </set>
</value> </value>
</entry> </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> </map>
</option> </option>
<option name="scannedPathMapping"> <option name="scannedPathMapping">
@ -254,23 +198,10 @@
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </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"> <entry key="file://$PROJECT_DIR$/database/database.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1770100613057" /> <option name="lastModified" value="1770258641711" />
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </entry>
@ -408,22 +339,10 @@
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </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"> <entry key="file://$PROJECT_DIR$/valid/valid.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1770109758999" /> <option name="lastModified" value="1770197737203" />
<option name="schema">
<list>
<option value="ApiResponse" />
</list>
</option>
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </entry>
@ -449,82 +368,51 @@
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </entry>
<entry key="file://$PROJECT_DIR$/../gin_test/dao/dao.go"> <entry key="file://$PROJECT_DIR$/../gin_test/api/home.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1770085772445" /> <option name="lastModified" value="1770190095707" />
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </entry>
<entry key="file://$PROJECT_DIR$/../gin_test/dao/newsDao.go"> <entry key="file://$PROJECT_DIR$/../gin_test/api/new.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1770097580598" /> <option name="lastModified" value="1770191206242" />
<option name="schema"> <option name="schema">
<list> <list>
<option value="sNewsDao" /> <option value="NewsOne" />
<option value="NewsSave" />
</list> </list>
</option> </option>
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </entry>
<entry key="file://$PROJECT_DIR$/../gin_test/dao/userDao.go"> <entry key="file://$PROJECT_DIR$/../gin_test/controller/home/houeRouter.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1770087884880" /> <option name="lastModified" value="1770191001042" />
<option name="schema">
<list>
<option value="userDao" />
</list>
</option>
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </entry>
<entry key="file://$PROJECT_DIR$/../gin_test/main.go"> <entry key="file://$PROJECT_DIR$/../gin_test/controller/home/index.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1770097796404" /> <option name="lastModified" value="1770255253603" />
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </entry>
<entry key="file://$PROJECT_DIR$/../gin_test/migrate/index.go"> <entry key="file://$PROJECT_DIR$/../gin_test/controller/home/router.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1770097713976" /> <option name="lastModified" value="1770190557848" />
</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> </ScannedPath>
</value> </value>
</entry> </entry>
<entry key="file://$PROJECT_DIR$/../gin_test/req/new.go"> <entry key="file://$PROJECT_DIR$/../gin_test/req/new.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1770109333290" /> <option name="lastModified" value="1770186504009" />
<option name="schema"> <option name="schema">
<list> <list>
<option value="NewsOne" /> <option value="NewsOne" />
@ -537,7 +425,7 @@
<entry key="file://$PROJECT_DIR$/../gin_test/router/router.go"> <entry key="file://$PROJECT_DIR$/../gin_test/router/router.go">
<value> <value>
<ScannedPath> <ScannedPath>
<option name="lastModified" value="1770109774053" /> <option name="lastModified" value="1770191024510" />
</ScannedPath> </ScannedPath>
</value> </value>
</entry> </entry>
@ -546,36 +434,28 @@
<option name="tableStructMapping"> <option name="tableStructMapping">
<map> <map>
<entry key="api" value="Api" /> <entry key="api" value="Api" />
<entry key="api_response" value="ApiResponse" />
<entry key="base_config" value="BaseConfig" /> <entry key="base_config" value="BaseConfig" />
<entry key="client" value="Client" /> <entry key="client" value="Client" />
<entry key="config" value="Config" /> <entry key="config" value="Config" />
<entry key="connection" value="Connection" /> <entry key="connection" value="Connection" />
<entry key="connection_pool" value="ConnectionPool" /> <entry key="connection_pool" value="ConnectionPool" />
<entry key="crud" value="Crud" />
<entry key="cs1_news" value="Cs1News" />
<entry key="curd" value="Curd" /> <entry key="curd" value="Curd" />
<entry key="data_base_config" value="DataBaseConfig" /> <entry key="data_base_config" value="DataBaseConfig" />
<entry key="jwt_claims" value="JWTClaims" /> <entry key="jwt_claims" value="JWTClaims" />
<entry key="jwt_config" value="JwtConfig" /> <entry key="jwt_config" value="JwtConfig" />
<entry key="manager" value="Manager" /> <entry key="manager" value="Manager" />
<entry key="msg" value="Msg" /> <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_one" value="NewsOne" />
<entry key="news_save" value="NewsSave" /> <entry key="news_save" value="NewsSave" />
<entry key="paginate" value="Paginate" /> <entry key="paginate" value="Paginate" />
<entry key="response" value="response" /> <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="server_config" value="ServerConfig" />
<entry key="tcp_connection" value="TcpConnection" /> <entry key="tcp_connection" value="TcpConnection" />
<entry key="tcp_message" value="TcpMessage" /> <entry key="tcp_message" value="TcpMessage" />
<entry key="tcp_pool_config" value="TcpPoolConfig" /> <entry key="tcp_pool_config" value="TcpPoolConfig" />
<entry key="tcp_server" value="TCPServer" /> <entry key="tcp_server" value="TCPServer" />
<entry key="user_dao" value="userDao" />
</map> </map>
</option> </option>
<option name="lastTimeChecked" value="1770082491799" /> <option name="lastTimeChecked" value="1770185677345" />
</component> </component>
</project> </project>

View File

@ -68,10 +68,12 @@ func mysqlInit() {
} }
func sqliteInit() { func sqliteInit() {
if !gfile.Exists(dns.String()) {
_, err = gfile.Create(dns.String()) _, err = gfile.Create(dns.String())
if err != nil { if err != nil {
log.Error("创建数据库文件失败: ", err) log.Error("创建数据库文件失败: ", err)
return return
} }
}
Type = sqlite.Open(fmt.Sprintf("%s?cache=shared&mode=rwc&_busy_timeout=10000&_fk=1&_journal=WAL&_sync=FULL", dns.String())) Type = sqlite.Open(fmt.Sprintf("%s?cache=shared&mode=rwc&_busy_timeout=10000&_fk=1&_journal=WAL&_sync=FULL", dns.String()))
} }

View File

@ -1 +0,0 @@
package valid

View File

@ -1,72 +1,44 @@
package valid package valid
import ( import (
"errors" "github.com/gin-gonic/gin"
"reflect" "github.com/gogf/gf/v2/errors/gerror"
"strings" "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/util/gconv"
"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"
) )
// -------------------------- 全局变量(翻译器+验证器) -------------------------- // ValidToStruct 验证参数并返回结构体
var ( func ValidToStruct[T any](c *gin.Context) (object *T) {
trans ut.Translator // 全局中文翻译器 obj := new(T)
validate *validator.Validate // 全局验证器实例 if err := c.Bind(obj); err != nil {
found bool panic(err)
)
// -------------------------- 初始化全局验证器+中文翻译器关键与Gin关联 --------------------------
func init() {
// 1. 初始化中文本地化
zhLocale := zh.New()
uni := ut.New(zhLocale, zhLocale)
// 2. 获取中文翻译器
var err error
trans, found = uni.GetTranslator("zh")
if !found {
panic("获取中文翻译器失败")
} }
if err := g.Validator().Data(obj).Run(c); err != nil {
// 3. 关键:获取 Gin 内置的 validator 实例(而非手动创建 new(validator.Validate) panic(gerror.Current(err).Error())
// 保证 Gin 绑定参数时使用的是我们注册了翻译的这个验证器
if v, ok := binding.Validator.Engine().(*validator.Validate); ok {
validate = v
} else {
panic("获取 Gin 内置验证器失败")
} }
return obj
// 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 -------------------------- 工具函数:解析第一条验证错误(中文翻译) -------------------------- // ValidToMap 验证参数并返回结构体
func ValidateError(err error) string { func ValidToMap[T any](c *gin.Context) (object map[string]any) {
// 1. 断言错误类型为 validator.ValidationErrors obj := new(T)
var validateErrors validator.ValidationErrors if err := c.Bind(obj); err != nil {
ok := errors.As(err, &validateErrors) panic(err)
if !ok {
// 非参数验证错误,直接返回
return "参数格式错误:" + err.Error()
} }
if err := g.Validator().Data(obj).Run(c); err != nil {
// 2. 只返回第一条中文翻译错误 panic(gerror.Current(err).Error())
return validateErrors[0].Translate(trans) }
return gconv.Map(obj)
}
// ValidToStructAndMap 验证参数并返回map
func ValidToStructAndMap[T any](c *gin.Context) (stru *T, object map[string]any) {
obj := new(T)
if err := c.Bind(obj); err != nil {
panic(err)
}
if err := g.Validator().Data(obj).Run(c); err != nil {
panic(gerror.Current(err).Error())
}
return obj, gconv.Map(obj)
} }