gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-14 01:34:47 +08:00
Code

feat: 数据库支持 Mariadb 11.x (#4665)

Browse Source 
Co-authored-by: ssonglius11 <ssonglius11@163.com>
This commit is contained in:
ssongliu 2024-04-23 17:59:00 +08:00 committed by GitHub
parent 3156c84b19
commit 4596f9c2c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/app/service/database_mysql.go
View File

@ -456,7 +456,7 @@ func (u *MysqlService) LoadRemoteAccess(req dto.OperationWithNameAndType) (bool,
if err != nil { if err != nil {
return false, err return false, err
} }
hosts, err := executeSqlForRows(app.ContainerName, app.Password, "select host from mysql.user where user='root';") hosts, err := executeSqlForRows(app.ContainerName, app.Key, app.Password, "select host from mysql.user where user='root';")
if err != nil { if err != nil {
return false, err return false, err
} }
@ -474,7 +474,7 @@ func (u *MysqlService) LoadVariables(req dto.OperationWithNameAndType) (*dto.Mys
if err != nil { if err != nil {
return nil, err return nil, err
} }
variableMap, err := executeSqlForMaps(app.ContainerName, app.Password, "show global variables;") variableMap, err := executeSqlForMaps(app.ContainerName, app.Key, app.Password, "show global variables;")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -493,7 +493,7 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
return nil, err return nil, err
} }
statusMap, err := executeSqlForMaps(app.ContainerName, app.Password, "show global status;") statusMap, err := executeSqlForMaps(app.ContainerName, app.Key, app.Password, "show global status;")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -517,7 +517,7 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
info.File = "OFF" info.File = "OFF"
info.Position = "OFF" info.Position = "OFF"
rows, err := executeSqlForRows(app.ContainerName, app.Password, "show master status;") rows, err := executeSqlForRows(app.ContainerName, app.Key, app.Password, "show master status;")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -532,8 +532,8 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
return &info, nil return &info, nil
} }
func executeSqlForMaps(containerName, password, command string) (map[string]string, error) { func executeSqlForMaps(containerName, dbType, password, command string) (map[string]string, error) {
cmd := exec.Command("docker", "exec", containerName, "mysql", "-uroot", "-p"+password, "-e", command) cmd := exec.Command("docker", "exec", containerName, dbType, "-uroot", "-p"+password, "-e", command)
stdout, err := cmd.CombinedOutput() stdout, err := cmd.CombinedOutput()
stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "") stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "")
if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") { if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") {
@ -551,8 +551,8 @@ func executeSqlForMaps(containerName, password, command string) (map[string]stri
return rowMap, nil return rowMap, nil
} }
func executeSqlForRows(containerName, password, command string) ([]string, error) { func executeSqlForRows(containerName, dbType, password, command string) ([]string, error) {
cmd := exec.Command("docker", "exec", containerName, "mysql", "-uroot", "-p"+password, "-e", command) cmd := exec.Command("docker", "exec", containerName, dbType, "-uroot", "-p"+password, "-e", command)
stdout, err := cmd.CombinedOutput() stdout, err := cmd.CombinedOutput()
stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "") stdStr := strings.ReplaceAll(string(stdout), "mysql: [Warning] Using a password on the command line interface can be insecure.\n", "")
if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") { if err != nil || strings.HasPrefix(string(stdStr), "ERROR ") {
@ -614,6 +614,7 @@ func LoadMysqlClientByFrom(database string) (mysql.MysqlClient, string, error) {
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
dbInfo.Type = databaseItem.Type
dbInfo.From = databaseItem.From dbInfo.From = databaseItem.From
dbInfo.Database = database dbInfo.Database = database
if dbInfo.From != "local" { if dbInfo.From != "local" {

5
backend/utils/mysql/client.go
View File

@ -30,8 +30,8 @@ type MysqlClient interface {
func NewMysqlClient(conn client.DBInfo) (MysqlClient, error) { func NewMysqlClient(conn client.DBInfo) (MysqlClient, error) {
if conn.From == "local" { if conn.From == "local" {
connArgs := []string{"exec", conn.Address, "mysql", "-u" + conn.Username, "-p" + conn.Password, "-e"} connArgs := []string{"exec", conn.Address, conn.Type, "-u" + conn.Username, "-p" + conn.Password, "-e"}
return client.NewLocal(connArgs, conn.Address, conn.Password, conn.Database), nil return client.NewLocal(connArgs, conn.Type, conn.Address, conn.Password, conn.Database), nil
} }
if strings.Contains(conn.Address, ":") { if strings.Contains(conn.Address, ":") {
@ -59,6 +59,7 @@ func NewMysqlClient(conn client.DBInfo) (MysqlClient, error) {
} }
return client.NewRemote(client.Remote{ return client.NewRemote(client.Remote{
Type: conn.Type,
Client: db, Client: db,
Database: conn.Database, Database: conn.Database,
User: conn.Username, User: conn.Username,

1
backend/utils/mysql/client/info.go
View File

@ -10,6 +10,7 @@ import (
) )
type DBInfo struct { type DBInfo struct {
Type string `json:"type"`
From string `json:"from"` From string `json:"from"`
Database string `json:"database"` Database string `json:"database"`
Address string `json:"address"` Address string `json:"address"`

15
backend/utils/mysql/client/local.go
View File

@ -18,14 +18,15 @@ import (
) )
type Local struct { type Local struct {
Type string
PrefixCommand []string PrefixCommand []string
Database string Database string
Password string Password string
ContainerName string ContainerName string
} }
func NewLocal(command []string, containerName, password, database string) *Local { func NewLocal(command []string, dbType, containerName, password, database string) *Local {
return &Local{PrefixCommand: command, ContainerName: containerName, Password: password, Database: database} return &Local{Type: dbType, PrefixCommand: command, ContainerName: containerName, Password: password, Database: database}
} }
func (r *Local) Create(info CreateInfo) error { func (r *Local) Create(info CreateInfo) error {
@ -223,8 +224,12 @@ func (r *Local) Backup(info BackupInfo) error {
} }
} }
outfile, _ := os.OpenFile(path.Join(info.TargetDir, info.FileName), os.O_RDWR|os.O_CREATE, 0755) outfile, _ := os.OpenFile(path.Join(info.TargetDir, info.FileName), os.O_RDWR|os.O_CREATE, 0755)
global.LOG.Infof("start to mysqldump | gzip > %s.gzip", info.TargetDir+"/"+info.FileName) dumpCmd := "mysqldump"
cmd := exec.Command("docker", "exec", r.ContainerName, "mysqldump", "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name) if r.Type == constant.AppMariaDB {
dumpCmd = "mariadb-dump"
}
global.LOG.Infof("start to %s | gzip > %s.gzip", dumpCmd, info.TargetDir+"/"+info.FileName)
cmd := exec.Command("docker", "exec", r.ContainerName, dumpCmd, "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name)
gzipCmd := exec.Command("gzip", "-cf") gzipCmd := exec.Command("gzip", "-cf")
gzipCmd.Stdin, _ = cmd.StdoutPipe() gzipCmd.Stdin, _ = cmd.StdoutPipe()
gzipCmd.Stdout = outfile gzipCmd.Stdout = outfile
@ -237,7 +242,7 @@ func (r *Local) Backup(info BackupInfo) error {
func (r *Local) Recover(info RecoverInfo) error { func (r *Local) Recover(info RecoverInfo) error {
fi, _ := os.Open(info.SourceFile) fi, _ := os.Open(info.SourceFile)
defer fi.Close() defer fi.Close()
cmd := exec.Command("docker", "exec", "-i", r.ContainerName, "mysql", "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name) cmd := exec.Command("docker", "exec", "-i", r.ContainerName, r.Type, "-uroot", "-p"+r.Password, "--default-character-set="+info.Format, info.Name)
if strings.HasSuffix(info.SourceFile, ".gz") { if strings.HasSuffix(info.SourceFile, ".gz") {
gzipFile, err := os.Open(info.SourceFile) gzipFile, err := os.Open(info.SourceFile)
if err != nil { if err != nil {

19
backend/utils/mysql/client/remote.go
View File

@ -21,6 +21,7 @@ import (
) )
type Remote struct { type Remote struct {
Type string
Client *sql.DB Client *sql.DB
Database string Database string
User string User string
@ -234,13 +235,17 @@ func (r *Remote) Backup(info BackupInfo) error {
} }
} }
outfile, _ := os.OpenFile(path.Join(info.TargetDir, info.FileName), os.O_RDWR|os.O_CREATE, 0755) outfile, _ := os.OpenFile(path.Join(info.TargetDir, info.FileName), os.O_RDWR|os.O_CREATE, 0755)
global.LOG.Infof("start to mysqldump | gzip > %s.gzip", info.TargetDir+"/"+info.FileName) dumpCmd := "mysqldump"
if r.Type == constant.AppMariaDB {
dumpCmd = "mariadb-dump"
}
global.LOG.Infof("start to %s | gzip > %s.gzip", dumpCmd, info.TargetDir+"/"+info.FileName)
image, err := loadImage(info.Type, info.Version) image, err := loadImage(info.Type, info.Version)
if err != nil { if err != nil {
return err return err
} }
backupCmd := fmt.Sprintf("docker run --rm --net=host -i %s /bin/bash -c 'mysqldump -h %s -P %d -u%s -p%s %s --default-character-set=%s %s'", backupCmd := fmt.Sprintf("docker run --rm --net=host -i %s /bin/bash -c '%s -h %s -P %d -u%s -p%s %s --default-character-set=%s %s'",
image, r.Address, r.Port, r.User, r.Password, sslSkip(info.Version), info.Format, info.Name) image, dumpCmd, r.Address, r.Port, r.User, r.Password, sslSkip(info.Version, r.Type), info.Format, info.Name)
global.LOG.Debug(backupCmd) global.LOG.Debug(backupCmd)
cmd := exec.Command("bash", "-c", backupCmd) cmd := exec.Command("bash", "-c", backupCmd)
@ -263,8 +268,8 @@ func (r *Remote) Recover(info RecoverInfo) error {
return err return err
} }
recoverCmd := fmt.Sprintf("docker run --rm --net=host -i %s /bin/bash -c 'mysql -h %s -P %d -u%s -p%s %s --default-character-set=%s %s'", recoverCmd := fmt.Sprintf("docker run --rm --net=host -i %s /bin/bash -c '%s -h %s -P %d -u%s -p%s %s --default-character-set=%s %s'",
image, r.Address, r.Port, r.User, r.Password, sslSkip(info.Version), info.Format, info.Name) image, r.Type, r.Address, r.Port, r.User, r.Password, sslSkip(info.Version, r.Type), info.Format, info.Name)
global.LOG.Debug(recoverCmd) global.LOG.Debug(recoverCmd)
cmd := exec.Command("bash", "-c", recoverCmd) cmd := exec.Command("bash", "-c", recoverCmd)
@ -436,8 +441,8 @@ func loadImage(dbType, version string) (string, error) {
return "mysql:" + version, nil return "mysql:" + version, nil
} }
func sslSkip(version string) string { func sslSkip(version, dbType string) string {
if strings.HasPrefix(version, "5.6") || strings.HasPrefix(version, "5.7") { if dbType == constant.AppMariaDB || strings.HasPrefix(version, "5.6") || strings.HasPrefix(version, "5.7") {
return "--skip-ssl" return "--skip-ssl"
} }
return "--ssl-mode=DISABLED" return "--ssl-mode=DISABLED"

5
frontend/src/views/database/mysql/remote/operate/index.vue
View File

@ -32,7 +32,10 @@
<el-radio label="5.7" value="5.7" /> <el-radio label="5.7" value="5.7" />
<el-radio label="5.6" value="5.6" /> <el-radio label="5.6" value="5.6" />
</div> </div>
<el-radio v-else label="10.x" value="10.x" /> <div v-else>
<el-radio label="10.x" value="10.x" />
<el-radio label="11.x" value="11.x" />
</div>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item :label="$t('database.address')" prop="address"> <el-form-item :label="$t('database.address')" prop="address">