Compare commits
No commits in common. "main" and "v1.0.00007" have entirely different histories.
main
...
v1.0.00007
|
|
@ -1,461 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="GoORMHelperCache">
|
|
||||||
<option name="schemaMapping">
|
|
||||||
<map>
|
|
||||||
<entry key="Api">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/response/code.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="BaseConfig">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/config/structs.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="Client">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/mqtt/client/mqtt.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="Config">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/ws/websocket.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="Connection">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/ws/websocket.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="ConnectionPool">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/tcp/tcp.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="Curd">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/curd/curd.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="DataBaseConfig">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/config/structs.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="JWTClaims">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/utils/jwt.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="JwtConfig">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/config/structs.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="Manager">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/ws/websocket.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="Msg">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/ws/websocket.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="NewsOne">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/../gin_test/api/new.go" />
|
|
||||||
<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/api/new.go" />
|
|
||||||
<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" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="ServerConfig">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/config/structs.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="TCPServer">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/tcp/tcp.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="TcpConnection">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/tcp/tcpConfig.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="TcpMessage">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/tcp/tcpConfig.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="TcpPoolConfig">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/tcp/tcpConfig.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="response">
|
|
||||||
<value>
|
|
||||||
<set>
|
|
||||||
<option value="file://$PROJECT_DIR$/response/code.go" />
|
|
||||||
</set>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
<option name="scannedPathMapping">
|
|
||||||
<map>
|
|
||||||
<entry key="file://$PROJECT_DIR$/config/fun.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770100625919" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/config/index.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770011355476" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/config/structs.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770022381063" />
|
|
||||||
<option name="schema">
|
|
||||||
<list>
|
|
||||||
<option value="BaseConfig" />
|
|
||||||
<option value="ServerConfig" />
|
|
||||||
<option value="DataBaseConfig" />
|
|
||||||
<option value="JwtConfig" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/curd/curd.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770102564408" />
|
|
||||||
<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>
|
|
||||||
<option name="lastModified" value="1770258641711" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/database/index.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770025447924" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/database/migrate.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770101088203" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/log/index.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770011347706" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/log/log.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770011076335" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/main.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770025551953" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/middleware/middleware.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770108038945" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/mqtt/client/mqtt.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770025698340" />
|
|
||||||
<option name="schema">
|
|
||||||
<list>
|
|
||||||
<option value="Client" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/response/code.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770014431840" />
|
|
||||||
<option name="schema">
|
|
||||||
<list>
|
|
||||||
<option value="response" />
|
|
||||||
<option value="Api" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/server/server.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770026239951" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/tcp/example.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770025697304" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/tcp/tcp.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770025697304" />
|
|
||||||
<option name="schema">
|
|
||||||
<list>
|
|
||||||
<option value="TCPServer" />
|
|
||||||
<option value="ConnectionPool" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/tcp/tcpConfig.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770025697304" />
|
|
||||||
<option name="schema">
|
|
||||||
<list>
|
|
||||||
<option value="TcpPoolConfig" />
|
|
||||||
<option value="TcpConnection" />
|
|
||||||
<option value="TcpMessage" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/utils/file.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1769850381300" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/utils/jwt.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770090940817" />
|
|
||||||
<option name="schema">
|
|
||||||
<list>
|
|
||||||
<option value="JWTClaims" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/utils/ptr.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770016124510" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/valid/valid.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770197737203" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/ws/example.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770025697531" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/ws/websocket.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770018907536" />
|
|
||||||
<option name="schema">
|
|
||||||
<list>
|
|
||||||
<option value="Config" />
|
|
||||||
<option value="Connection" />
|
|
||||||
<option value="Manager" />
|
|
||||||
<option value="Msg" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/../gin_test/api/home.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770190095707" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/../gin_test/api/new.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770191206242" />
|
|
||||||
<option name="schema">
|
|
||||||
<list>
|
|
||||||
<option value="NewsOne" />
|
|
||||||
<option value="NewsSave" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/../gin_test/controller/home/houeRouter.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770191001042" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/../gin_test/controller/home/index.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770255253603" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="file://$PROJECT_DIR$/../gin_test/controller/home/router.go">
|
|
||||||
<value>
|
|
||||||
<ScannedPath>
|
|
||||||
<option name="lastModified" value="1770190557848" />
|
|
||||||
</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="1770191024510" />
|
|
||||||
</ScannedPath>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
<option name="tableStructMapping">
|
|
||||||
<map>
|
|
||||||
<entry key="api" value="Api" />
|
|
||||||
<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="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_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" />
|
|
||||||
<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" />
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
<option name="lastTimeChecked" value="1770185677345" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
|
|
@ -58,7 +58,7 @@ func SetDefault() {
|
||||||
viper.Set("SERVER.addr", "127.0.0.1:8080")
|
viper.Set("SERVER.addr", "127.0.0.1:8080")
|
||||||
viper.Set("SERVER.mode", "release")
|
viper.Set("SERVER.mode", "release")
|
||||||
viper.Set("DATABASE.type", "sqlite")
|
viper.Set("DATABASE.type", "sqlite")
|
||||||
viper.Set("DATABASE.dns", gfile.Join(gfile.Pwd(), "db", "database.db"))
|
viper.Set("DATABASE.dns", gfile.Join(gfile.Pwd(), "db", "database.db?cache=shared&mode=rwc&_busy_timeout=10000&_fk=1&_journal=WAL&_sync=FULL"))
|
||||||
viper.Set("JWT.secret", "SET-YOUR-SECRET")
|
viper.Set("JWT.secret", "SET-YOUR-SECRET")
|
||||||
viper.Set("JWT.expire", 86400)
|
viper.Set("JWT.expire", 86400)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
92
curd/curd.go
92
curd/curd.go
|
|
@ -287,7 +287,7 @@ func (c Curd[R]) ClearFieldOne(ctx ctx, req any, delField []string, where any, o
|
||||||
err = db.Where(filterMap).First(item).Error
|
err = db.Where(filterMap).First(item).Error
|
||||||
// 处理记录不存在的情况（GORM会返回ErrRecordNotFound）
|
// 处理记录不存在的情况（GORM会返回ErrRecordNotFound）
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
panic("未找到数据")
|
return nil, nil
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -311,7 +311,7 @@ func (c Curd[R]) Value(ctx ctx, where any, field any) (interface{}, error) {
|
||||||
// 执行查询（取第一条记录的指定字段）
|
// 执行查询（取第一条记录的指定字段）
|
||||||
err := db.First(&result).Error
|
err := db.First(&result).Error
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
panic("未找到数据")
|
return nil, nil
|
||||||
}
|
}
|
||||||
return result, err
|
return result, err
|
||||||
}
|
}
|
||||||
|
|
@ -322,7 +322,7 @@ func (c Curd[R]) DeletePri(ctx ctx, primaryKey any) error {
|
||||||
// 按主键字段构建查询
|
// 按主键字段构建查询
|
||||||
pk := c.Dao.PrimaryKey()
|
pk := c.Dao.PrimaryKey()
|
||||||
if pk == "" {
|
if pk == "" {
|
||||||
panic("主键字段未配置")
|
return errors.New("主键字段未配置")
|
||||||
}
|
}
|
||||||
return db.Where(fmt.Sprintf("%s = ?", pk), primaryKey).Delete(new(R)).Error
|
return db.Where(fmt.Sprintf("%s = ?", pk), primaryKey).Delete(new(R)).Error
|
||||||
}
|
}
|
||||||
|
|
@ -333,21 +333,18 @@ func (c Curd[R]) DeleteWhere(ctx ctx, where any) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sum -------------------------- 原Sum对应实现：字段求和 --------------------------
|
// Sum -------------------------- 原Sum对应实现：字段求和 --------------------------
|
||||||
func (c Curd[R]) Sum(ctx ctx, where any, field string) float64 {
|
func (c Curd[R]) Sum(ctx ctx, where any, field string) (float64, error) {
|
||||||
var sum float64
|
var sum float64
|
||||||
if field == "" {
|
if field == "" {
|
||||||
panic("求和字段不能为空")
|
return 0, errors.New("求和字段不能为空")
|
||||||
}
|
}
|
||||||
|
|
||||||
err := c.Dao.Ctx(ctx).Model(new(R)).Where(where).Select(fmt.Sprintf("SUM(%s) as sum", field)).Scan(&sum).Error
|
err := c.Dao.Ctx(ctx).Model(new(R)).Where(where).Select(fmt.Sprintf("SUM(%s) as sum", field)).Scan(&sum).Error
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
return sum, err
|
||||||
panic("未找到数据")
|
|
||||||
}
|
|
||||||
return sum
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ArrayField -------------------------- 原ArrayField对应实现：查询指定字段数组 --------------------------
|
// ArrayField -------------------------- 原ArrayField对应实现：查询指定字段数组 --------------------------
|
||||||
func (c Curd[R]) ArrayField(ctx ctx, where any, field any) []interface{} {
|
func (c Curd[R]) ArrayField(ctx ctx, where any, field any) ([]interface{}, error) {
|
||||||
var result []interface{}
|
var result []interface{}
|
||||||
db := c.Dao.Ctx(ctx).Model(new(R)).Where(where)
|
db := c.Dao.Ctx(ctx).Model(new(R)).Where(where)
|
||||||
|
|
||||||
|
|
@ -364,35 +361,32 @@ func (c Curd[R]) ArrayField(ctx ctx, where any, field any) []interface{} {
|
||||||
|
|
||||||
// 执行查询
|
// 执行查询
|
||||||
err := db.Find(&result).Error
|
err := db.Find(&result).Error
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
return result, err
|
||||||
panic("未找到数据")
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// FindPri -------------------------- 原FindPri对应实现：按主键查询单条记录 --------------------------
|
// FindPri -------------------------- 原FindPri对应实现：按主键查询单条记录 --------------------------
|
||||||
func (c Curd[R]) FindPri(ctx ctx, primaryKey any, with bool) (model *R) {
|
func (c Curd[R]) FindPri(ctx ctx, primaryKey any, with bool) (model *R, err error) {
|
||||||
model = new(R)
|
model = new(R)
|
||||||
db := c.Dao.Ctx(ctx).Model(model)
|
db := c.Dao.Ctx(ctx).Model(model)
|
||||||
pk := c.Dao.PrimaryKey()
|
pk := c.Dao.PrimaryKey()
|
||||||
|
|
||||||
if pk == "" {
|
if pk == "" {
|
||||||
panic("主键字段未配置")
|
return nil, errors.New("主键字段未配置")
|
||||||
}
|
}
|
||||||
if with {
|
if with {
|
||||||
db = db.Preload("*")
|
db = db.Preload("*")
|
||||||
}
|
}
|
||||||
|
|
||||||
// 按主键查询
|
// 按主键查询
|
||||||
err := db.Where(fmt.Sprintf("%s = ?", pk), primaryKey).First(model).Error
|
err = db.Where(fmt.Sprintf("%s = ?", pk), primaryKey).First(model).Error
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
panic("未找到数据")
|
return nil, nil
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------- 原First对应实现：按条件查询第一条记录 --------------------------
|
// -------------------------- 原First对应实现：按条件查询第一条记录 --------------------------
|
||||||
func (c Curd[R]) First(ctx ctx, where any, order any, with bool) (model *R) {
|
func (c Curd[R]) First(ctx ctx, where any, order any, with bool) (model *R, err error) {
|
||||||
model = new(R)
|
model = new(R)
|
||||||
db := c.Dao.Ctx(ctx).Model(model)
|
db := c.Dao.Ctx(ctx).Model(model)
|
||||||
|
|
||||||
|
|
@ -406,25 +400,25 @@ func (c Curd[R]) First(ctx ctx, where any, order any, with bool) (model *R) {
|
||||||
db = db.Order(order)
|
db = db.Order(order)
|
||||||
}
|
}
|
||||||
|
|
||||||
err := db.First(model).Error
|
err = db.First(model).Error
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
panic("未找到数据")
|
return nil, nil
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------- 原Exists对应实现：判断记录是否存在 --------------------------
|
// -------------------------- 原Exists对应实现：判断记录是否存在 --------------------------
|
||||||
func (c Curd[R]) Exists(ctx ctx, where any) (exists bool) {
|
func (c Curd[R]) Exists(ctx ctx, where any) (exists bool, err error) {
|
||||||
var count int64
|
var count int64
|
||||||
err := c.Dao.Ctx(ctx).Model(new(R)).Where(where).Count(&count).Error
|
err = c.Dao.Ctx(ctx).Model(new(R)).Where(where).Count(&count).Error
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(fmt.Sprintf("Exists查询错误: %v", err))
|
return false, err
|
||||||
}
|
}
|
||||||
return count > 0
|
return count > 0, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------- 原All对应实现：查询所有符合条件的记录 --------------------------
|
// -------------------------- 原All对应实现：查询所有符合条件的记录 --------------------------
|
||||||
func (c Curd[R]) All(ctx ctx, where any, order any, with bool) (items []*R) {
|
func (c Curd[R]) All(ctx ctx, where any, order any, with bool) (items []*R, err error) {
|
||||||
db := c.Dao.Ctx(ctx).Model(new(R))
|
db := c.Dao.Ctx(ctx).Model(new(R))
|
||||||
|
|
||||||
if with {
|
if with {
|
||||||
|
|
@ -437,57 +431,42 @@ func (c Curd[R]) All(ctx ctx, where any, order any, with bool) (items []*R) {
|
||||||
db = db.Order(order)
|
db = db.Order(order)
|
||||||
}
|
}
|
||||||
|
|
||||||
err := db.Find(&items).Error
|
err = db.Find(&items).Error
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
panic(fmt.Sprintf("All查询错误: %v", err))
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------- 原Count对应实现：统计记录总数 --------------------------
|
// -------------------------- 原Count对应实现：统计记录总数 --------------------------
|
||||||
func (c Curd[R]) Count(ctx ctx, where any) (count int64) {
|
func (c Curd[R]) Count(ctx ctx, where any) (count int64, err error) {
|
||||||
err := c.Dao.Ctx(ctx).Model(new(R)).Where(where).Count(&count).Error
|
err = c.Dao.Ctx(ctx).Model(new(R)).Where(where).Count(&count).Error
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
panic(fmt.Sprintf("Count查询错误: %v", err))
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------- 原Save对应实现：新增/更新记录（对应GORM的Save） --------------------------
|
// -------------------------- 原Save对应实现：新增/更新记录（对应GORM的Save） --------------------------
|
||||||
func (c Curd[R]) Save(ctx ctx, data any) {
|
func (c Curd[R]) Save(ctx ctx, data any) (err error) {
|
||||||
err := c.Dao.Ctx(ctx).Model(new(R)).Create(data).Error
|
return c.Dao.Ctx(ctx).Model(new(R)).Save(data).Error
|
||||||
if err != nil {
|
|
||||||
panic(fmt.Sprintf("Save保存错误: %v", err))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------- 原Update对应实现：按条件更新记录 --------------------------
|
// -------------------------- 原Update对应实现：按条件更新记录 --------------------------
|
||||||
func (c Curd[R]) Update(ctx ctx, where any, data any) (count int64) {
|
func (c Curd[R]) Update(ctx ctx, where any, data any) (count int64, err error) {
|
||||||
result := c.Dao.Ctx(ctx).Model(new(R)).Where(where).Updates(data)
|
result := c.Dao.Ctx(ctx).Model(new(R)).Where(where).Updates(data)
|
||||||
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
|
return result.RowsAffected, result.Error
|
||||||
panic(fmt.Sprintf("Update更新错误: %v", result.Error.Error()))
|
|
||||||
}
|
|
||||||
return result.RowsAffected
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------- 原UpdatePri对应实现：按主键更新记录 --------------------------
|
// -------------------------- 原UpdatePri对应实现：按主键更新记录 --------------------------
|
||||||
func (c Curd[R]) UpdatePri(ctx ctx, primaryKey any, data any) (count int64) {
|
func (c Curd[R]) UpdatePri(ctx ctx, primaryKey any, data any) (count int64, err error) {
|
||||||
db := c.Dao.Ctx(ctx).Model(new(R))
|
db := c.Dao.Ctx(ctx).Model(new(R))
|
||||||
pk := c.Dao.PrimaryKey()
|
pk := c.Dao.PrimaryKey()
|
||||||
|
|
||||||
if pk == "" {
|
if pk == "" {
|
||||||
panic("主键字段未配置")
|
return 0, errors.New("主键字段未配置")
|
||||||
}
|
}
|
||||||
|
|
||||||
result := db.Where(fmt.Sprintf("%s = ?", pk), primaryKey).Updates(data)
|
result := db.Where(fmt.Sprintf("%s = ?", pk), primaryKey).Updates(data)
|
||||||
if errors.Is(result.Error, gorm.ErrRecordNotFound) {
|
return result.RowsAffected, result.Error
|
||||||
panic(fmt.Sprintf("UpdatePri更新错误: %v", result.Error.Error()))
|
|
||||||
}
|
|
||||||
return result.RowsAffected
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// -------------------------- 原Paginate对应实现：分页查询 --------------------------
|
// -------------------------- 原Paginate对应实现：分页查询 --------------------------
|
||||||
func (c Curd[R]) Paginate(ctx context.Context, where any, p Paginate, with bool, order any) (items []*R, total int64) {
|
func (c Curd[R]) Paginate(ctx context.Context, where any, p Paginate, with bool, order any) (items []*R, total int64, err error) {
|
||||||
db := c.Dao.Ctx(ctx).Model(new(R))
|
db := c.Dao.Ctx(ctx).Model(new(R))
|
||||||
|
|
||||||
// 1. 构建查询条件
|
// 1. 构建查询条件
|
||||||
|
|
@ -496,8 +475,8 @@ func (c Curd[R]) Paginate(ctx context.Context, where any, p Paginate, with bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. 统计总数
|
// 2. 统计总数
|
||||||
if err := db.Count(&total).Error; err != nil {
|
if err = db.Count(&total).Error; err != nil {
|
||||||
panic(fmt.Sprintf("Paginate查询错误: %v", err))
|
return nil, 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. 关联查询
|
// 3. 关联查询
|
||||||
|
|
@ -517,10 +496,7 @@ func (c Curd[R]) Paginate(ctx context.Context, where any, p Paginate, with bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
// 6. 执行查询
|
// 6. 执行查询
|
||||||
err := db.Find(&items).Error
|
err = db.Find(&items).Error
|
||||||
if err != nil || errors.Is(err, gorm.ErrRecordNotFound) {
|
|
||||||
panic(fmt.Sprintf("Paginate查询错误: %v", err))
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ package database
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"git.magicany.cc/black1552/gin-base/config"
|
"git.magicany.cc/black1552/gin-base/config"
|
||||||
"git.magicany.cc/black1552/gin-base/log"
|
"git.magicany.cc/black1552/gin-base/log"
|
||||||
|
|
@ -19,7 +18,7 @@ var (
|
||||||
Db *gorm.DB
|
Db *gorm.DB
|
||||||
err error
|
err error
|
||||||
sqlDb *sql.DB
|
sqlDb *sql.DB
|
||||||
dns = config.GetConfigValue("database.dns", gfile.Join(gfile.Pwd(), "db", "database.db"))
|
dns = config.GetConfigValue("database.dns", gfile.Join(gfile.Pwd(), "db", "database.db?cache=shared&mode=rwc&_busy_timeout=10000&_fk=1&_journal=WAL&_sync=FULL"))
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
@ -68,12 +67,5 @@ func mysqlInit() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func sqliteInit() {
|
func sqliteInit() {
|
||||||
if !gfile.Exists(dns.String()) {
|
Type = sqlite.Open(dns.String())
|
||||||
_, err = gfile.Create(dns.String())
|
|
||||||
if err != nil {
|
|
||||||
log.Error("创建数据库文件失败: ", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Type = sqlite.Open(fmt.Sprintf("%s?cache=shared&mode=rwc&_busy_timeout=10000&_fk=1&_journal=WAL&_sync=FULL", dns.String()))
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ func SetAutoMigrate(models ...interface{}) {
|
||||||
log.Error("数据库连接失败")
|
log.Error("数据库连接失败")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Db = Db.Set("gorm:table_options", "ENGINE=InnoDB")
|
||||||
err := Db.AutoMigrate(models...)
|
err := Db.AutoMigrate(models...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("数据库迁移失败", err)
|
log.Error("数据库迁移失败", err)
|
||||||
|
|
|
||||||
6
go.mod
6
go.mod
|
|
@ -7,9 +7,6 @@ require (
|
||||||
github.com/fsnotify/fsnotify v1.9.0
|
github.com/fsnotify/fsnotify v1.9.0
|
||||||
github.com/gin-gonic/gin v1.7.7
|
github.com/gin-gonic/gin v1.7.7
|
||||||
github.com/glebarez/sqlite v1.11.0
|
github.com/glebarez/sqlite v1.11.0
|
||||||
github.com/go-playground/locales v0.13.0
|
|
||||||
github.com/go-playground/universal-translator v0.17.0
|
|
||||||
github.com/go-playground/validator/v10 v10.4.2
|
|
||||||
github.com/gogf/gf/v2 v2.10.0
|
github.com/gogf/gf/v2 v2.10.0
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.1
|
github.com/golang-jwt/jwt/v5 v5.3.1
|
||||||
github.com/gorilla/websocket v1.5.3
|
github.com/gorilla/websocket v1.5.3
|
||||||
|
|
@ -30,6 +27,9 @@ require (
|
||||||
github.com/glebarez/go-sqlite v1.21.2 // indirect
|
github.com/glebarez/go-sqlite v1.21.2 // indirect
|
||||||
github.com/go-logr/logr v1.4.3 // indirect
|
github.com/go-logr/logr v1.4.3 // indirect
|
||||||
github.com/go-logr/stdr v1.2.2 // indirect
|
github.com/go-logr/stdr v1.2.2 // indirect
|
||||||
|
github.com/go-playground/locales v0.13.0 // indirect
|
||||||
|
github.com/go-playground/universal-translator v0.17.0 // indirect
|
||||||
|
github.com/go-playground/validator/v10 v10.4.2 // indirect
|
||||||
github.com/go-sql-driver/mysql v1.8.1 // indirect
|
github.com/go-sql-driver/mysql v1.8.1 // indirect
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
|
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
|
||||||
github.com/golang/protobuf v1.3.5 // indirect
|
github.com/golang/protobuf v1.3.5 // indirect
|
||||||
|
|
|
||||||
10
go.sum
10
go.sum
|
|
@ -38,6 +38,7 @@ github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8c
|
||||||
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
|
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
|
||||||
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
|
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
|
||||||
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
|
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
|
||||||
|
github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
|
||||||
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
|
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
|
||||||
github.com/go-playground/validator/v10 v10.4.2 h1:RqFe5MzGf2UOFhxQYnjHabHOT6CLbYWkeXOfcXB7fsM=
|
github.com/go-playground/validator/v10 v10.4.2 h1:RqFe5MzGf2UOFhxQYnjHabHOT6CLbYWkeXOfcXB7fsM=
|
||||||
github.com/go-playground/validator/v10 v10.4.2/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
|
github.com/go-playground/validator/v10 v10.4.2/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
|
||||||
|
|
@ -49,6 +50,7 @@ github.com/gogf/gf/v2 v2.10.0 h1:rzDROlyqGMe/eM6dCalSR8dZOuMIdLhmxKSH1DGhbFs=
|
||||||
github.com/gogf/gf/v2 v2.10.0/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
|
github.com/gogf/gf/v2 v2.10.0/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
|
github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY=
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
||||||
|
github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
|
||||||
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
||||||
github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
|
github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
|
||||||
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
|
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
|
||||||
|
|
@ -67,6 +69,7 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
|
||||||
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
||||||
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
|
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
|
||||||
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
||||||
|
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
|
||||||
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
||||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||||
|
|
@ -74,6 +77,7 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
|
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
|
||||||
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
|
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
|
||||||
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
|
||||||
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
|
||||||
|
|
@ -87,9 +91,11 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
|
||||||
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
||||||
|
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
|
||||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||||
|
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
|
||||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
||||||
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
|
||||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||||
|
|
@ -135,7 +141,9 @@ github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD
|
||||||
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
|
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
|
||||||
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
|
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
|
||||||
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
|
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
|
||||||
|
github.com/ugorji/go v1.1.14 h1:SH9w5U0JOT5KXtM/PL4o3ylZ1radkai43UiC6GYCetI=
|
||||||
github.com/ugorji/go v1.1.14/go.mod h1:8lpbXS0IfYpSwsLmwWThGZ7Qm2dNUIb0/kcsxHbwNpM=
|
github.com/ugorji/go v1.1.14/go.mod h1:8lpbXS0IfYpSwsLmwWThGZ7Qm2dNUIb0/kcsxHbwNpM=
|
||||||
|
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
|
||||||
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
|
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
|
||||||
github.com/ugorji/go/codec v1.1.14 h1:3kmVO19VOoEBcborYacgFopagfu1s1+73nR7uRuN0lM=
|
github.com/ugorji/go/codec v1.1.14 h1:3kmVO19VOoEBcborYacgFopagfu1s1+73nR7uRuN0lM=
|
||||||
github.com/ugorji/go/codec v1.1.14/go.mod h1:CburFl4ZXbHpzvp1gzm2I8tpnFk9XPHOJwIheJViqKk=
|
github.com/ugorji/go/codec v1.1.14/go.mod h1:CburFl4ZXbHpzvp1gzm2I8tpnFk9XPHOJwIheJViqKk=
|
||||||
|
|
@ -191,6 +199,8 @@ gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg=
|
||||||
gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo=
|
gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo=
|
||||||
gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
|
gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
|
||||||
gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
|
gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
|
||||||
|
modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
|
||||||
|
modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
|
||||||
modernc.org/libc v1.22.6 h1:cbXU8R+A6aOjRuhsFh3nbDWXO/Hs4ClJRXYB11KmPDo=
|
modernc.org/libc v1.22.6 h1:cbXU8R+A6aOjRuhsFh3nbDWXO/Hs4ClJRXYB11KmPDo=
|
||||||
modernc.org/libc v1.22.6/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
|
modernc.org/libc v1.22.6/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
|
||||||
modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
|
modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
|
||||||
|
|
|
||||||
|
|
@ -12,17 +12,8 @@ func ErrorHandler() gin.HandlerFunc {
|
||||||
return func(c *gin.Context) {
|
return func(c *gin.Context) {
|
||||||
defer func() {
|
defer func() {
|
||||||
if err := recover(); err != nil {
|
if err := recover(); err != nil {
|
||||||
res := response.Error(c).SetCode(http.StatusInternalServerError)
|
log.Error("发生panic", "path", c.Request.URL.Path, "method", c.Request.Method, err)
|
||||||
switch e := err.(type) {
|
response.Error(c).SetCode(http.StatusInternalServerError).SetMsg("服务器内部错误").End()
|
||||||
case string:
|
|
||||||
res = res.SetMsg(e)
|
|
||||||
case error:
|
|
||||||
res = res.SetMsg(e.Error())
|
|
||||||
default:
|
|
||||||
res = res.SetMsg("服务器内部异常，请稍后重试")
|
|
||||||
}
|
|
||||||
res.End()
|
|
||||||
log.Error("发生panic=》", "path：", c.Request.URL.Path, ",method:", c.Request.Method, ",", err)
|
|
||||||
c.Abort()
|
c.Abort()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
package valid
|
|
||||||
|
|
||||||
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"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ValidToStruct 验证参数并返回结构体
|
|
||||||
func ValidToStruct[T any](c *gin.Context) (object *T) {
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
// ValidToMap 验证参数并返回结构体
|
|
||||||
func ValidToMap[T any](c *gin.Context) (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 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)
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue