update nacos to V1.0.1

lvxiaomao · Jun 17, 2019 · 08db230 · 08db230
1 parent 90a1036
commit 08db230
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/zlt-register/nacos/.gitignore b/zlt-register/nacos/.gitignore
diff --git a/zlt-register/nacos/bin/startup.cmd b/zlt-register/nacos/bin/startup.cmd
@@ -14,7 +14,7 @@ rem limitations under the License.
 if not exist "%JAVA_HOME%\bin\java.exe" echo Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better! & EXIT /B 1
 set "JAVA=%JAVA_HOME%\bin\java.exe"
 
-setlocal
+setlocal enabledelayedexpansion
 
 set BASE_DIR=%~dp0
 rem added double quotation marks to avoid the issue caused by the folder names containing spaces.
@@ -24,20 +24,45 @@ set BASE_DIR="%BASE_DIR:~0,-5%"
 set DEFAULT_SEARCH_LOCATIONS="classpath:/,classpath:/config/,file:./,file:./config/"
 set CUSTOM_SEARCH_LOCATIONS=%DEFAULT_SEARCH_LOCATIONS%,file:%BASE_DIR%/conf/
 
+set MODE="standalone"
+set FUNCTION_MODE="all"
+set MODE_INDEX=-1
+set FUNCTION_MODE_INDEX=-1
 
+set i=0
+for %%a in (%*) do (
+   if "%%a" == "-m" ( set /a MODE_INDEX=!i!+1 )
+   if "%%a" == "-f" ( set /a FUNCTION_MODE_INDEX=!i!+1 )
+   set /a i+=1
+)
 
-if not "%2" == "cluster" (
+set i=0
+for %%a in (%*) do (
+   if %MODE_INDEX% == !i! ( set MODE="%%a" )
+   if %FUNCTION_MODE_INDEX% == !i! ( set FUNCTION_MODE="%%a" )
+   set /a i+=1
+)
+
+if %MODE% == "standalone" (
     set "JAVA_OPT=%JAVA_OPT% -Xms512m -Xmx512m -Xmn256m"
     set "JAVA_OPT=%JAVA_OPT% -Dnacos.standalone=true"
- ) else (
+) else (
     set "JAVA_OPT=%JAVA_OPT% -server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m"
     set "JAVA_OPT=%JAVA_OPT% -XX:-OmitStackTraceInFastThrow XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=%BASE_DIR%\logs\java_heapdump.hprof"
     set "JAVA_OPT=%JAVA_OPT% -XX:-UseLargePages"
- )
+)
+
+if %FUNCTION_MODE% == "config" (
+  set "JAVA_OPT=%JAVA_OPT% -Dnacos.functionMode=config"
+)
+if %FUNCTION_MODE% == "naming" (
+  set "JAVA_OPT=%JAVA_OPT% -Dnacos.functionMode=naming"
+)
+
 
-set "JAVA_OPT=%JAVA_OPT% -Xbootclasspath/a:%BASE_DIR%\plugins\cmdb"
+set "JAVA_OPT=%JAVA_OPT% -Xbootclasspath/a:%BASE_DIR%\plugins\cmdb:%BASE_DIR%\plugins\mysql"
 set "JAVA_OPT=%JAVA_OPT% -Dnacos.home=%BASE_DIR%"
-set "JAVA_OPT=%JAVA_OPT% -jar %BASE_DIR%\target\nacos-server.jar"
+set "JAVA_OPT=%JAVA_OPT% -Dloader.path=%BASE_DIR%/plugins/health -jar %BASE_DIR%\target\nacos-server.jar"
 set "JAVA_OPT=%JAVA_OPT% --spring.config.location=%CUSTOM_SEARCH_LOCATIONS%"
 set "JAVA_OPT=%JAVA_OPT% --logging.config=%BASE_DIR%/conf/nacos-logback.xml"
 

diff --git a/zlt-register/nacos/bin/startup.sh b/zlt-register/nacos/bin/startup.sh
@@ -102,10 +102,11 @@ else
 fi
 
 JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}"
-JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/nacos-server.jar"
+JAVA_OPT="${JAVA_OPT} -Dloader.path=${BASE_DIR}/plugins/health -jar ${BASE_DIR}/target/nacos-server.jar"
 JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}"
 JAVA_OPT="${JAVA_OPT} --spring.config.location=${CUSTOM_SEARCH_LOCATIONS}"
 JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/nacos-logback.xml"
+JAVA_OPT="${JAVA_OPT} --server.max-http-header-size=524288"
 
 if [ ! -d "${BASE_DIR}/logs" ]; then
   mkdir ${BASE_DIR}/logs

diff --git a/zlt-register/nacos/plugins/health/nacos-health-plugin-example-1.0.jar b/zlt-register/nacos/plugins/health/nacos-health-plugin-example-1.0.jar
diff --git a/zlt-register/nacos/target/nacos-server.jar b/zlt-register/nacos/target/nacos-server.jar