1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-10-27 09:15:55 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Remote Redis connection (#8881)

Browse source
This commit is contained in:
蘭 2025-05-30 16:44:27 +08:00 • committed by GitHub
parent 36b81f6dba
commit ce86e8c31f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
agent/app/service/container.go
View file

@ -510,7 +510,11 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
global.LOG.Errorf("new task for create container failed, err: %v", err)
return err
}
var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
taskItem.AddSubTask(i18n.GetWithName("ContainerImagePull", req.Image), func(t *task.Task) error {
if !checkImageExist(client, req.Image) || req.ForcePull {
if err := pullImages(taskItem, client, req.Image); err != nil {
@ -562,6 +566,7 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate) error {
global.LOG.Error(err.Error())
}
}()
wg.Wait()
return nil
}

2
agent/app/service/database_redis.go
View file

@ -81,7 +81,7 @@ func (u *RedisService) CheckHasCli() bool {
func (u *RedisService) InstallCli() error {
item := dto.ContainerOperate{
Name: "1Panel-redis-cli-tools",
Image: "redis:7.2.4",
Image: "redis:7.4.4",
Network: "1panel-network",
}
return NewIContainerService().ContainerCreate(item)

8
frontend/src/views/database/redis/index.vue
View file

@ -31,7 +31,13 @@
</el-button>
</template>
<template #rightToolBar v-if="!isOnSetting">
<el-select v-model="currentDBName" @change="changeDatabase()" class="p-w-200 ml-5" v-if="currentDB">
<el-select
v-model="currentDBName"
@change="changeDatabase()"
class="p-w-200 ml-5"
v-if="currentDB"
placement="bottom-end"
>
<template #prefix>{{ $t('commons.table.type') }}</template>
<el-option-group :label="$t('commons.table.local')">
<div v-for="(item, index) in dbOptionsLocal" :key="index">

4
frontend/src/views/database/redis/remote/operate/index.vue
View file

@ -15,6 +15,7 @@
<el-radio-group v-model="dialogData.rowData!.version" @change="isOK = false">
<el-radio label="6.x" value="6.x" />
<el-radio label="7.x" value="7.x" />
<el-radio label="8.x" value="8.x" />
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('database.address')" prop="address">
@ -80,6 +81,9 @@ const acceptParams = (params: DialogProps): void => {
if (dialogData.value.rowData.version.startsWith('7.')) {
dialogData.value.rowData.version = '7.x';
}
if (dialogData.value.rowData.version.startsWith('8.')) {
dialogData.value.rowData.version = '8.x';
}
title.value = i18n.global.t('database.' + dialogData.value.title + 'RemoteDB');
drawerVisible.value = true;
};