acepanel/panel
2
0
Fork 0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 13:47:15 +08:00
Code Issues Packages Releases Activity

feat: 数据库管理基本完成

Browse Source
This commit is contained in:
耗子
2024-11-26 03:50:54 +08:00
parent 3fbaecbe9e
commit 9a2e68e24e
15 changed files with 175 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/apps/mysql/service.go
View File

@@ -199,7 +199,7 @@ func (s *Service) SetRootPassword(w http.ResponseWriter, r *http.Request) {
return
}
} else {
if err = mysql.UserPassword("root", req.Password); err != nil {
if err = mysql.UserPassword("root", req.Password, "localhost"); err != nil {
service.Error(w, http.StatusInternalServerError, "%v", err)
return
}

19
internal/biz/database.go
View File

@@ -4,13 +4,22 @@ import (
"github.com/TheTNB/panel/internal/http/request"
)
type DatabaseStatus string
type DatabaseType string
const (
DatabaseTypeMysql DatabaseType = "mysql"
DatabaseTypePostgresql DatabaseType = "postgresql"
DatabaseTypeMongoDB DatabaseType = "mongodb"
DatabaseSQLite DatabaseType = "sqlite"
DatabaseTypeRedis DatabaseType = "redis"
)
type Database struct {
Name string `json:"name"`
Server string `json:"server"`
ServerID uint `json:"server_id"`
Encoding string `json:"encoding"`
Type DatabaseType `json:"type"`
Name string `json:"name"`
Server string `json:"server"`
ServerID uint `json:"server_id"`
Encoding string `json:"encoding"`
}
type DatabaseRepo interface {

10
internal/biz/database_server.go
View File

@@ -9,16 +9,6 @@ import (
"github.com/TheTNB/panel/internal/http/request"
)
type DatabaseType string
const (
DatabaseTypeMysql DatabaseType = "mysql"
DatabaseTypePostgresql DatabaseType = "postgresql"
DatabaseTypeMongoDB DatabaseType = "mongodb"
DatabaseSQLite DatabaseType = "sqlite"
DatabaseTypeRedis DatabaseType = "redis"
)
type DatabaseServerStatus string
const (

2
internal/biz/database_user.go
View File

@@ -27,6 +27,8 @@ type DatabaseUser struct {
Remark string `gorm:"not null" json:"remark"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
Server *DatabaseServer `gorm:"foreignKey:ServerID;references:ID" json:"server"`
}
func (r *DatabaseUser) BeforeSave(tx *gorm.DB) error {

26
internal/data/database.go
View File

@@ -33,6 +33,7 @@ func (r databaseRepo) List(page, limit uint) ([]*biz.Database, int64, error) {
if databases, err := mysql.Databases(); err == nil {
for item := range slices.Values(databases) {
database = append(database, &biz.Database{
Type: biz.DatabaseTypeMysql,
Name: item.Name,
Server: server.Name,
ServerID: server.ID,
@@ -47,6 +48,7 @@ func (r databaseRepo) List(page, limit uint) ([]*biz.Database, int64, error) {
if databases, err := postgres.Databases(); err == nil {
for item := range slices.Values(databases) {
database = append(database, &biz.Database{
Type: biz.DatabaseTypePostgresql,
Name: item.Name,
Server: server.Name,
ServerID: server.ID,
@@ -73,28 +75,36 @@ func (r databaseRepo) Create(req *request.DatabaseCreate) error {
if err != nil {
return err
}
if err = mysql.UserCreate(req.Username, req.Password); err != nil {
return err
if req.CreateUser {
if err = mysql.UserCreate(req.Username, req.Password, req.Host); err != nil {
return err
}
}
if err = mysql.DatabaseCreate(req.Name); err != nil {
return err
}
if err = mysql.PrivilegesGrant(req.Username, req.Name); err != nil {
return err
if req.Username != "" {
if err = mysql.PrivilegesGrant(req.Username, req.Name, req.Host); err != nil {
return err
}
}
case biz.DatabaseTypePostgresql:
postgres, err := db.NewPostgres(server.Username, server.Password, server.Host, server.Port)
if err != nil {
return err
}
if err = postgres.UserCreate(req.Username, req.Password); err != nil {
return err
if req.CreateUser {
if err = postgres.UserCreate(req.Username, req.Password); err != nil {
return err
}
}
if err = postgres.DatabaseCreate(req.Name); err != nil {
return err
}
if err = postgres.PrivilegesGrant(req.Username, req.Name); err != nil {
return err
if req.Username != "" {
if err = postgres.PrivilegesGrant(req.Username, req.Name); err != nil {
return err
}
}
}

13
internal/data/database_user.go
View File

@@ -30,7 +30,7 @@ func (r databaseUserRepo) Count() (int64, error) {
func (r databaseUserRepo) List(page, limit uint) ([]*biz.DatabaseUser, int64, error) {
var user []*biz.DatabaseUser
var total int64
err := app.Orm.Model(&biz.DatabaseUser{}).Order("id desc").Count(&total).Offset(int((page - 1) * limit)).Limit(int(limit)).Find(&user).Error
err := app.Orm.Model(&biz.DatabaseUser{}).Preload("Server").Order("id desc").Count(&total).Offset(int((page - 1) * limit)).Limit(int(limit)).Find(&user).Error
for u := range slices.Values(user) {
r.fillUser(u)
@@ -41,7 +41,7 @@ func (r databaseUserRepo) List(page, limit uint) ([]*biz.DatabaseUser, int64, er
func (r databaseUserRepo) Get(id uint) (*biz.DatabaseUser, error) {
user := new(biz.DatabaseUser)
if err := app.Orm.Where("id = ?", id).First(user).Error; err != nil {
if err := app.Orm.Preload("Server").Where("id = ?", id).First(user).Error; err != nil {
return nil, err
}
@@ -62,11 +62,11 @@ func (r databaseUserRepo) Create(req *request.DatabaseUserCreate) error {
if err != nil {
return err
}
if err = mysql.UserCreate(req.Username, req.Password); err != nil {
if err = mysql.UserCreate(req.Username, req.Password, req.Host); err != nil {
return err
}
for name := range slices.Values(req.Privileges) {
if err = mysql.PrivilegesGrant(req.Username, name); err != nil {
if err = mysql.PrivilegesGrant(req.Username, name, req.Host); err != nil {
return err
}
}
@@ -89,6 +89,7 @@ func (r databaseUserRepo) Create(req *request.DatabaseUserCreate) error {
ServerID: req.ServerID,
Username: req.Username,
Password: req.Password,
Host: req.Host,
Remark: req.Remark,
}
@@ -113,12 +114,12 @@ func (r databaseUserRepo) Update(req *request.DatabaseUserUpdate) error {
return err
}
if req.Password != "" {
if err = mysql.UserPassword(user.Username, req.Password); err != nil {
if err = mysql.UserPassword(user.Username, req.Password, user.Host); err != nil {
return err
}
}
for name := range slices.Values(req.Privileges) {
if err = mysql.PrivilegesGrant(user.Username, name); err != nil {
if err = mysql.PrivilegesGrant(user.Username, name, user.Host); err != nil {
return err
}
}

4
internal/data/website.go
View File

@@ -308,13 +308,13 @@ func (r *websiteRepo) Create(req *request.WebsiteCreate) (*biz.Website, error) {
if err != nil {
return nil, err
}
if err = mysql.UserCreate(req.DBUser, req.DBPassword); err != nil {
if err = mysql.UserCreate(req.DBUser, req.DBPassword, "localhost"); err != nil {
return nil, err
}
if err = mysql.DatabaseCreate(req.DBName); err != nil {
return nil, err
}
if err = mysql.PrivilegesGrant(req.DBUser, req.DBName); err != nil {
if err = mysql.PrivilegesGrant(req.DBUser, req.DBName, "localhost"); err != nil {
return nil, err
}
}

5
internal/http/request/database.go
View File

@@ -4,8 +4,9 @@ type DatabaseCreate struct {
ServerID uint `form:"server_id" json:"server_id" validate:"required,exists=database_servers id"`
Name string `form:"name" json:"name" validate:"required"`
CreateUser bool `form:"create_user" json:"create_user"`
Username string `form:"username" json:"username"`
Password string `form:"password" json:"password"`
Username string `form:"username" json:"username" validate:"required_if=CreateUser true"`
Password string `form:"password" json:"password" validate:"required_if=CreateUser true"`
Host string `form:"host" json:"host"`
Remark string `form:"remark" json:"remark"`
}

5
internal/http/request/database_user.go
View File

@@ -2,8 +2,9 @@ package request
type DatabaseUserCreate struct {
ServerID uint `form:"server_id" json:"server_id" validate:"required,exists=database_servers id"`
Username string `form:"username" json:"username"`
Password string `form:"password" json:"password"`
Username string `form:"username" json:"username" validate:"required"`
Password string `form:"password" json:"password" validate:"required"`
Host string `form:"host" json:"host"`
Privileges []string `form:"privileges" json:"privileges"`
Remark string `form:"remark" json:"remark"`
}

16
pkg/db/mysql.go
View File

@@ -98,8 +98,8 @@ func (m *MySQL) DatabaseSize(name string) (int64, error) {
return size, err
}
func (m *MySQL) UserCreate(user, password string) error {
_, err := m.Exec(fmt.Sprintf("CREATE USER IF NOT EXISTS '%s'@'localhost' IDENTIFIED BY '%s'", user, password))
func (m *MySQL) UserCreate(user, password, host string) error {
_, err := m.Exec(fmt.Sprintf("CREATE USER IF NOT EXISTS '%s'@'%s' IDENTIFIED BY '%s'", user, host, password))
m.flushPrivileges()
return err
}
@@ -110,14 +110,14 @@ func (m *MySQL) UserDrop(user string) error {
return err
}
func (m *MySQL) UserPassword(user, password string) error {
_, err := m.Exec(fmt.Sprintf("ALTER USER '%s'@'localhost' IDENTIFIED BY '%s'", user, password))
func (m *MySQL) UserPassword(user, password, host string) error {
_, err := m.Exec(fmt.Sprintf("ALTER USER '%s'@'%s' IDENTIFIED BY '%s'", user, host, password))
m.flushPrivileges()
return err
}
func (m *MySQL) PrivilegesGrant(user, database string) error {
_, err := m.Exec(fmt.Sprintf("GRANT ALL PRIVILEGES ON %s.* TO '%s'@'localhost'", database, user))
func (m *MySQL) PrivilegesGrant(user, database, host string) error {
_, err := m.Exec(fmt.Sprintf("GRANT ALL PRIVILEGES ON %s.* TO '%s'@'%s'", database, user, host))
m.flushPrivileges()
return err
}
@@ -164,8 +164,8 @@ func (m *MySQL) UserPrivileges(user, host string) (map[string][]string, error) {
return privileges, nil
}
func (m *MySQL) PrivilegesRevoke(user, database string) error {
_, err := m.Exec(fmt.Sprintf("REVOKE ALL PRIVILEGES ON %s.* FROM '%s'@'localhost'", database, user))
func (m *MySQL) PrivilegesRevoke(user, database, host string) error {
_, err := m.Exec(fmt.Sprintf("REVOKE ALL PRIVILEGES ON %s.* FROM '%s'@'%s'", database, user, host))
m.flushPrivileges()
return err
}

50
web/src/views/database/CreateDatabaseModal.vue
View File

@@ -4,12 +4,16 @@ import { NButton, NInput } from 'naive-ui'
const show = defineModel<boolean>('show', { type: Boolean, required: true })
const createModel = ref({
database: '',
server_id: null,
name: '',
create_user: false,
username: '',
password: '',
host: 'localhost'
})
const servers = ref<{ label: string; value: string }[]>([])
const hostType = [
{ label: '本地（localhost）', value: 'localhost' },
{ label: '所有（%）', value: '%' },
@@ -23,6 +27,17 @@ const handleCreate = () => {
window.$bus.emit('database:refresh')
})
}
onMounted(() => {
database.serverList(1, 10000).then((data: any) => {
for (const server of data.items) {
servers.value.push({
label: server.name,
value: server.id
})
}
})
})
</script>
<template>
@@ -37,15 +52,34 @@ const handleCreate = () => {
@close="show = false"
>
<n-form :model="createModel">
<n-form-item path="server_id" label="服务器">
<n-select
v-model:value="createModel.server_id"
@keydown.enter.prevent
placeholder="选择服务器"
:options="servers"
/>
</n-form-item>
<n-form-item path="database" label="数据库名">
<n-input
v-model:value="createModel.database"
v-model:value="createModel.name"
type="text"
@keydown.enter.prevent
placeholder="输入数据库名称"
/>
</n-form-item>
<n-form-item path="username" label="用户名">
<n-form-item path="create_user" label="创建用户">
<n-switch v-model:value="createModel.create_user" />
</n-form-item>
<n-form-item v-if="!createModel.create_user" path="username" label="授权用户">
<n-input
v-model:value="createModel.username"
type="text"
@keydown.enter.prevent
placeholder="输入授权用户名"
/>
</n-form-item>
<n-form-item v-if="createModel.create_user" path="username" label="用户名">
<n-input
v-model:value="createModel.username"
type="text"
@@ -53,7 +87,7 @@ const handleCreate = () => {
placeholder="输入用户名"
/>
</n-form-item>
<n-form-item path="password" label="密码">
<n-form-item v-if="createModel.create_user" path="password" label="密码">
<n-input
v-model:value="createModel.password"
type="password"
@@ -61,7 +95,7 @@ const handleCreate = () => {
placeholder="输入密码"
/>
</n-form-item>
<n-form-item path="host-select" label="主机">
<n-form-item v-if="createModel.create_user" path="host-select" label="主机">
<n-select
v-model:value="createModel.host"
@keydown.enter.prevent
@@ -69,7 +103,11 @@ const handleCreate = () => {
:options="hostType"
/>
</n-form-item>
<n-form-item v-if="createModel.host === ''" path="host" label="指定主机">
<n-form-item
v-if="createModel.create_user && createModel.host === ''"
path="host"
label="指定主机"
>
<n-input
v-model:value="createModel.host"
type="text"

29
web/src/views/database/DatabaseList.vue
View File

@@ -5,6 +5,29 @@ import { NButton, NPopconfirm, NTag } from 'naive-ui'
import database from '@/api/panel/database'
const columns: any = [
{
title: '类型',
key: 'type',
width: 150,
render(row: any) {
return h(
NTag,
{ type: 'info' },
{
default: () => {
switch (row.type) {
case 'mysql':
return 'MySQL'
case 'postgresql':
return 'PostgreSQL'
default:
return row.type
}
}
}
)
}
},
{
title: '数据库名',
key: 'name',
@@ -15,12 +38,12 @@ const columns: any = [
{
title: '服务器',
key: 'server',
width: 300
width: 150
},
{
title: '编码',
key: 'encoding',
width: 200,
width: 150,
render(row: any) {
return h(NTag, null, {
default: () => row.encoding
@@ -96,7 +119,7 @@ onUnmounted(() => {
<n-data-table
striped
remote
:scroll-x="1200"
:scroll-x="800"
:loading="loading"
:columns="columns"
:data="data"

5
web/src/views/database/IndexView.vue
View File

@@ -5,6 +5,7 @@ defineOptions({
import CreateDatabaseModal from '@/views/database/CreateDatabaseModal.vue'
import CreateServerModal from '@/views/database/CreateServerModal.vue'
import CreateUserModal from '@/views/database/CreateUserModal.vue'
import DatabaseList from '@/views/database/DatabaseList.vue'
import ServerList from '@/views/database/ServerList.vue'
import UserList from '@/views/database/UserList.vue'
@@ -28,10 +29,10 @@ const createServerModalShow = ref(false)
<TheIcon :size="18" icon="material-symbols:add" />
创建数据库
</n-button>
<n-button v-if="currentTab === 'user'" type="primary" @click="createUserModalShow = true">
<!--<n-button v-if="currentTab === 'user'" type="primary" @click="createUserModalShow = true">
<TheIcon :size="18" icon="material-symbols:add" />
创建用户
</n-button>
</n-button>-->
<n-button v-if="currentTab === 'server'" type="primary" @click="createServerModalShow = true">
<TheIcon :size="18" icon="material-symbols:add" />
添加服务器

18
web/src/views/database/ServerList.vue
View File

@@ -6,13 +6,6 @@ import database from '@/api/panel/database'
import { formatDateTime } from '@/utils'
const columns: any = [
{
title: '名称',
key: 'name',
minWidth: 100,
resizable: true,
ellipsis: { tooltip: true }
},
{
title: '类型',
key: 'type',
@@ -36,6 +29,13 @@ const columns: any = [
)
}
},
{
title: '名称',
key: 'name',
minWidth: 100,
resizable: true,
ellipsis: { tooltip: true }
},
{
title: '用户名',
key: 'username',
@@ -48,7 +48,7 @@ const columns: any = [
{
title: '密码',
key: 'password',
width: 200,
width: 150,
render(row: any) {
return h(NInputGroup, null, {
default: () => [
@@ -66,7 +66,7 @@ const columns: any = [
{
title: '主机',
key: 'host',
width: 200,
width: 150,
render(row: any) {
return h(NTag, null, {
default: () => `${row.host}:${row.port}`

38
web/src/views/database/UserList.vue
View File

@@ -6,6 +6,29 @@ import database from '@/api/panel/database'
import { formatDateTime } from '@/utils'
const columns: any = [
{
title: '类型',
key: 'type',
width: 150,
render(row: any) {
return h(
NTag,
{ type: 'info' },
{
default: () => {
switch (row.server.type) {
case 'mysql':
return 'MySQL'
case 'postgresql':
return 'PostgreSQL'
default:
return row.server.type
}
}
}
)
}
},
{
title: '用户名',
key: 'username',
@@ -27,7 +50,8 @@ const columns: any = [
value: row.password,
type: 'password',
showPasswordOn: 'click',
readonly: true
readonly: true,
placeholder: '未保存'
})
]
})
@@ -36,13 +60,21 @@ const columns: any = [
{
title: '主机',
key: 'host',
width: 200,
width: 150,
render(row: any) {
return h(NTag, null, {
default: () => row.host
})
}
},
{
title: '服务器',
key: 'server',
width: 150,
render(row: any) {
return row.server.name
}
},
{
title: '备注',
key: 'remark',
@@ -138,7 +170,7 @@ onUnmounted(() => {
<n-data-table
striped
remote
:scroll-x="1200"
:scroll-x="1400"
:loading="loading"
:columns="columns"
:data="data"