feat: v1.7.1新增支持sqlite&oracle分页限制等问题修复

server/go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/pquerna/otp v1.4.0
 	github.com/redis/go-redis/v9 v9.4.0
 	github.com/robfig/cron/v3 v3.0.1 // 定时任务
-	github.com/sijms/go-ora/v2 v2.8.5
+	github.com/sijms/go-ora/v2 v2.8.6
 	github.com/stretchr/testify v1.8.4
 	go.mongodb.org/mongo-driver v1.13.1 // mongo
 	golang.org/x/crypto v0.18.0 // ssh
@@ -35,6 +35,7 @@ require (
 	// gorm
 	gorm.io/driver/mysql v1.5.2
 	gorm.io/gorm v1.25.5
+
 )
 
 require (

server/internal/db/dbm/oracle/meta.go

@@ -3,10 +3,11 @@ package oracle
 import (
 	"database/sql"
 	"fmt"
-	go_ora "github.com/sijms/go-ora/v2"
 	"mayfly-go/internal/db/dbm/dbi"
 	"strings"
 	"sync"
+
+	go_ora "github.com/sijms/go-ora/v2"
 )
 
 var (
@@ -58,10 +59,6 @@ func (md *OraMeta) GetSqlDb(d *dbi.DbInfo) (*sql.DB, error) {
 			}
 		}
 	}
-	// 默认设置为UTF8
-	//if urlOptions["client charset"] == "" {
-	//	urlOptions["client charset"] = "UTF8"
-	//}
 	urlOptions["TIMEOUT"] = "10"
 	connStr := go_ora.BuildUrl(d.Host, d.Port, d.Sid, d.Username, d.Password, urlOptions)
 	conn, err := sql.Open(driverName, connStr)

server/internal/db/dbm/sqlite/meta.go

@@ -3,7 +3,6 @@ package sqlite
 import (
 	"database/sql"
 	"errors"
-	_ "github.com/mattn/go-sqlite3"
 	"mayfly-go/internal/db/dbm/dbi"
 	"os"
 	"sync"
@@ -30,7 +29,7 @@ func (md *SqliteMeta) GetSqlDb(d *dbi.DbInfo) (*sql.DB, error) {
 	if _, err := os.Stat(d.Host); err != nil {
 		return nil, errors.New("数据库文件不存在")
 	}
-	return sql.Open("sqlite3", d.Host)
+	return sql.Open("sqlite", d.Host)
 }
 
 func (md *SqliteMeta) GetDialect(conn *dbi.DbConn) dbi.Dialect {

server/internal/sys/api/account.go

@@ -154,7 +154,11 @@ func (a *Account) ChangeStatus(rc *req.Ctx) {
 
 	account := &entity.Account{}
 	account.Id = uint64(ginx.PathParamInt(g, "id"))
-	account.Status = int8(ginx.PathParamInt(g, "status"))
+
+	status := entity.AccountStatus(int8(ginx.PathParamInt(g, "status")))
+	biz.ErrIsNil(entity.AccountStatusEnum.Valid(status))
+	account.Status = status
+
 	rc.ReqParam = collx.Kvs("accountId", account.Id, "status", account.Status)
 	biz.ErrIsNil(a.AccountApp.Update(rc.MetaCtx, account))
 }

server/internal/sys/api/vo/account.go

@@ -1,31 +1,32 @@
 package vo
 
 import (
+	"mayfly-go/internal/sys/domain/entity"
 	"mayfly-go/pkg/model"
 	"time"
 )
 
 type AccountManageVO struct {
 	model.Model
-	Name          string     `json:"name"`
-	Username      string     `json:"username"`
-	Status        int        `json:"status"`
-	LastLoginTime *time.Time `json:"lastLoginTime"`
-	OtpSecret     string     `json:"otpSecret"`
+	Name          string               `json:"name"`
+	Username      string               `json:"username"`
+	Status        entity.AccountStatus `json:"status"`
+	LastLoginTime *time.Time           `json:"lastLoginTime"`
+	OtpSecret     string               `json:"otpSecret"`
 }
 
 // 账号角色信息
 type AccountRoleVO struct {
-	RoleId        uint64     `json:"roleId"`
-	RoleName      string     `json:"roleName"`
-	Code          string     `json:"code"`
-	Status        int        `json:"status"`
-	AccountId     uint64     `json:"accountId" gorm:"column:accountId"`
-	AccountName   string     `json:"accountName" gorm:"column:accountName"`
-	Username      string     `json:"username"`
-	AccountStatus int        `json:"accountStatus" gorm:"column:accountStatus"`
-	CreateTime    *time.Time `json:"createTime"`
-	Creator       string     `json:"creator"`
+	RoleId        uint64               `json:"roleId"`
+	RoleName      string               `json:"roleName"`
+	Code          string               `json:"code"`
+	Status        int                  `json:"status"`
+	AccountId     uint64               `json:"accountId" gorm:"column:accountId"`
+	AccountName   string               `json:"accountName" gorm:"column:accountName"`
+	Username      string               `json:"username"`
+	AccountStatus entity.AccountStatus `json:"accountStatus" gorm:"column:accountStatus"`
+	CreateTime    *time.Time           `json:"createTime"`
+	Creator       string               `json:"creator"`
 }
 
 // 账号个人信息

server/internal/sys/application/account.go

@@ -43,7 +43,7 @@ func (a *accountAppImpl) Create(ctx context.Context, account *entity.Account) er
 	}
 	// 默认密码为账号用户名
 	account.Password = cryptox.PwdHash(account.Username)
-	account.Status = entity.AccountEnableStatus
+	account.Status = entity.AccountEnable
 	return a.Insert(ctx, account)
 }
 

server/internal/sys/domain/entity/account.go

@@ -3,6 +3,7 @@ package entity
 import (
 	"errors"
 	"mayfly-go/internal/common/utils"
+	"mayfly-go/pkg/enumx"
 	"mayfly-go/pkg/model"
 	"time"
 )
@@ -10,13 +11,13 @@ import (
 type Account struct {
 	model.Model
 
-	Name          string     `json:"name"`
-	Username      string     `json:"username"`
-	Password      string     `json:"-"`
-	Status        int8       `json:"status"`
-	LastLoginTime *time.Time `json:"lastLoginTime"`
-	LastLoginIp   string     `json:"lastLoginIp"`
-	OtpSecret     string     `json:"-"`
+	Name          string        `json:"name"`
+	Username      string        `json:"username"`
+	Password      string        `json:"-"`
+	Status        AccountStatus `json:"status"`
+	LastLoginTime *time.Time    `json:"lastLoginTime"`
+	LastLoginIp   string        `json:"lastLoginIp"`
+	OtpSecret     string        `json:"-"`
 }
 
 func (a *Account) TableName() string {
@@ -25,7 +26,7 @@ func (a *Account) TableName() string {
 
 // 是否可用
 func (a *Account) IsEnable() bool {
-	return a.Status == AccountEnableStatus
+	return a.Status == AccountEnable
 }
 
 func (a *Account) OtpSecretEncrypt() error {
@@ -49,7 +50,13 @@ func (a *Account) OtpSecretDecrypt() error {
 	return nil
 }
 
+type AccountStatus int8
+
 const (
-	AccountEnableStatus  int8 = 1  // 启用状态
-	AccountDisableStatus int8 = -1 // 禁用状态
+	AccountEnable  AccountStatus = 1  // 启用状态
+	AccountDisable AccountStatus = -1 // 禁用状态
 )
+
+var AccountStatusEnum = enumx.NewEnum[AccountStatus]("账号状态").
+	Add(AccountEnable, "启用").
+	Add(AccountDisable, "禁用")

server/pkg/enumx/enumx.go

@@ -0,0 +1,50 @@
+package enumx
+
+import (
+	"fmt"
+	"mayfly-go/pkg/errorx"
+)
+
+type Enum[T comparable] struct {
+	name string // 枚举值名称
+
+	values map[T]string // 所有枚举值。枚举值 -> desc(描述)
+}
+
+// 新建枚举
+func NewEnum[T comparable](name string) *Enum[T] {
+	return &Enum[T]{
+		name:   name,
+		values: make(map[T]string),
+	}
+}
+
+// 添加枚举值
+func (e *Enum[T]) Add(value T, desc string) *Enum[T] {
+	e.values[value] = desc
+	return e
+}
+
+// 校验枚举值是否合法
+func (e *Enum[T]) Valid(value T) error {
+	_, ok := e.values[value]
+	if ok {
+		return nil
+	}
+
+	errMsg := fmt.Sprintf("%s可选值为: ", e.name)
+	for val, desc := range e.values {
+		errMsg = fmt.Sprintf("%s [%v->%s]", errMsg, val, desc)
+	}
+	return errorx.NewBiz(errMsg)
+}
+
+// 根据枚举值获取描述
+func (e *Enum[T]) GetDesc(value T) string {
+	desc, ok := e.values[value]
+	if ok {
+		return desc
+	}
+
+	return ""
+}