diff --git a/zlt-register/.gitignore b/zlt-register/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..9c9425806450fa346a1c31a5f54ba8050ff05e34 --- /dev/null +++ b/zlt-register/.gitignore @@ -0,0 +1,2 @@ +/target/ +*.iml \ No newline at end of file diff --git a/zlt-register/nacos/.gitignore b/zlt-register/nacos/.gitignore index e06bbe5ae02bc8da7d9b73165d7b24a202e47e4f..ef6df061dfc81651c9f9bca646277a5e427f39ee 100644 --- a/zlt-register/nacos/.gitignore +++ b/zlt-register/nacos/.gitignore @@ -1,2 +1,3 @@ /logs/ -/data/ \ No newline at end of file +/bin/logs/ +/bin/*.log \ No newline at end of file diff --git a/zlt-register/nacos/bin/derby.log b/zlt-register/nacos/bin/derby.log deleted file mode 100644 index 27dcb9a67b1c2c2bd8355a137c4b73370918dc75..0000000000000000000000000000000000000000 --- a/zlt-register/nacos/bin/derby.log +++ /dev/null @@ -1,13 +0,0 @@ ----------------------------------------------------------------- -Thu Jan 17 18:33:04 CST 2019: -Booting Derby version The Apache Software Foundation - Apache Derby - 10.10.1.1 - (1458268): instance a816c00e-0168-5b5f-13a8-00000fb16160 -on database directory D:\workspaces\projects\central-platform\zlt-register\nacos\data\derby-data with class loader org.springframework.boot.loader.LaunchedURLClassLoader@1d56ce6a -Loaded from jar:file:/D:/workspaces/projects/central-platform/zlt-register/nacos/target/nacos-server.jar!/BOOT-INF/lib/derby-10.10.1.1.jar!/ -java.vendor=Oracle Corporation -java.runtime.version=1.8.0_152-b16 -user.dir=D:\workspaces\projects\central-platform\zlt-register\nacos\bin -os.name=Windows 10 -os.arch=amd64 -os.version=10.0 -derby.system.home=null -Database Class Loader started - derby.database.classpath='' diff --git a/zlt-register/nacos/bin/startup.cmd b/zlt-register/nacos/bin/startup.cmd index 7d35eb4b94979773f43fa9d5d4f2fc9dcc7f6bac..0ace13f1371bc5db95d768ca1084cb130b57372a 100644 --- a/zlt-register/nacos/bin/startup.cmd +++ b/zlt-register/nacos/bin/startup.cmd @@ -1,4 +1,4 @@ -rem @echo off +@echo off rem Copyright 1999-2018 Alibaba Group Holding Ltd. rem Licensed under the Apache License, Version 2.0 (the "License"); rem you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ set CUSTOM_SEARCH_LOCATIONS=%DEFAULT_SEARCH_LOCATIONS%,file:%BASE_DIR%conf/ -if not ""%2"" == "cluster" ( +if not "%2" == "cluster" ( set "JAVA_OPT=%JAVA_OPT% -Xms512m -Xmx512m -Xmn256m" set "JAVA_OPT=%JAVA_OPT% -Dnacos.standalone=true" ) else ( @@ -34,12 +34,10 @@ if not ""%2"" == "cluster" ( set "JAVA_OPT=%JAVA_OPT% -XX:-UseLargePages" ) -set "JAVA_OPT=%JAVA_OPT% -Djava.ext.dirs=%BASE_DIR%\plugins\cmdb" +set "JAVA_OPT=%JAVA_OPT% -Xbootclasspath/a:%BASE_DIR%\plugins\cmdb" 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% --spring.config.location="%CUSTOM_SEARCH_LOCATIONS%"" set "JAVA_OPT=%JAVA_OPT% --logging.config="%BASE_DIR%/conf/nacos-logback.xml"" -echo "%JAVA%" %JAVA_OPT% %* - call "%JAVA%" %JAVA_OPT% %* diff --git a/zlt-register/nacos/bin/startup.sh b/zlt-register/nacos/bin/startup.sh index ae4bbe49a9b03b5ae0e0dad24db585b725317388..612d0591bb23d591190d70e9ac7577e4ee042f16 100644 --- a/zlt-register/nacos/bin/startup.sh +++ b/zlt-register/nacos/bin/startup.sh @@ -24,7 +24,7 @@ error_exit () [ ! -e "$JAVA_HOME/bin/java" ] && JAVA_HOME=/opt/taobao/java [ ! -e "$JAVA_HOME/bin/java" ] && error_exit "Please set the JAVA_HOME variable in your environment, We need java(x64)! jdk8 or later is better!" -export MODE="cluster" +export MODE="standalone" while getopts ":m:" opt do case $opt in @@ -58,12 +58,13 @@ fi 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" 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/cmdb" 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} -Djava.ext.dirs=${BASE_DIR}/plugins/cmdb" 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}" @@ -81,11 +82,11 @@ if [ ! -f "${BASE_DIR}/logs/start.out" ]; then fi if [[ "${MODE}" == "standalone" ]]; then - echo "nacos is starting" + echo "$JAVA ${JAVA_OPT}" > ${BASE_DIR}/logs/start.out 2>&1 & nohup $JAVA ${JAVA_OPT} >> ${BASE_DIR}/logs/start.out 2>&1 & echo "nacos is starting,you can check the ${BASE_DIR}/logs/start.out" else echo "$JAVA ${JAVA_OPT}" > ${BASE_DIR}/logs/start.out 2>&1 & nohup $JAVA ${JAVA_OPT} >> ${BASE_DIR}/logs/start.out 2>&1 & echo "nacos is starting,you can check the ${BASE_DIR}/logs/start.out" -fi \ No newline at end of file +fi diff --git a/zlt-register/nacos/conf/application.properties b/zlt-register/nacos/conf/application.properties index 9ee31fdf2b654f6b81401b6e791da0e479f41fcd..e0624f8dea1c391401034fa0a014ea5b21ca2b17 100644 --- a/zlt-register/nacos/conf/application.properties +++ b/zlt-register/nacos/conf/application.properties @@ -9,8 +9,32 @@ nacos.cmdb.eventTaskInterval=10 nacos.cmdb.labelTaskInterval=300 nacos.cmdb.loadDataAtStart=false -#db.num=2 -#db.url.0=jdbc:mysql://11.162.196.16:3306/nacos_devtest?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true -#db.url.1=jdbc:mysql://11.163.152.9:3306/nacos_devtest?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true -#db.user=nacos_devtest -#db.password=youdontknow + +# metrics for prometheus +#management.endpoints.web.exposure.include=* + +# metrics for elastic search +management.metrics.export.elastic.enabled=false +#management.metrics.export.elastic.host=http://localhost:9200 + +# metrics for influx +management.metrics.export.influx.enabled=false +#management.metrics.export.influx.db=springboot +#management.metrics.export.influx.uri=http://localhost:8086 +#management.metrics.export.influx.auto-create-db=true +#management.metrics.export.influx.consistency=one +#management.metrics.export.influx.compressed=true + +server.tomcat.accesslog.enabled=true +server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D +# default current work dir +server.tomcat.basedir= + +## spring security config +### turn off security +#spring.security.enabled=false +#management.security=false +#security.basic.enabled=false +#nacos.security.ignore.urls=/** + +nacos.security.ignore.urls=/,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/login,/v1/console/health,/v1/cs/**,/v1/ns/**,/v1/cmdb/**,/actuator/** diff --git a/zlt-register/nacos/conf/nacos-logback.xml b/zlt-register/nacos/conf/nacos-logback.xml index 3a74d3a27b6bee04a4ad300fa81837a9021da0d7..b16eaa8c1ac937d68180d3c9f63b6c5813f99598 100644 --- a/zlt-register/nacos/conf/nacos-logback.xml +++ b/zlt-register/nacos/conf/nacos-logback.xml @@ -58,9 +58,9 @@ true ${LOG_HOME}/naming-raft.log.%d{yyyy-MM-dd}.%i - 20MB + 1GB 15 - 128MB + 3GB true @@ -82,9 +82,9 @@ true ${LOG_HOME}/naming-event.log.%d{yyyy-MM-dd}.%i - 20MB + 1GB 15 - 128MB + 3GB true @@ -106,9 +106,9 @@ true ${LOG_HOME}/naming-push.log.%d{yyyy-MM-dd}.%i - 20MB + 1GB 15 - 128MB + 3GB true @@ -139,9 +139,9 @@ true ${LOG_HOME}/naming-performance.log.%d{yyyy-MM-dd}.%i - 50MB + 1GB 15 - 512MB + 3GB true @@ -241,9 +241,9 @@ true ${LOG_HOME}/naming-debug.log.%d{yyyy-MM-dd}.%i - 20MB + 1GB 15 - 128MB + 3GB true diff --git a/zlt-register/nacos/conf/nacos-mysql.sql b/zlt-register/nacos/conf/nacos-mysql.sql index 70f88f679fbbf1576aa75a208232d064fae701db..73bef7b769d274776df3d04cc6023254f34119b5 100644 --- a/zlt-register/nacos/conf/nacos-mysql.sql +++ b/zlt-register/nacos/conf/nacos-mysql.sql @@ -177,3 +177,18 @@ CREATE TABLE `tenant_info` ( UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), KEY `idx_tenant_id` (`tenant_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; + +CREATE TABLE users ( + username varchar(50) NOT NULL PRIMARY KEY, + password varchar(500) NOT NULL, + enabled boolean NOT NULL +); + +CREATE TABLE roles ( + username varchar(50) NOT NULL, + role varchar(50) NOT NULL +); + +INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/zlt-register/nacos/conf/schema.sql b/zlt-register/nacos/conf/schema.sql index 032bd4b819fd89d65436017170d93808dffe1baa..d635cfb7d6f373e743a24bbc33af218323b6a593 100644 --- a/zlt-register/nacos/conf/schema.sql +++ b/zlt-register/nacos/conf/schema.sql @@ -171,3 +171,18 @@ CREATE TABLE tenant_info ( constraint tenant_info_id_key PRIMARY KEY (id), constraint uk_tenant_info_kptenantid UNIQUE (kp,tenant_id)); CREATE INDEX tenant_info_tenant_id_idx ON tenant_info(tenant_id); + +CREATE TABLE users ( + username varchar(50) NOT NULL PRIMARY KEY, + password varchar(500) NOT NULL, + enabled boolean NOT NULL +); + +CREATE TABLE roles ( + username varchar(50) NOT NULL, + role varchar(50) NOT NULL +); + +INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); + +INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/zlt-register/nacos/derby.log b/zlt-register/nacos/derby.log deleted file mode 100644 index 3715cc677d7fc0e2440fc690bf861aeadda84f17..0000000000000000000000000000000000000000 --- a/zlt-register/nacos/derby.log +++ /dev/null @@ -1,13 +0,0 @@ ----------------------------------------------------------------- -Fri Jan 18 10:00:18 CST 2019: -Booting Derby version The Apache Software Foundation - Apache Derby - 10.10.1.1 - (1458268): instance a816c00e-0168-5eaf-fc87-0000114981c0 -on database directory D:\workspaces\projects\central-platform\zlt-register\nacos\data\derby-data with class loader org.springframework.boot.loader.LaunchedURLClassLoader@1d56ce6a -Loaded from jar:file:/D:/workspaces/projects/central-platform/zlt-register/nacos/target/nacos-server.jar!/BOOT-INF/lib/derby-10.10.1.1.jar!/ -java.vendor=Oracle Corporation -java.runtime.version=1.8.0_152-b16 -user.dir=D:\workspaces\projects\central-platform\zlt-register\nacos -os.name=Windows 10 -os.arch=amd64 -os.version=10.0 -derby.system.home=null -Database Class Loader started - derby.database.classpath='' diff --git a/zlt-register/nacos/target/nacos-server.jar b/zlt-register/nacos/target/nacos-server.jar index 46b7a5a1a940c9cc335e8d6c49eb4081c64e71c2..57782558a18082c0253eb99d9fa632e211b243a6 100644 Binary files a/zlt-register/nacos/target/nacos-server.jar and b/zlt-register/nacos/target/nacos-server.jar differ