From 2fc3fd3ef183e27f1ee3c40a655ca5febe8b0229 Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 18 Dec 2024 01:38:22 +0800
Subject: [PATCH] update

---
 plugins/valkey/index.py     | 10 +++++-----
 plugins/valkey/js/valkey.js | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/valkey/index.py b/plugins/valkey/index.py
index c6d966a959..817fdb723b 100755
--- a/plugins/valkey/index.py
+++ b/plugins/valkey/index.py
@@ -154,7 +154,7 @@ def initDreplace():
         mw.execShell('chmod +x ' + file_bin)
 
     # config replace
-    dst_conf = getServerDir() + '/valkey.conf'
+    dst_conf = getConf()
     dst_conf_init = getServerDir() + '/init.pl'
     if not os.path.exists(dst_conf_init):
         content = mw.readFile(getConfTpl())
@@ -233,7 +233,7 @@ def getPort():
 
 def getRedisCmd():
     requirepass = ""
-    conf = getServerDir() + '/valkey.conf'
+    conf = getConf()
     content = mw.readFile(conf)
     rep = r"^(requirepass)\s*([.0-9A-Za-z_& ~]+)"
     tmp = re.search(rep, content, re.M)
@@ -462,11 +462,11 @@ def initdUinstall():
 
 
 def runLog():
-    return getServerDir() + '/data/redis.log'
+    return getServerDir() + '/data/valkey.log'
 
 
 def getRedisConfInfo():
-    conf = getServerDir() + '/redis.conf'
+    conf = getConf()
 
     gets = [
         {'name': 'bind', 'type': 2, 'ps': '绑定IP(修改绑定IP可能会存在安全隐患)','must_show':1},
@@ -509,7 +509,7 @@ def submitRedisConf():
     gets = ['bind', 'port', 'timeout', 'maxclients',
             'databases', 'requirepass', 'maxmemory','slaveof','masterauth']
     args = getArgs()
-    conf = getServerDir() + '/valkey.conf'
+    conf = getConf()
     content = mw.readFile(conf)
     for g in gets:
         if g in args:
diff --git a/plugins/valkey/js/valkey.js b/plugins/valkey/js/valkey.js
index 1697e96aae..9540415f42 100755
--- a/plugins/valkey/js/valkey.js
+++ b/plugins/valkey/js/valkey.js
@@ -2,7 +2,7 @@ function redisPost(method, version, args,callback){
     var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
 
     var req_data = {};
-    req_data['name'] = 'redis';
+    req_data['name'] = 'valkey';
     req_data['func'] = method;
     req_data['version'] = version;
  
@@ -30,7 +30,7 @@ function redisPostCallbak(method, version, args,callback){
     var loadT = layer.msg('正在获取...', { icon: 16, time: 0, shade: 0.3 });
 
     var req_data = {};
-    req_data['name'] = 'redis';
+    req_data['name'] = 'valkey';
     req_data['func'] = method;
     args['version'] = version;
  
@@ -280,9 +280,9 @@ function submitConf(version) {
 }
 
 
-function redisReadme(){
-    var cmd_01 = '/www/server/redis/bin/redis-cli --cluster create 127.0.0.1:6379 127.0.0.1:6380 127.0.0.1:6381 --cluster-replicas 0';
-    var cmd_02 = '/www/server/redis/bin/redis-cli --cluster create 127.0.0.1:6379 127.0.0.1:6380 127.0.0.1:6381 127.0.0.1:6382 127.0.0.1:6383 127.0.0.1:6384 --cluster-replicas 1';
+function valkeyReadme(){
+    var cmd_01 = '/www/server/valkey/bin/valkey-cli --cluster create 127.0.0.1:6379 127.0.0.1:6380 127.0.0.1:6381 --cluster-replicas 0';
+    var cmd_02 = '/www/server/valkey/bin/valkey-cli --cluster create 127.0.0.1:6379 127.0.0.1:6380 127.0.0.1:6381 127.0.0.1:6382 127.0.0.1:6383 127.0.0.1:6384 --cluster-replicas 1';
 
 
     var readme = '<ul class="help-info-text c7">';