Merge remote-tracking branch 'origin/main' into multi-tenant

lib/dborm/dbgorm.go

@@ -0,0 +1,167 @@
+package dborm
+
+import (
+	"database/sql"
+	"fmt"
+	"log"
+	"os"
+	"regexp"
+	"time"
+
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+)
+
+// 数据库连接实例
+var dbgEngine *gorm.DB
+
+// 载入连接日志配置
+func loadLogger() logger.Interface {
+	newLogger := logger.New(
+		log.New(os.Stdout, "[GORM] ", log.LstdFlags), // 将日志输出到控制台
+		logger.Config{
+			SlowThreshold:        time.Second, // Slow SQL 阈值
+			LogLevel:             logger.Info, // 日志级别 Silent不输出任何日志
+			ParameterizedQueries: false,       // 参数化查询SQL 用实际值带入?的执行语句
+			Colorful:             false,       // 彩色日志输出
+		},
+	)
+	return newLogger
+}
+
+// 连接数据库实例
+func InitGormConnect(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam, dbLogging any) error {
+	var dialector gorm.Dialector
+	switch dbType {
+	case "mysql":
+		dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?%s",
+			dbUser,
+			dbPassword,
+			dbHost,
+			dbPort,
+			dbName,
+			dbParam,
+		)
+		dialector = mysql.Open(dsn)
+	default:
+		err := fmt.Errorf("invalid type: %s", dbType)
+		return err
+	}
+	opts := &gorm.Config{}
+	// 是否需要日志输出
+	if dbLogging.(bool) {
+		opts.Logger = loadLogger()
+	}
+	// 创建连接
+	db, err := gorm.Open(dialector, opts)
+	if err != nil {
+		log.Fatalf("failed to open: %s", err)
+		return err
+	}
+	// 获取底层 SQL 数据库连接
+	sqlDB, err := db.DB()
+	if err != nil {
+		log.Fatalf("failed to connect DB pool: %v", err)
+		return err
+	}
+	// 测试数据库连接
+	err = sqlDB.Ping()
+	if err != nil {
+		log.Fatalf("failed to ping database: %v", err)
+		return err
+	}
+	dbgEngine = db
+	return nil
+}
+
+// 关闭数据库实例
+func Close() {
+	sqlDB, err := dbgEngine.DB()
+	if err != nil {
+		log.Fatalf("failed to connect pool: %s", err)
+	}
+	if err := sqlDB.Close(); err != nil {
+		log.Fatalf("failed to close: %s", err)
+	}
+}
+
+// default gorm DB
+func DefaultDB() *gorm.DB {
+	return dbgEngine
+}
+
+// get sql DB
+func GCoreDB() (*sql.DB, error) {
+	return dbgEngine.DB()
+}
+
+// RawSQL 原生查询语句
+func RawSQL(sql string, parameters []any) ([]map[string]any, error) {
+	// 数据源
+	db := DefaultDB()
+
+	// 使用正则表达式替换连续的空白字符为单个空格
+	fmtSql := regexp.MustCompile(`\s+`).ReplaceAllString(sql, " ")
+
+	// logger.Infof("sql=> %v", fmtSql)
+	// logger.Infof("parameters=> %v", parameters)
+
+	// 查询结果
+	var rows []map[string]any
+	res := db.Raw(fmtSql, parameters...).Scan(&rows)
+	if res.Error != nil {
+		return nil, res.Error
+	}
+	return rows, nil
+}
+
+// ExecSQL 原生执行语句
+func ExecSQL(sql string, parameters []any) (int64, error) {
+	// 数据源
+	db := DefaultDB()
+
+	// 使用正则表达式替换连续的空白字符为单个空格
+	fmtSql := regexp.MustCompile(`\s+`).ReplaceAllString(sql, " ")
+	// 执行结果
+	res := db.Exec(fmtSql, parameters...)
+	if res.Error != nil {
+		return 0, res.Error
+	}
+	return res.RowsAffected, nil
+}
+
+func CloneTable(srcTable, dstTable string) error {
+	// 获取表 A 的结构信息
+	var columns []gorm.ColumnType
+	dbMigrator := dbgEngine.Migrator()
+	columns, err := dbMigrator.ColumnTypes(srcTable)
+	if err != nil {
+		return fmt.Errorf("failed to ColumnTypes, %v", err)
+	}
+
+	// 创建表 destination table
+	err = dbMigrator.CreateTable(dstTable)
+	if err != nil {
+		return fmt.Errorf("failed to CreateTable, %v", err)
+	}
+	// 复制表 src 的字段到表 dst
+	for _, column := range columns {
+		err = dbMigrator.AddColumn(dstTable, column.Name())
+		if err != nil {
+			return fmt.Errorf("failed to AddColumn, %v", err)
+		}
+	}
+
+	// 复制表 src 的主键和索引到表 dst
+	err = dbMigrator.CreateConstraint(dstTable, "PRIMARY")
+	if err != nil {
+		return fmt.Errorf("failed to AddColumn, %v", err)
+	}
+
+	err = dbMigrator.CreateConstraint(dstTable, "INDEX")
+	if err != nil {
+		return fmt.Errorf("failed to AddColumn, %v", err)
+	}
+	return nil
+}

lib/dborm/dborm.go

@@ -16,6 +16,7 @@ import (
 
 	_ "github.com/go-sql-driver/mysql"
 	"xorm.io/xorm"
+	"xorm.io/xorm/core"
 )
 
 const (
@@ -124,6 +125,14 @@ func XormConnectDatabase(dbType, dbUser, dbPassword, dbHost, dbPort, dbName stri
 	return xEngine, nil
 }
 
+func XCoreDB() *core.DB {
+	return xEngine.DB()
+}
+
+func XEngDB() *xorm.Engine {
+	return xEngine
+}
+
 func ConstructInsertSQL(tableName string, insertData interface{}) (string, []string) {
 	log.Debug("ConstructInsertSQL processing... ")
 	log.Debug("Request insertData:", insertData)

lib/file/file_linux.go

@@ -3,6 +3,86 @@
 
 package file
 
+import (
+	"fmt"
+	"os"
+	"os/user"
+	"path/filepath"
+	"strings"
+	"syscall"
+
+	"github.com/dustin/go-humanize"
+)
+
+type FileInfo struct {
+	FileType     string `json:"fileType"`     // 文件类型
+	FileMode     string `json:"fileMode"`     // 文件的权限
+	LinkCount    int64  `json:"linkCount"`    // 硬链接数目
+	Owner        string `json:"owner"`        // 所属用户
+	Group        string `json:"group"`        // 所属组
+	Size         string `json:"size"`         // 文件的大小
+	ModifiedTime int64  `json:"modifiedTime"` // 最后修改时间，单位为秒
+	FileName     string `json:"fileName"`     // 文件的名称
+}
+
+func GetFileInfo(dir, suffix string) ([]FileInfo, error) {
+	var files []FileInfo
+
+	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if path == dir {
+			return nil // 跳过当前目录
+		}
+
+		fileType := "file"
+		if info.IsDir() {
+			fileType = "directory"
+		} else if info.Mode()&os.ModeSymlink != 0 {
+			fileType = "symlink"
+		}
+
+		// check if match suffix
+		if (suffix != "" && filepath.Ext(path) == suffix) || suffix == "" {
+			stat, ok := info.Sys().(*syscall.Stat_t)
+			if !ok {
+				return fmt.Errorf("not a syscall.Stat_t")
+			}
+			userInfo, err := user.LookupId(fmt.Sprint(stat.Uid))
+			if err != nil {
+				return err
+			}
+			groupInfo, err := user.LookupGroupId(fmt.Sprint(stat.Gid))
+			if err != nil {
+				return err
+			}
+			humanReadableSize := humanize.Bytes(uint64(info.Size()))
+			fileInfo := FileInfo{
+				FileType:     fileType,
+				FileMode:     info.Mode().String(),
+				LinkCount:    int64(info.Sys().(*syscall.Stat_t).Nlink),
+				Owner:        userInfo.Username,
+				Group:        groupInfo.Name,
+				Size:         strings.ToUpper(humanReadableSize),
+				ModifiedTime: info.ModTime().Unix(),
+				FileName:     info.Name(),
+			}
+			files = append(files, fileInfo)
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return files, nil
+}
+//go:build linux
+// +build linux
+
+package file
+
 import (
 	"fmt"
 	"os"

lib/file/file_windows.go

@@ -44,8 +44,8 @@ func GetFileInfo(dir, suffix string) ([]FileInfo, error) {
 				FileType:     fileType,
 				FileMode:     info.Mode().String(),
 				LinkCount:    0,
-				Owner:        "N/A",
-				Group:        "N/A",
+				Owner:        "-",
+				Group:        "-",
 				Size:         info.Size(),
 				ModifiedTime: info.ModTime().Unix(),
 				FileName:     info.Name(),

lib/mmlp/parse.go

@@ -46,6 +46,7 @@ type MmlVar struct {
 	Authorization string `josn:"authorization"`
 	HttpUri       string `json:"httpUri"`
 	UserAgent     string `json:"userAgent"`
+	TagNE         string `json:"tagNE"`
 }
 
 // func init() {

lib/services/response.go

@@ -6,7 +6,7 @@ const (
 )
 
 func ErrResp(msg string) map[string]any {
-	return map[string]any{"code": CODE_FAIL, "message": msg}
+	return map[string]any{"code": CODE_FAIL, "msg": msg}
 }
 
 func DataResp(data any) map[string]any {
@@ -14,7 +14,7 @@ func DataResp(data any) map[string]any {
 }
 
 func SuccMessageResp() map[string]any {
-	return map[string]any{"code": CODE_SUCC, "message": "success"}
+	return map[string]any{"code": CODE_SUCC, "msg": "success"}
 }
 
 func TotalResp(total int64) map[string]any {