u
This commit is contained in:
oneao committed
1 parent
f373cf956d
commit
91ec5e268c
12 files changed
+114
-64
No files matched your search
@@ -7,5 +7,5 @@ import (
|
||||
|
||||
func InitTest(r *router.Router) {
|
||||
group := r.Group("/test")
|
||||
group.GET("/", handle.Test)
|
||||
group.GET("/", handle.TestDB)
|
||||
}
|
||||
@@ -1,14 +1,8 @@
|
||||
package handle
|
||||
|
||||
import (
|
||||
"base-framework/pkg/reponse"
|
||||
"base-framework/pkg/router"
|
||||
"base-framework/pkg/utils/db"
|
||||
)
|
||||
|
||||
func Test(c *router.Context) {
|
||||
dbClient := db.NewClient(c)
|
||||
if dbClient == nil {
|
||||
return
|
||||
}
|
||||
func TestDB(c *router.Context) {
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
{"level":"ERROR","ts":"2025-08-17 14:28:53.061","caller":"middleware/error.go:56","msg":"系统异常","trackID":"347627828096794624","method":"GET","path":"/test","location":"base-farmework/internal/app/handle/test.go:27","stack":"goroutine 34 [running]:\nruntime/debug.Stack()\n\tD:/devtool/golang/go1.24.6/src/runtime/debug/stack.go:26 +0x5e\nbase-framework/pkg/error.WrapWithStack({0x81be80, 0xc0000c46c0})\n\tD:/workspace/code/go-project/base-farmework/pkg/error/error.go:40 +0x6d\nbase-framework/pkg/router.(*Context).AddError(0xc0000e6120, {0x81be80, 0xc0000c46c0})\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:145 +0x10d\nbase-framework/internal/app/handle.TestDB(0xc0000e6120)\n\tD:/workspace/code/go-project/base-farmework/internal/app/handle/test.go:27 +0x39b\nbase-framework/pkg/router.(*Context).Next(0xc0000e6120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/internal/app.InitAppRouter.Logger.func3(0xc0000e6120)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/logger.go:14 +0x47\nbase-framework/pkg/router.(*Context).Next(0xc0000e6120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/internal/app.InitAppRouter.Auth.func2(0xc0000e6120)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/auth.go:78 +0x377\nbase-framework/pkg/router.(*Context).Next(0xc0000e6120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/pkg/middleware.Error.func1(0xc0000e6120)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/error.go:30 +0x2a\nbase-framework/pkg/router.(*Context).Next(0xc0000e6120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/internal/app.InitAppRouter.Routinex.func1(0x7559a0?)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/routinex.go:11 +0x30\nbase-framework/pkg/router.(*Context).Next(0xc0000e6120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/pkg/router.(*Router).ServeHTTP(0xc0000b22a0, {0x81eae0, 0xc0000fe000}, 0xc0000ec000)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/router.go:218 +0x399\nnet/http.serverHandler.ServeHTTP({0xc0000b2600?}, {0x81eae0?, 0xc0000fe000?}, 0x1?)\n\tD:/devtool/golang/go1.24.6/src/net/http/server.go:3301 +0x8e\nnet/http.(*conn).serve(0xc00021c120, {0x81f230, 0xc0000b25a0})\n\tD:/devtool/golang/go1.24.6/src/net/http/server.go:2102 +0x625\ncreated by net/http.(*Server).Serve in goroutine 1\n\tD:/devtool/golang/go1.24.6/src/net/http/server.go:3454 +0x485\n","trackId":"347627828096794624"}
|
||||
{"level":"ERROR","ts":"2025-08-17 14:30:26.979","caller":"middleware/error.go:56","msg":"系统异常","trackID":"347628221707059200","method":"GET","path":"/test","location":"base-farmework/internal/app/handle/test.go:27","stack":"goroutine 5 [running]:\nruntime/debug.Stack()\n\tD:/devtool/golang/go1.24.6/src/runtime/debug/stack.go:26 +0x5e\nbase-framework/pkg/error.WrapWithStack({0x67be20, 0xc0001079e0})\n\tD:/workspace/code/go-project/base-farmework/pkg/error/error.go:40 +0x6d\nbase-framework/pkg/router.(*Context).AddError(0xc00007e2d0, {0x67be20, 0xc0001079e0})\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:145 +0x10d\nbase-framework/internal/app/handle.TestDB(0xc00007e2d0)\n\tD:/workspace/code/go-project/base-farmework/internal/app/handle/test.go:27 +0x3b2\nbase-framework/pkg/router.(*Context).Next(0xc00007e2d0)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/internal/app.InitAppRouter.Logger.func3(0xc00007e2d0)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/logger.go:14 +0x47\nbase-framework/pkg/router.(*Context).Next(0xc00007e2d0)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/internal/app.InitAppRouter.Auth.func2(0xc00007e2d0)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/auth.go:78 +0x377\nbase-framework/pkg/router.(*Context).Next(0xc00007e2d0)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/pkg/middleware.Error.func1(0xc00007e2d0)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/error.go:30 +0x2a\nbase-framework/pkg/router.(*Context).Next(0xc00007e2d0)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/internal/app.InitAppRouter.Routinex.func1(0x5b59a0?)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/routinex.go:11 +0x30\nbase-framework/pkg/router.(*Context).Next(0xc00007e2d0)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/pkg/router.(*Router).ServeHTTP(0xc000138b10, {0x67ea80, 0xc0000000e0}, 0xc00021c000)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/router.go:218 +0x399\nnet/http.serverHandler.ServeHTTP({0xc00002a150?}, {0x67ea80?, 0xc0000000e0?}, 0x1?)\n\tD:/devtool/golang/go1.24.6/src/net/http/server.go:3301 +0x8e\nnet/http.(*conn).serve(0xc00007e120, {0x67f1d0, 0xc000138e10})\n\tD:/devtool/golang/go1.24.6/src/net/http/server.go:2102 +0x625\ncreated by net/http.(*Server).Serve in goroutine 1\n\tD:/devtool/golang/go1.24.6/src/net/http/server.go:3454 +0x485\n","trackId":"347628221707059200"}
|
||||
{"level":"ERROR","ts":"2025-08-17 14:30:57.993","caller":"middleware/error.go:56","msg":"系统异常","trackID":"347628352011501568","method":"GET","path":"/test","location":"base-farmework/internal/app/handle/test.go:27","stack":"goroutine 18 [running]:\nruntime/debug.Stack()\n\tD:/devtool/golang/go1.24.6/src/runtime/debug/stack.go:26 +0x5e\nbase-framework/pkg/error.WrapWithStack({0xb3be60, 0xc0002cc5a0})\n\tD:/workspace/code/go-project/base-farmework/pkg/error/error.go:40 +0x6d\nbase-framework/pkg/router.(*Context).AddError(0xc0002bc120, {0xb3be60, 0xc0002cc5a0})\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:145 +0x10d\nbase-framework/internal/app/handle.TestDB(0xc0002bc120)\n\tD:/workspace/code/go-project/base-farmework/internal/app/handle/test.go:27 +0x3b2\nbase-framework/pkg/router.(*Context).Next(0xc0002bc120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/internal/app.InitAppRouter.Logger.func3(0xc0002bc120)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/logger.go:14 +0x47\nbase-framework/pkg/router.(*Context).Next(0xc0002bc120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/internal/app.InitAppRouter.Auth.func2(0xc0002bc120)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/auth.go:78 +0x377\nbase-framework/pkg/router.(*Context).Next(0xc0002bc120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/pkg/middleware.Error.func1(0xc0002bc120)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/error.go:30 +0x2a\nbase-framework/pkg/router.(*Context).Next(0xc0002bc120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/internal/app.InitAppRouter.Routinex.func1(0xa759a0?)\n\tD:/workspace/code/go-project/base-farmework/pkg/middleware/routinex.go:11 +0x30\nbase-framework/pkg/router.(*Context).Next(0xc0002bc120)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/context.go:61 +0x26\nbase-framework/pkg/router.(*Router).ServeHTTP(0xc0002a0150, {0xb3eac0, 0xc0002d4000}, 0xc0002c2000)\n\tD:/workspace/code/go-project/base-farmework/pkg/router/router.go:218 +0x399\nnet/http.serverHandler.ServeHTTP({0xc0002a04b0?}, {0xb3eac0?, 0xc0002d4000?}, 0x1?)\n\tD:/devtool/golang/go1.24.6/src/net/http/server.go:3301 +0x8e\nnet/http.(*conn).serve(0xc00021c120, {0xb3f210, 0xc0002a0450})\n\tD:/devtool/golang/go1.24.6/src/net/http/server.go:2102 +0x625\ncreated by net/http.(*Server).Serve in goroutine 1\n\tD:/devtool/golang/go1.24.6/src/net/http/server.go:3454 +0x485\n","trackId":"347628352011501568"}
|
||||
Whitespace-only changes.
Whitespace-only changes.
File renamed without changes.
@@ -1,7 +1,7 @@
|
||||
package router
|
||||
|
||||
import (
|
||||
error2 "base-framework/pkg/utils/error"
|
||||
error2 "base-framework/pkg/error"
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"io"
|
||||
|
||||
@@ -2,37 +2,67 @@ package db
|
||||
|
||||
import (
|
||||
"base-framework/pkg/config"
|
||||
"base-framework/pkg/reponse"
|
||||
"base-framework/pkg/router"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
// Client 封装数据库连接对象
|
||||
type Client struct {
|
||||
Conn *sql.DB
|
||||
conn *sql.DB
|
||||
tx *sql.Tx
|
||||
}
|
||||
|
||||
// NewClient 根据 context 获取 orgId 并返回 Client 对象
|
||||
func NewClient(c *router.Context) *Client {
|
||||
// JdbcTemplate 创建 JdbcTemplate
|
||||
func JdbcTemplate(c *router.Context) (*Client, error) {
|
||||
val, ok := c.Get("orgId")
|
||||
fmt.Println(val)
|
||||
if !ok {
|
||||
reponse.Error(c).Code(reponse.CodeInvalidOrgCode).Send()
|
||||
return nil
|
||||
return nil, errors.New("missing orgId in context")
|
||||
}
|
||||
|
||||
orgId, ok := val.(string)
|
||||
if !ok || orgId == "" {
|
||||
reponse.Error(c).Code(reponse.CodeInvalidOrgCode).Send()
|
||||
return nil
|
||||
return nil, errors.New("invalid orgId in context")
|
||||
}
|
||||
|
||||
conn, ok := config.GetDB(orgId)
|
||||
if !ok || conn == nil {
|
||||
reponse.Error(c).Code(reponse.CodeInvalidOrgCode).Send()
|
||||
return nil
|
||||
return nil, fmt.Errorf("no db connection found for orgId=%s", orgId)
|
||||
}
|
||||
return &Client{conn: conn}, nil
|
||||
}
|
||||
|
||||
// ------------------------ 内部方法 ------------------------
|
||||
|
||||
// 执行查询，返回 *sql.Rows
|
||||
func (c *Client) query(query string, args ...any) (*sql.Rows, error) {
|
||||
if c.tx != nil {
|
||||
return c.tx.Query(query, args...)
|
||||
}
|
||||
return c.conn.Query(query, args...)
|
||||
}
|
||||
|
||||
// 执行执行类语句（insert/update/delete）
|
||||
func (c *Client) exec(query string, args ...any) (sql.Result, error) {
|
||||
if c.tx != nil {
|
||||
return c.tx.Exec(query, args...)
|
||||
}
|
||||
return c.conn.Exec(query, args...)
|
||||
}
|
||||
|
||||
// WithTransaction 自动处理事务提交或回滚
|
||||
func (c *Client) WithTransaction(fn func(txClient *Client) error) error {
|
||||
if c.tx != nil {
|
||||
// 已经在事务中，直接执行
|
||||
return fn(c)
|
||||
}
|
||||
|
||||
return &Client{Conn: conn}
|
||||
tx, err := c.conn.Begin()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
txClient := &Client{conn: c.conn, tx: tx}
|
||||
if err := fn(txClient); err != nil {
|
||||
_ = tx.Rollback()
|
||||
return err
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
@@ -1 +1,5 @@
|
||||
package db
|
||||
|
||||
import "database/sql"
|
||||
|
||||
func (c *Client) Delete(query string, args ...any) (sql.Result, error) { return c.exec(query, args...) }
|
||||
@@ -1 +1,15 @@
|
||||
package db
|
||||
|
||||
import "database/sql"
|
||||
|
||||
func (c *Client) Insert(query string, args ...any) (sql.Result, error) { return c.exec(query, args...) }
|
||||
|
||||
// BatchInsert 批量插入，传入多组参数
|
||||
func (c *Client) BatchInsert(query string, params [][]any) error {
|
||||
for _, args := range params {
|
||||
if _, err := c.Insert(query, args...); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -1,62 +1,63 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
)
|
||||
import "database/sql"
|
||||
|
||||
func (c *Client) QueryRows(query string) ([]map[string]interface{}, error) {
|
||||
if c.Conn == nil {
|
||||
return nil, fmt.Errorf("database connection is nil")
|
||||
}
|
||||
|
||||
rows, err := c.Conn.Query(query)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("query error: %v", err)
|
||||
}
|
||||
defer func(rows *sql.Rows) {
|
||||
err := rows.Close()
|
||||
if err != nil {
|
||||
fmt.Println("关闭资源失败")
|
||||
}
|
||||
}(rows)
|
||||
|
||||
// 获取列名
|
||||
cols, err := rows.Columns()
|
||||
func (c *Client) Select(query string, args ...any) ([]map[string]any, error) {
|
||||
rows, err := c.query(query, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func(rows *sql.Rows) {
|
||||
_ = rows.Close()
|
||||
}(rows)
|
||||
|
||||
var result []map[string]interface{}
|
||||
cols, _ := rows.Columns()
|
||||
var result []map[string]any
|
||||
|
||||
for rows.Next() {
|
||||
// 创建扫描用的切片
|
||||
columnPointers := make([]interface{}, len(cols))
|
||||
columnValues := make([]interface{}, len(cols))
|
||||
for i := range columnPointers {
|
||||
columnPointers[i] = &columnValues[i]
|
||||
columns := make([]any, len(cols))
|
||||
columnPointers := make([]any, len(cols))
|
||||
for i := range columns {
|
||||
columnPointers[i] = &columns[i]
|
||||
}
|
||||
|
||||
if err := rows.Scan(columnPointers...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rowMap := make(map[string]interface{})
|
||||
rowMap := make(map[string]any)
|
||||
for i, colName := range cols {
|
||||
val := columnValues[i]
|
||||
if b, ok := val.([]byte); ok {
|
||||
rowMap[colName] = string(b)
|
||||
} else {
|
||||
rowMap[colName] = val
|
||||
}
|
||||
rowMap[colName] = columns[i]
|
||||
}
|
||||
|
||||
result = append(result, rowMap)
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
if err := rows.Err(); err != nil {
|
||||
func (c *Client) SelectOne(query string, args ...any) (map[string]any, error) {
|
||||
rows, err := c.query(query, args...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer func(rows *sql.Rows) {
|
||||
_ = rows.Close()
|
||||
}(rows)
|
||||
|
||||
if !rows.Next() {
|
||||
return nil, sql.ErrNoRows
|
||||
}
|
||||
|
||||
cols, _ := rows.Columns()
|
||||
columns := make([]any, len(cols))
|
||||
columnPointers := make([]any, len(cols))
|
||||
for i := range columns {
|
||||
columnPointers[i] = &columns[i]
|
||||
}
|
||||
if err := rows.Scan(columnPointers...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return result, nil
|
||||
rowMap := make(map[string]any)
|
||||
for i, colName := range cols {
|
||||
rowMap[colName] = columns[i]
|
||||
}
|
||||
return rowMap, nil
|
||||
}
|
||||
@@ -1 +1,5 @@
|
||||
package db
|
||||
|
||||
import "database/sql"
|
||||
|
||||
func (c *Client) Update(query string, args ...any) (sql.Result, error) { return c.exec(query, args...) }
|
||||
Reference in new issue
Block a user