TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2026-03-14 05:55:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 新增系统样式配置，支持改logo图标与标题

Browse Source
This commit is contained in:
meilin.huang
2024-01-05 12:09:12 +08:00
parent ae3d2659aa
commit 7a7a7020b4
18 changed files with 385 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/internal/db/dbm/conn.go
View File

@@ -28,17 +28,17 @@ type QueryColumn struct {
// 执行查询语句
// 依次返回 列信息数组(顺序)，结果map，错误
func (d *DbConn) Query(querySql string) ([]*QueryColumn, []map[string]any, error) {
return d.QueryContext(context.Background(), querySql)
func (d *DbConn) Query(querySql string, args ...any) ([]*QueryColumn, []map[string]any, error) {
return d.QueryContext(context.Background(), querySql, args...)
}
// 执行查询语句
// 依次返回 列信息数组(顺序)，结果map，错误
func (d *DbConn) QueryContext(ctx context.Context, querySql string) ([]*QueryColumn, []map[string]any, error) {
func (d *DbConn) QueryContext(ctx context.Context, querySql string, args ...any) ([]*QueryColumn, []map[string]any, error) {
result := make([]map[string]any, 0, 16)
columns, err := walkTableRecord(ctx, d.db, querySql, func(record map[string]any, columns []*QueryColumn) {
result = append(result, record)
})
}, args...)
if err != nil {
return nil, nil, wrapSqlError(err)
}
@@ -111,8 +111,8 @@ func (d *DbConn) Close() {
}
}
func walkTableRecord(ctx context.Context, db *sql.DB, selectSql string, walk func(record map[string]any, columns []*QueryColumn)) ([]*QueryColumn, error) {
rows, err := db.QueryContext(ctx, selectSql)
func walkTableRecord(ctx context.Context, db *sql.DB, selectSql string, walk func(record map[string]any, columns []*QueryColumn), args ...any) ([]*QueryColumn, error) {
rows, err := db.QueryContext(ctx, selectSql, args...)
if err != nil {
return nil, err

1
server/internal/db/dbm/dbbin.go
View File

@@ -1 +0,0 @@
package dbm

2
server/internal/db/dbm/dialect_mysql.go
View File

@@ -142,7 +142,7 @@ func (md *MysqlDialect) GetPrimaryKey(tablename string) (string, error) {
// 获取表索引信息
func (md *MysqlDialect) GetTableIndex(tableName string) ([]Index, error) {
_, res, err := md.dc.Query(fmt.Sprintf(GetLocalSql(MYSQL_META_FILE, MYSQL_INDEX_INFO_KEY), tableName))
_, res, err := md.dc.Query(GetLocalSql(MYSQL_META_FILE, MYSQL_INDEX_INFO_KEY), tableName)
if err != nil {
return nil, err
}

2
server/internal/db/dbm/metasql/mysql_meta.sql
View File

@@ -38,7 +38,7 @@ WHERE
SELECT
database ()
)
AND table_name = '%s'
AND table_name = ?
ORDER BY
index_name asc,
SEQ_IN_INDEX asc