Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

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

Merged
merged 4 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion backend/app/service/database_mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,10 @@ func (u *MysqlService) LoadStatus(req dto.OperationWithNameAndType) (*dto.MysqlS
info.Position = "OFF"
rows, err := executeSqlForRows(app.ContainerName, app.Key, app.Password, "show master status;")
if err != nil {
return nil, err
rows, err = executeSqlForRows(app.ContainerName, app.Key, app.Password, "SHOW BINARY LOG STATUS;")
if err != nil {
return nil, err
}
}
if len(rows) > 2 {
itemValue := strings.Split(rows[1], "\t")
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/views/container/container/operate/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,11 @@
</el-button>
</el-form-item>
<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 label="Entrypoint" prop="entrypointStr">
<el-input
Expand Down
Loading