Merge pull request #647 from midoks/dev

valkey命令加入

cmd.md

@@ -7,6 +7,7 @@
 mw default	| 显示登录信息
 mw db 		| 快捷连接MySQL
 mw redis 	| 快捷连接Redis
+mw valkey 	| 快捷连接valkey
 mw mongodb 	| 快捷连接MongoDB
 mw pgdb 	| 快捷连接PostgreSQL
 ----------------------------------------

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;;

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 = ''