From f4a64b96a9b2565081a1d1ebfac0bed55768273a Mon Sep 17 00:00:00 2001 From: "meilin.huang" <954537473@qq.com> Date: Fri, 19 Jan 2024 21:33:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20v1.7.1=E6=96=B0=E5=A2=9E=E6=94=AF?= =?UTF-8?q?=E6=8C=81sqlite&oracle=E5=88=86=E9=A1=B5=E9=99=90=E5=88=B6?= =?UTF-8?q?=E7=AD=89=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- mayfly_go_web/package.json | 4 +- mayfly_go_web/src/views/ops/db/SqlExec.vue | 7 +-- .../ops/db/component/table/DbTableData.vue | 2 +- .../src/views/system/account/AccountList.vue | 2 +- server/go.mod | 3 +- server/internal/db/dbm/oracle/meta.go | 7 +-- server/internal/db/dbm/sqlite/meta.go | 3 +- server/internal/sys/api/account.go | 6 ++- server/internal/sys/api/vo/account.go | 31 ++++++------ server/internal/sys/application/account.go | 2 +- server/internal/sys/domain/entity/account.go | 27 ++++++---- server/pkg/enumx/enumx.go | 50 +++++++++++++++++++ .../script/sql/{ => v1.5}/v1.5.3.sql | 0 .../script/sql/{ => v1.5}/v1.5.4.sql | 0 .../script/sql/{ => v1.6}/v1.6.0.sql | 0 .../script/sql/{ => v1.7}/v1.7.0.sql | 0 .../script/sql/{ => v1.7}/v1.7.1.sql | 0 18 files changed, 103 insertions(+), 43 deletions(-) create mode 100644 server/pkg/enumx/enumx.go rename server/resources/script/sql/{ => v1.5}/v1.5.3.sql (100%) rename server/resources/script/sql/{ => v1.5}/v1.5.4.sql (100%) rename server/resources/script/sql/{ => v1.6}/v1.6.0.sql (100%) rename server/resources/script/sql/{ => v1.7}/v1.7.0.sql (100%) rename server/resources/script/sql/{ => v1.7}/v1.7.1.sql (100%) diff --git a/README.md b/README.md index 4a9622ef..4aff42bf 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ ### 介绍 -web 版 **linux(终端[终端回放] 文件 脚本 进程 计划任务)、数据库（mysql postgres oracle 达梦 高斯）、redis(单机 哨兵 集群)、mongo 统一管理操作平台** +web 版 **linux(终端[终端回放] 文件 脚本 进程 计划任务)、数据库（mysql postgres oracle 达梦 高斯 sqlite）、redis(单机 哨兵 集群)、mongo 统一管理操作平台** ### 开发语言与主要框架 diff --git a/mayfly_go_web/package.json b/mayfly_go_web/package.json index 016b117e..07299e49 100644 --- a/mayfly_go_web/package.json +++ b/mayfly_go_web/package.json @@ -17,7 +17,7 @@ "countup.js": "^2.7.0", "cropperjs": "^1.5.11", "echarts": "^5.4.3", - "element-plus": "^2.5.1", + "element-plus": "^2.5.2", "js-base64": "^3.7.5", "jsencrypt": "^3.3.2", "lodash": "^4.17.21", @@ -33,7 +33,7 @@ "splitpanes": "^3.1.5", "sql-formatter": "^15.0.2", "uuid": "^9.0.1", - "vue": "^3.4.14", + "vue": "^3.4.15", "vue-router": "^4.2.5", "xterm": "^5.3.0", "xterm-addon-fit": "^0.8.0", diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue index 37d94859..eb6c31a8 100644 --- a/mayfly_go_web/src/views/ops/db/SqlExec.vue +++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue @@ -307,7 +307,8 @@ const NodeTypeTableMenu = new NodeType(SqlExecNodeType.TableMenu) state.reloadStatus = false; let dbTableSize = 0; const tablesNode = tables.map((x: any) => { - dbTableSize += x.dataLength + x.indexLength; + const tableSize = x.dataLength + x.indexLength; + dbTableSize += tableSize; return new TagTreeNode(`${id}.${db}.${x.tableName}`, x.tableName, NodeTypeTable) .withIsLeaf(true) .withParams({ @@ -315,13 +316,13 @@ const NodeTypeTableMenu = new NodeType(SqlExecNodeType.TableMenu) db, tableName: x.tableName, tableComment: x.tableComment, - size: formatByteSize(x.dataLength + x.indexLength, 1), + size: tableSize == 0 ? '' : formatByteSize(tableSize, 1), }) .withIcon(TableIcon) .withLabelRemark(`${x.tableName} ${x.tableComment ? '| ' + x.tableComment : ''}`); }); // 设置父节点参数的表大小 - parentNode.params.dbTableSize = formatByteSize(dbTableSize); + parentNode.params.dbTableSize = dbTableSize == 0 ? '' : formatByteSize(dbTableSize); return tablesNode; }) .withNodeClickFunc(nodeClickChangeDb); diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue index 949b8509..a0dbe7b1 100644 --- a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue +++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue @@ -868,7 +868,7 @@ defineExpose({ color: var(--el-color-info-light-3); font-weight: bold; position: absolute; - top: -7px; + top: -5px; padding: 2px; height: 12px; } diff --git a/mayfly_go_web/src/views/system/account/AccountList.vue b/mayfly_go_web/src/views/system/account/AccountList.vue index a5323c47..bc40cf26 100755 --- a/mayfly_go_web/src/views/system/account/AccountList.vue +++ b/mayfly_go_web/src/views/system/account/AccountList.vue @@ -142,7 +142,7 @@ const search = async () => { const changeStatus = async (row: any) => { let id = row.id; - let status = row.status == -1 ? 1 : -1; + let status = row.status == AccountStatusEnum.Disable.value ? AccountStatusEnum.Enable.value : AccountStatusEnum.Disable.value; await accountApi.changeStatus.request({ id, status, diff --git a/server/go.mod b/server/go.mod index 9c17e884..85848180 100644 --- a/server/go.mod +++ b/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 ( diff --git a/server/internal/db/dbm/oracle/meta.go b/server/internal/db/dbm/oracle/meta.go index f50e2a33..d4928e2f 100644 --- a/server/internal/db/dbm/oracle/meta.go +++ b/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) diff --git a/server/internal/db/dbm/sqlite/meta.go b/server/internal/db/dbm/sqlite/meta.go index c0a968b8..604e1f10 100644 --- a/server/internal/db/dbm/sqlite/meta.go +++ b/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 { diff --git a/server/internal/sys/api/account.go b/server/internal/sys/api/account.go index 3c958c90..5e6e83c0 100644 --- a/server/internal/sys/api/account.go +++ b/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)) } diff --git a/server/internal/sys/api/vo/account.go b/server/internal/sys/api/vo/account.go index e2e3548c..19abd0bf 100644 --- a/server/internal/sys/api/vo/account.go +++ b/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"` } // 账号个人信息 diff --git a/server/internal/sys/application/account.go b/server/internal/sys/application/account.go index ec79103a..3a8b114e 100644 --- a/server/internal/sys/application/account.go +++ b/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) } diff --git a/server/internal/sys/domain/entity/account.go b/server/internal/sys/domain/entity/account.go index f7a9dd43..6fa0dbdc 100644 --- a/server/internal/sys/domain/entity/account.go +++ b/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, "禁用") diff --git a/server/pkg/enumx/enumx.go b/server/pkg/enumx/enumx.go new file mode 100644 index 00000000..7181f872 --- /dev/null +++ b/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 "" +} diff --git a/server/resources/script/sql/v1.5.3.sql b/server/resources/script/sql/v1.5/v1.5.3.sql similarity index 100% rename from server/resources/script/sql/v1.5.3.sql rename to server/resources/script/sql/v1.5/v1.5.3.sql diff --git a/server/resources/script/sql/v1.5.4.sql b/server/resources/script/sql/v1.5/v1.5.4.sql similarity index 100% rename from server/resources/script/sql/v1.5.4.sql rename to server/resources/script/sql/v1.5/v1.5.4.sql diff --git a/server/resources/script/sql/v1.6.0.sql b/server/resources/script/sql/v1.6/v1.6.0.sql similarity index 100% rename from server/resources/script/sql/v1.6.0.sql rename to server/resources/script/sql/v1.6/v1.6.0.sql diff --git a/server/resources/script/sql/v1.7.0.sql b/server/resources/script/sql/v1.7/v1.7.0.sql similarity index 100% rename from server/resources/script/sql/v1.7.0.sql rename to server/resources/script/sql/v1.7/v1.7.0.sql diff --git a/server/resources/script/sql/v1.7.1.sql b/server/resources/script/sql/v1.7/v1.7.1.sql similarity index 100% rename from server/resources/script/sql/v1.7.1.sql rename to server/resources/script/sql/v1.7/v1.7.1.sql