From a11b49befe2f23233053564ea85f67930725d68e Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 18 Dec 2024 12:17:36 +0800
Subject: [PATCH 1/2] update

---
 cmd.md                |  1 +
 scripts/init.d/mw.tpl | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/cmd.md b/cmd.md
index 9e3c6c2600..8763cc3976 100644
--- a/cmd.md
+++ b/cmd.md
@@ -7,6 +7,7 @@
 mw default	| 显示登录信息
 mw db 		| 快捷连接MySQL
 mw redis 	| 快捷连接Redis
+mw valkey 	| 快捷连接valkey
 mw mongodb 	| 快捷连接MongoDB
 mw pgdb 	| 快捷连接PostgreSQL
 ----------------------------------------
diff --git a/scripts/init.d/mw.tpl b/scripts/init.d/mw.tpl
index e1e1c89567..02aef4a1d9 100755
--- a/scripts/init.d/mw.tpl
+++ b/scripts/init.d/mw.tpl
@@ -515,6 +515,24 @@ mw_redis(){
     ${CLIEXEC}
 }
 
+mw_valkey(){
+    CONF="${ROOT_PATH}/valkey/valkey.conf"
+
+    if [ ! -f "$CONF" ]; then
+        echo -e "not install valkey!"
+        exit 1
+    fi
+
+    REDISPORT=$(cat $CONF |grep port|grep -v '#'|awk '{print $2}')
+    REDISPASS=$(cat $CONF |grep requirepass|grep -v '#'|awk '{print $2}')
+    if [ "$REDISPASS" != "" ];then
+        REDISPASS=" -a $REDISPASS"
+    fi
+    CLIEXEC="${ROOT_PATH}/valkey/bin/valkey-cli -p $REDISPORT$REDISPASS"
+    echo $CLIEXEC
+    ${CLIEXEC}
+}
+
 mw_venv(){
     cd ${PANEL_DIR} && source bin/activate
 }
@@ -622,6 +640,7 @@ case "$1" in
     'db') mw_connect_mysql;;
     'pgdb') mw_connect_pgdb;;
     'redis') mw_redis;;
+    'valkey')mw_valkey;;
     'mongodb') mw_mongodb;;
     'venv') mw_update_venv;;
     'clean_lib') mw_clean_lib;;

From e5585caa090293200092d2d1b76c36c69ab8c74d Mon Sep 17 00:00:00 2001
From: Mr Chen <midoks@163.com>
Date: Wed, 18 Dec 2024 12:20:42 +0800
Subject: [PATCH 2/2] Update version.py

---
 web/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/version.py b/web/version.py
index e6e3fa0d24..e78644ee3f 100644
--- a/web/version.py
+++ b/web/version.py
@@ -13,7 +13,7 @@
 # 应用程序版本号组件
 APP_RELEASE = 0
 APP_REVISION = 18
-APP_SMALL_VERSION = 1
+APP_SMALL_VERSION = 0
 
 # 应用程序版本后缀，例如“beta1”、“dev”。通常为空字符串GA发布
 APP_SUFFIX = ''