From ce86e8c31fd51f3a37a93678e2d2ee6a2ed17b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=98=AD?= <81747598+lan-yonghui@users.noreply.github.com>
Date: Fri, 30 May 2025 16:44:27 +0800
Subject: [PATCH] fix: Remote Redis connection (#8881)

---
 agent/app/service/container.go                            | 5 +++++
 agent/app/service/database_redis.go                       | 2 +-
 frontend/src/views/database/redis/index.vue               | 8 +++++++-
 .../src/views/database/redis/remote/operate/index.vue     | 4 ++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/agent/app/service/container.go b/agent/app/service/container.go
index 097d5045d..3ca3877cd 100644
--- a/agent/app/service/container.go
+++ b/agent/app/service/container.go
@@ -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
 }
 
diff --git a/agent/app/service/database_redis.go b/agent/app/service/database_redis.go
index c9d44a042..af0b15b92 100644
--- a/agent/app/service/database_redis.go
+++ b/agent/app/service/database_redis.go
@@ -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)
diff --git a/frontend/src/views/database/redis/index.vue b/frontend/src/views/database/redis/index.vue
index 523a290b5..0210a67c2 100644
--- a/frontend/src/views/database/redis/index.vue
+++ b/frontend/src/views/database/redis/index.vue
@@ -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">
diff --git a/frontend/src/views/database/redis/remote/operate/index.vue b/frontend/src/views/database/redis/remote/operate/index.vue
index b94f9b1cf..33686cb8b 100644
--- a/frontend/src/views/database/redis/remote/operate/index.vue
+++ b/frontend/src/views/database/redis/remote/operate/index.vue
@@ -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;
 };