From db757123ba1ae0f41557d4d3a6c41858ef7b9053 Mon Sep 17 00:00:00 2001
From: long2ice <long2ice@gmail.com>
Date: Fri, 13 Jan 2023 16:32:49 +0800
Subject: [PATCH] refactor: reuse databaseConnectionString

---
 db/patch-redis-monitor.sql | 6 ------
 server/database.js         | 1 -
 server/model/monitor.js    | 3 +--
 src/pages/EditMonitor.vue  | 2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 db/patch-redis-monitor.sql

diff --git a/db/patch-redis-monitor.sql b/db/patch-redis-monitor.sql
deleted file mode 100644
index e82f24fe..00000000
--- a/db/patch-redis-monitor.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN TRANSACTION;
-
-ALTER TABLE monitor
-    ADD redis_connection_string VARCHAR(255);
-
-COMMIT
diff --git a/server/database.js b/server/database.js
index 1ab1f441..2544f197 100644
--- a/server/database.js
+++ b/server/database.js
@@ -66,7 +66,6 @@ class Database {
         "patch-add-radius-monitor.sql": true,
         "patch-monitor-add-resend-interval.sql": true,
         "patch-maintenance-table2.sql": true,
-        "patch-redis-monitor.sql": true,
     };
 
     /**
diff --git a/server/model/monitor.js b/server/model/monitor.js
index 76a18520..db1bca81 100644
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@@ -122,7 +122,6 @@ class Monitor extends BeanModel {
                 basic_auth_pass: this.basic_auth_pass,
                 pushToken: this.pushToken,
                 databaseConnectionString: this.databaseConnectionString,
-                redisConnectionString: this.redisConnectionString,
                 radiusUsername: this.radiusUsername,
                 radiusPassword: this.radiusPassword,
                 radiusSecret: this.radiusSecret,
@@ -623,7 +622,7 @@ class Monitor extends BeanModel {
                 } else if (this.type === "redis") {
                     let startTime = dayjs().valueOf();
 
-                    bean.msg = await redisPingAsync(this.redisConnectionString);
+                    bean.msg = await redisPingAsync(this.databaseConnectionString);
                     bean.status = UP;
                     bean.ping = dayjs().valueOf() - startTime;
                 } else {
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 6ae204ba..b54b0a20 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -274,7 +274,7 @@
                             <template v-if="monitor.type === 'redis'">
                                 <div class="my-3">
                                     <label for="redisConnectionString" class="form-label">{{ $t("Connection String") }}</label>
-                                    <input id="redisConnectionString" v-model="monitor.redisConnectionString" type="text" class="form-control" placeholder="redis://user:password@host:port">
+                                    <input id="redisConnectionString" v-model="monitor.databaseConnectionString" type="text" class="form-control" placeholder="redis://user:password@host:port">
                                 </div>
                             </template>
                             <!-- Interval -->