github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix:mysql升级到8.4后查询会出错，容器的command回显使用 text area (#6147) 

* style:容器的command参数回显应该使用 text area而不是text input,且不应该过滤'\n'

* chore:prettier格式化

* fix:mysql升级到8.4后，数据库管理 - 当前状态 查询会出错

* chore:修改逻辑判断
pull/6172/head
trom 2024-08-16 11:23:44 +08:00 committed by GitHub
parent 7da5f7a884
commit 779addfcb4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -532,9 +532,12 @@ 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.Key, app.Password, "show master status;") rows, err := executeSqlForRows(app.ContainerName, app.Key, app.Password, "show master status;")
if err != nil {
rows, err = executeSqlForRows(app.ContainerName, app.Key, app.Password, "SHOW BINARY LOG STATUS;")
if err != nil { if err != nil {
return nil, err return nil, err
} }
}
if len(rows) > 2 { if len(rows) > 2 {
itemValue := strings.Split(rows[1], "\t") itemValue := strings.Split(rows[1], "\t")
if len(itemValue) > 2 { if len(itemValue) > 2 {

6
frontend/src/views/container/container/operate/index.vue
View File

@ -201,7 +201,11 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item label="Command" prop="cmdStr"> <el-form-item label="Command" prop="cmdStr">
<el-input v-model="dialogData.rowData!.cmdStr" :placeholder="$t('container.cmdHelper')" /> <el-input
type="textarea"
v-model="dialogData.rowData!.cmdStr"
:placeholder="$t('container.cmdHelper')"
/>
</el-form-item> </el-form-item>
<el-form-item label="Entrypoint" prop="entrypointStr"> <el-form-item label="Entrypoint" prop="entrypointStr">
<el-input <el-input