diff --git a/build/bin/docker-startup.sh b/build/bin/docker-startup.sh index d88cf16..04b995e 100755 --- a/build/bin/docker-startup.sh +++ b/build/bin/docker-startup.sh @@ -85,13 +85,13 @@ JAVA_OPT="${JAVA_OPT} -Dnacos.member.list=${MEMBER_LIST}" JAVA_MAJOR_VERSION=$($JAVA -version 2>&1 | sed -E -n 's/.* version "([0-9]*).*$/\1/p') if [[ "$JAVA_MAJOR_VERSION" -ge "9" ]]; then - JAVA_OPT="${JAVA_OPT} -cp .:${BASE_DIR}/plugins/cmdb/*.jar:${BASE_DIR}/plugins/mysql/*.jar" JAVA_OPT="${JAVA_OPT} -Xlog:gc*:file=${BASE_DIR}/logs/nacos_gc.log:time,tags:filecount=10,filesize=102400" else - JAVA_OPT="${JAVA_OPT} -Djava.ext.dirs=${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${BASE_DIR}/plugins/health:${BASE_DIR}/plugins/cmdb:${BASE_DIR}/plugins/mysql" + JAVA_OPT_EXT_FIX="-Djava.ext.dirs=${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext" JAVA_OPT="${JAVA_OPT} -Xloggc:${BASE_DIR}/logs/nacos_gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M" fi +JAVA_OPT="${JAVA_OPT} -Dloader.path=${BASE_DIR}/plugins,${BASE_DIR}/plugins/health,${BASE_DIR}/plugins/cmdb,${BASE_DIR}/plugins/selector" JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}" JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/nacos-server.jar" JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}" diff --git a/env/nacos-embedded.env b/env/nacos-embedded.env index 2bd3b6f..013fab3 100644 --- a/env/nacos-embedded.env +++ b/env/nacos-embedded.env @@ -7,3 +7,6 @@ MYSQL_SERVICE_DB_NAME=nacos_devtest MYSQL_SERVICE_PORT=3306 MYSQL_SERVICE_USER=nacos MYSQL_SERVICE_PASSWORD=nacos +NACOS_AUTH_IDENTITY_KEY=2222 +NACOS_AUTH_IDENTITY_VALUE=2xxx +NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 \ No newline at end of file diff --git a/env/nacos-hostname.env b/env/nacos-hostname.env index 96f1788..47c5d33 100644 --- a/env/nacos-hostname.env +++ b/env/nacos-hostname.env @@ -1,4 +1,3 @@ -#nacos dev env PREFER_HOST_MODE=hostname NACOS_SERVERS=nacos1:8848 nacos2:8849 nacos3:8850 SPRING_DATASOURCE_PLATFORM=mysql @@ -7,4 +6,8 @@ MYSQL_SERVICE_DB_NAME=nacos_devtest MYSQL_SERVICE_PORT=3306 MYSQL_SERVICE_USER=nacos MYSQL_SERVICE_PASSWORD=nacos -MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true \ No newline at end of file +MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true +NACOS_AUTH_IDENTITY_KEY=2222 +NACOS_AUTH_IDENTITY_VALUE=2xxx +NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 +SPRING_DATASOURCE_PLATFORM=mysql \ No newline at end of file diff --git a/env/nacos-ip.env b/env/nacos-ip.env index 28c3b41..62bd783 100644 --- a/env/nacos-ip.env +++ b/env/nacos-ip.env @@ -6,4 +6,8 @@ MYSQL_SERVICE_DB_NAME=nacos_devtest MYSQL_SERVICE_PORT=3306 MYSQL_SERVICE_USER=nacos MYSQL_SERVICE_PASSWORD=nacos -MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true \ No newline at end of file +MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true +NACOS_AUTH_IDENTITY_KEY=2222 +NACOS_AUTH_IDENTITY_VALUE=2xxx +NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 +SPRING_DATASOURCE_PLATFORM=mysql \ No newline at end of file diff --git a/env/nacos-standlone-mysql.env b/env/nacos-standlone-mysql.env index 993a9a0..d47098b 100644 --- a/env/nacos-standlone-mysql.env +++ b/env/nacos-standlone-mysql.env @@ -6,4 +6,8 @@ MYSQL_SERVICE_DB_NAME=nacos_devtest MYSQL_SERVICE_PORT=3306 MYSQL_SERVICE_USER=nacos MYSQL_SERVICE_PASSWORD=nacos -MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true \ No newline at end of file +MYSQL_SERVICE_DB_PARAM=characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true +NACOS_AUTH_IDENTITY_KEY=2222 +NACOS_AUTH_IDENTITY_VALUE=2xxx +NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 +SPRING_DATASOURCE_PLATFORM=mysql \ No newline at end of file diff --git a/example/.env b/example/.env index 5f66880..789157b 100644 --- a/example/.env +++ b/example/.env @@ -1 +1 @@ -NACOS_VERSION=v2.2.1 +NACOS_VERSION=test diff --git a/example/cluster-embedded.yaml b/example/cluster-embedded.yaml index f2d93fb..9e30919 100644 --- a/example/cluster-embedded.yaml +++ b/example/cluster-embedded.yaml @@ -9,8 +9,8 @@ services: ports: - "7848:7848" - "8848:8848" - - "9848:9848" - - "9849:9849" + - "9868:9848" + - "9850:9849" env_file: - ../env/nacos-embedded.env restart: always @@ -24,8 +24,8 @@ services: ports: - "7849:7848" - "8849:8848" - - "9849:9848" - - "9850:9849" + - "9869:9848" + - "9851:9849" env_file: - ../env/nacos-embedded.env restart: always @@ -38,8 +38,8 @@ services: ports: - "7850:7848" - "8850:8848" - - "9850:9848" - - "9851:9849" + - "9870:9848" + - "9852:9849" env_file: - ../env/nacos-embedded.env restart: always diff --git a/example/cluster-hostname.yaml b/example/cluster-hostname.yaml index d1902bd..6036dea 100644 --- a/example/cluster-hostname.yaml +++ b/example/cluster-hostname.yaml @@ -9,8 +9,8 @@ services: ports: - "7848:7848" - "8848:8848" - - "9848:9848" - - "9849:9849" + - "9868:9848" + - "9850:9849" env_file: - ../env/nacos-hostname.env restart: always @@ -27,8 +27,8 @@ services: ports: - "7849:7848" - "8849:8848" - - "9849:9848" - - "9850:9849" + - "9869:9848" + - "9851:9849" env_file: - ../env/nacos-hostname.env restart: always @@ -44,8 +44,8 @@ services: ports: - "7850:7848" - "8850:8848" - - "9850:9848" - - "9851:9849" + - "9870:9848" + - "9852:9849" env_file: - ../env/nacos-hostname.env restart: always