fix some issue
This commit is contained in:
parent
b9154172bc
commit
ead7efddd1
@ -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}"
|
||||
|
3
env/nacos-embedded.env
vendored
3
env/nacos-embedded.env
vendored
@ -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
|
7
env/nacos-hostname.env
vendored
7
env/nacos-hostname.env
vendored
@ -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
|
||||
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
|
6
env/nacos-ip.env
vendored
6
env/nacos-ip.env
vendored
@ -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
|
||||
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
|
6
env/nacos-standlone-mysql.env
vendored
6
env/nacos-standlone-mysql.env
vendored
@ -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
|
||||
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
|
@ -1 +1 @@
|
||||
NACOS_VERSION=v2.2.1
|
||||
NACOS_VERSION=test
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user