From b983483aa60675a72b786b7d93668b28be1f21ea Mon Sep 17 00:00:00 2001
From: Baoyi Chen <chen.bao.yi@qq.com>
Date: Mon, 15 Mar 2021 11:43:15 +0800
Subject: [PATCH] v0.6.3

---
 CHANGELOG.md                  |  4 ++++
 src/main/assembly/bin/rct.cmd | 16 ++++++----------
 src/main/assembly/bin/rdt.cmd | 16 ++++++----------
 src/main/assembly/bin/ret.cmd | 16 ++++++----------
 src/main/assembly/bin/rmt.cmd | 16 ++++++----------
 src/main/assembly/bin/rst.cmd | 16 ++++++----------
 src/main/resources/.version   |  2 +-
 7 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f31018a..a1f15a2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 0.6.3
+
+fix windows cmd running failed bug.  
+
 ### 0.6.2
 
 support downgrade migration from redis 6.2 to 2.8.  
diff --git a/src/main/assembly/bin/rct.cmd b/src/main/assembly/bin/rct.cmd
index 764b4020..0809f895 100644
--- a/src/main/assembly/bin/rct.cmd
+++ b/src/main/assembly/bin/rct.cmd
@@ -43,16 +43,19 @@ goto error
 @REM ==== END VALIDATION ====
 
 :init
-for %%i in ("%RCT_HOME%\lib\*") do (
-	call :concat "%%i"
+setLocal EnableDelayedExpansion
+set CLASS_PATH="
+for %%i in ("%RCT_HOME%\lib\*.jar") do (
+    set CLASS_PATH=!CLASS_PATH!;%%i
 )
+set CLASS_PATH=!CLASS_PATH!"
 
 set LOG_DIR=%RCT_HOME%\log
 set CON_DIR=%RCT_HOME%\conf
 set LOG_FILE=%CON_DIR%\log4j2.xml
 set CON_FILE=%CON_DIR%\redis-rdb-cli.conf
 set MAIN_CLASS=com.moilioncircle.redis.rdb.cli.Rct
-set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%"
+set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%" -Dsun.stdout.encoding=UTF-8 -Dsun.err.encoding=UTF-8 -Dfile.encoding=UTF-8
 
 "%JAVACMD%" %RCT_OPS% -cp %CLASS_PATH% %MAIN_CLASS% %*
 if ERRORLEVEL 1 goto error
@@ -65,10 +68,3 @@ set ERROR_CODE=1
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
 cmd /C exit /B %ERROR_CODE%
-
-:concat
-if not defined CLASS_PATH (
-  set CLASS_PATH="%~1"
-) else (
-  set CLASS_PATH=%CLASS_PATH%;"%~1"
-)
\ No newline at end of file
diff --git a/src/main/assembly/bin/rdt.cmd b/src/main/assembly/bin/rdt.cmd
index 2eafeaaa..a80fd0b4 100644
--- a/src/main/assembly/bin/rdt.cmd
+++ b/src/main/assembly/bin/rdt.cmd
@@ -43,16 +43,19 @@ goto error
 @REM ==== END VALIDATION ====
 
 :init
-for %%i in ("%RCT_HOME%\lib\*") do (
-	call :concat "%%i"
+setLocal EnableDelayedExpansion
+set CLASS_PATH="
+for %%i in ("%RCT_HOME%\lib\*.jar") do (
+    set CLASS_PATH=!CLASS_PATH!;%%i
 )
+set CLASS_PATH=!CLASS_PATH!"
 
 set LOG_DIR=%RCT_HOME%\log
 set CON_DIR=%RCT_HOME%\conf
 set LOG_FILE=%CON_DIR%\log4j2.xml
 set CON_FILE=%CON_DIR%\redis-rdb-cli.conf
 set MAIN_CLASS=com.moilioncircle.redis.rdb.cli.Rdt
-set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%"
+set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%" -Dsun.stdout.encoding=UTF-8 -Dsun.err.encoding=UTF-8 -Dfile.encoding=UTF-8
 
 "%JAVACMD%" %RCT_OPS% -cp %CLASS_PATH% %MAIN_CLASS% %*
 if ERRORLEVEL 1 goto error
@@ -65,10 +68,3 @@ set ERROR_CODE=1
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
 cmd /C exit /B %ERROR_CODE%
-
-:concat
-if not defined CLASS_PATH (
-  set CLASS_PATH="%~1"
-) else (
-  set CLASS_PATH=%CLASS_PATH%;"%~1"
-)
\ No newline at end of file
diff --git a/src/main/assembly/bin/ret.cmd b/src/main/assembly/bin/ret.cmd
index 3ba66f7f..78819461 100644
--- a/src/main/assembly/bin/ret.cmd
+++ b/src/main/assembly/bin/ret.cmd
@@ -43,16 +43,19 @@ goto error
 @REM ==== END VALIDATION ====
 
 :init
-for %%i in ("%RCT_HOME%\lib\*") do (
-	call :concat "%%i"
+setLocal EnableDelayedExpansion
+set CLASS_PATH="
+for %%i in ("%RCT_HOME%\lib\*.jar") do (
+    set CLASS_PATH=!CLASS_PATH!;%%i
 )
+set CLASS_PATH=!CLASS_PATH!"
 
 set LOG_DIR=%RCT_HOME%\log
 set CON_DIR=%RCT_HOME%\conf
 set LOG_FILE=%CON_DIR%\log4j2.xml
 set CON_FILE=%CON_DIR%\redis-rdb-cli.conf
 set MAIN_CLASS=com.moilioncircle.redis.rdb.cli.Ret
-set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%"
+set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%" -Dsun.stdout.encoding=UTF-8 -Dsun.err.encoding=UTF-8 -Dfile.encoding=UTF-8
 
 "%JAVACMD%" %RCT_OPS% -cp %CLASS_PATH% %MAIN_CLASS% %*
 if ERRORLEVEL 1 goto error
@@ -65,10 +68,3 @@ set ERROR_CODE=1
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
 cmd /C exit /B %ERROR_CODE%
-
-:concat
-if not defined CLASS_PATH (
-  set CLASS_PATH="%~1"
-) else (
-  set CLASS_PATH=%CLASS_PATH%;"%~1"
-)
\ No newline at end of file
diff --git a/src/main/assembly/bin/rmt.cmd b/src/main/assembly/bin/rmt.cmd
index 0ae8a779..195e1d05 100644
--- a/src/main/assembly/bin/rmt.cmd
+++ b/src/main/assembly/bin/rmt.cmd
@@ -43,16 +43,19 @@ goto error
 @REM ==== END VALIDATION ====
 
 :init
-for %%i in ("%RCT_HOME%\lib\*") do (
-	call :concat "%%i"
+setLocal EnableDelayedExpansion
+set CLASS_PATH="
+for %%i in ("%RCT_HOME%\lib\*.jar") do (
+    set CLASS_PATH=!CLASS_PATH!;%%i
 )
+set CLASS_PATH=!CLASS_PATH!"
 
 set LOG_DIR=%RCT_HOME%\log
 set CON_DIR=%RCT_HOME%\conf
 set LOG_FILE=%CON_DIR%\log4j2.xml
 set CON_FILE=%CON_DIR%\redis-rdb-cli.conf
 set MAIN_CLASS=com.moilioncircle.redis.rdb.cli.Rmt
-set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%"
+set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%" -Dsun.stdout.encoding=UTF-8 -Dsun.err.encoding=UTF-8 -Dfile.encoding=UTF-8
 
 "%JAVACMD%" %RCT_OPS% -cp %CLASS_PATH% %MAIN_CLASS% %*
 if ERRORLEVEL 1 goto error
@@ -65,10 +68,3 @@ set ERROR_CODE=1
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
 cmd /C exit /B %ERROR_CODE%
-
-:concat
-if not defined CLASS_PATH (
-  set CLASS_PATH="%~1"
-) else (
-  set CLASS_PATH=%CLASS_PATH%;"%~1"
-)
\ No newline at end of file
diff --git a/src/main/assembly/bin/rst.cmd b/src/main/assembly/bin/rst.cmd
index 2ad6aa47..bb794874 100644
--- a/src/main/assembly/bin/rst.cmd
+++ b/src/main/assembly/bin/rst.cmd
@@ -43,16 +43,19 @@ goto error
 @REM ==== END VALIDATION ====
 
 :init
-for %%i in ("%RCT_HOME%\lib\*") do (
-	call :concat "%%i"
+setLocal EnableDelayedExpansion
+set CLASS_PATH="
+for %%i in ("%RCT_HOME%\lib\*.jar") do (
+    set CLASS_PATH=!CLASS_PATH!;%%i
 )
+set CLASS_PATH=!CLASS_PATH!"
 
 set LOG_DIR=%RCT_HOME%\log
 set CON_DIR=%RCT_HOME%\conf
 set LOG_FILE=%CON_DIR%\log4j2.xml
 set CON_FILE=%CON_DIR%\redis-rdb-cli.conf
 set MAIN_CLASS=com.moilioncircle.redis.rdb.cli.Rst
-set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%"
+set RCT_OPS=-server -XX:+UseG1GC -XX:MaxGCPauseMillis=20 -XX:+ExitOnOutOfMemoryError -XX:InitiatingHeapOccupancyPercent=35 -XX:+ExplicitGCInvokesConcurrent -Dlog4j.configurationFile="%LOG_FILE%" -Dcli.log.path="%LOG_DIR%" -Dconf="%CON_FILE%" -Drct.home="%RCT_HOME%" -Dsun.stdout.encoding=UTF-8 -Dsun.err.encoding=UTF-8 -Dfile.encoding=UTF-8
 
 "%JAVACMD%" %RCT_OPS% -cp %CLASS_PATH% %MAIN_CLASS% %*
 if ERRORLEVEL 1 goto error
@@ -65,10 +68,3 @@ set ERROR_CODE=1
 @endlocal & set ERROR_CODE=%ERROR_CODE%
 
 cmd /C exit /B %ERROR_CODE%
-
-:concat
-if not defined CLASS_PATH (
-  set CLASS_PATH="%~1"
-) else (
-  set CLASS_PATH=%CLASS_PATH%;"%~1"
-)
\ No newline at end of file
diff --git a/src/main/resources/.version b/src/main/resources/.version
index f420d704..9885725d 100644
--- a/src/main/resources/.version
+++ b/src/main/resources/.version
@@ -1 +1 @@
-v0.6.2
\ No newline at end of file
+v0.6.3
\ No newline at end of file