提交 880b599b 编写于 作者: zlt2000's avatar zlt2000

升级zlt-register/nacos到1.4.1

上级 60c4b7a2
#!/bin/sh #!/bin/bash
# Copyright 1999-2018 Alibaba Group Holding Ltd. # Copyright 1999-2018 Alibaba Group Holding Ltd.
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
......
...@@ -21,10 +21,9 @@ rem added double quotation marks to avoid the issue caused by the folder names c ...@@ -21,10 +21,9 @@ rem added double quotation marks to avoid the issue caused by the folder names c
rem removed the last 5 chars(which means \bin\) to get the base DIR. rem removed the last 5 chars(which means \bin\) to get the base DIR.
set BASE_DIR="%BASE_DIR:~0,-5%" set BASE_DIR="%BASE_DIR:~0,-5%"
set DEFAULT_SEARCH_LOCATIONS="classpath:/,classpath:/config/,file:./,file:./config/" set CUSTOM_SEARCH_LOCATIONS=file:%BASE_DIR%/conf/
set CUSTOM_SEARCH_LOCATIONS=%DEFAULT_SEARCH_LOCATIONS%,file:%BASE_DIR%/conf/
set MODE="standalone" set MODE="cluster"
set FUNCTION_MODE="all" set FUNCTION_MODE="all"
set SERVER=nacos-server set SERVER=nacos-server
set MODE_INDEX=-1 set MODE_INDEX=-1
...@@ -52,30 +51,45 @@ for %%a in (%*) do ( ...@@ -52,30 +51,45 @@ for %%a in (%*) do (
set /a i+=1 set /a i+=1
) )
rem if nacos startup mode is standalone
if %MODE% == "standalone" ( if %MODE% == "standalone" (
set "JAVA_OPT=%JAVA_OPT% -Xms512m -Xmx512m -Xmn256m" echo "nacos is starting with standalone"
set "JAVA_OPT=%JAVA_OPT% -Dnacos.standalone=true" set "NACOS_OPTS=-Dnacos.standalone=true"
) else ( set "NACOS_JVM_OPTS=-Xms512m -Xmx512m -Xmn256m"
)
rem if nacos startup mode is cluster
if %MODE% == "cluster" (
echo "nacos is starting with cluster"
if %EMBEDDED_STORAGE% == "embedded" ( if %EMBEDDED_STORAGE% == "embedded" (
set "JAVA_OPT=%JAVA_OPT% -DembeddedStorage=true" set "NACOS_OPTS=-DembeddedStorage=true"
) )
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 "NACOS_JVM_OPTS=-server -Xms2g -Xmx2g -Xmn1g -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=320m -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=%BASE_DIR%\logs\java_heapdump.hprof -XX:-UseLargePages"
set "JAVA_OPT=%JAVA_OPT% -XX:-UseLargePages"
) )
rem set nacos's functionMode
if %FUNCTION_MODE% == "config" ( if %FUNCTION_MODE% == "config" (
set "JAVA_OPT=%JAVA_OPT% -Dnacos.functionMode=config" set "NACOS_OPTS=%NACOS_OPTS% -Dnacos.functionMode=config"
) )
if %FUNCTION_MODE% == "naming" ( if %FUNCTION_MODE% == "naming" (
set "JAVA_OPT=%JAVA_OPT% -Dnacos.functionMode=naming" set "NACOS_OPTS=%NACOS_OPTS% -Dnacos.functionMode=naming"
) )
set "JAVA_OPT=%JAVA_OPT% -Dloader.path=%BASE_DIR%/plugins/health,%BASE_DIR%/plugins/cmdb" rem set nacos options
set "NACOS_OPTS=%NACOS_OPTS% -Dloader.path=%BASE_DIR%/plugins/health,%BASE_DIR%/plugins/cmdb"
set "NACOS_OPTS=%NACOS_OPTS% -Dnacos.home=%BASE_DIR%"
set "NACOS_OPTS=%NACOS_OPTS% -jar %BASE_DIR%\target\%SERVER%.jar"
rem set nacos spring config location
set "NACOS_CONFIG_OPTS=--spring.config.additional-location=%CUSTOM_SEARCH_LOCATIONS%"
rem set nacos log4j file location
set "NACOS_LOG4J_OPTS=--logging.config=%BASE_DIR%/conf/nacos-logback.xml"
set "JAVA_OPT=%JAVA_OPT% -Dnacos.home=%BASE_DIR%" set COMMAND="%JAVA%" %NACOS_JVM_OPTS% %NACOS_OPTS% %NACOS_CONFIG_OPTS% %NACOS_LOG4J_OPTS% nacos.nacos %*
set "JAVA_OPT=%JAVA_OPT% -jar %BASE_DIR%\target\%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"
call "%JAVA%" %JAVA_OPT% nacos.nacos %* rem start nacos command
%COMMAND%
#!/bin/sh #!/bin/bash
# Copyright 1999-2018 Alibaba Group Holding Ltd. # Copyright 1999-2018 Alibaba Group Holding Ltd.
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
...@@ -78,8 +78,7 @@ done ...@@ -78,8 +78,7 @@ done
export JAVA_HOME export JAVA_HOME
export JAVA="$JAVA_HOME/bin/java" export JAVA="$JAVA_HOME/bin/java"
export BASE_DIR=`cd $(dirname $0)/..; pwd` export BASE_DIR=`cd $(dirname $0)/..; pwd`
export DEFAULT_SEARCH_LOCATIONS="classpath:/,classpath:/config/,file:./,file:./config/" export CUSTOM_SEARCH_LOCATIONS=file:${BASE_DIR}/conf/
export CUSTOM_SEARCH_LOCATIONS=${DEFAULT_SEARCH_LOCATIONS},file:${BASE_DIR}/conf/
#=========================================================================================== #===========================================================================================
# JVM Configuration # JVM Configuration
...@@ -117,7 +116,7 @@ JAVA_OPT="${JAVA_OPT} -Dloader.path=${BASE_DIR}/plugins/health,${BASE_DIR}/plugi ...@@ -117,7 +116,7 @@ JAVA_OPT="${JAVA_OPT} -Dloader.path=${BASE_DIR}/plugins/health,${BASE_DIR}/plugi
JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}" JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}"
JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar" JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}" JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}"
JAVA_OPT="${JAVA_OPT} --spring.config.location=${CUSTOM_SEARCH_LOCATIONS}" JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CUSTOM_SEARCH_LOCATIONS}"
JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/nacos-logback.xml" JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/nacos-logback.xml"
JAVA_OPT="${JAVA_OPT} --server.max-http-header-size=524288" JAVA_OPT="${JAVA_OPT} --server.max-http-header-size=524288"
......
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
ALTER TABLE `config_info_tag`
MODIFY COLUMN `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip' AFTER `src_user`;
ALTER TABLE `his_config_info`
MODIFY COLUMN `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL AFTER `src_user`;
ALTER TABLE `config_info`
MODIFY COLUMN `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip' AFTER `src_user`;
ALTER TABLE `config_info_beta`
MODIFY COLUMN `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip' AFTER `src_user`;
\ No newline at end of file
...@@ -37,9 +37,14 @@ server.port=8848 ...@@ -37,9 +37,14 @@ server.port=8848
### Connect URL of DB: ### Connect URL of DB:
# db.url.0=jdbc:mysql://127.0.0.1:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC # db.url.0=jdbc:mysql://127.0.0.1:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
# db.user=nacos # db.user.0=nacos
# db.password=nacos # db.password.0=nacos
### Connection pool configuration: hikariCP
db.pool.config.connectionTimeout=30000
db.pool.config.validationTimeout=10000
db.pool.config.maximumPoolSize=20
db.pool.config.minimumIdle=2
#*************** Naming Module Related Configurations ***************# #*************** Naming Module Related Configurations ***************#
### Data dispatch task execution period in milliseconds: ### Data dispatch task execution period in milliseconds:
...@@ -98,7 +103,7 @@ management.metrics.export.influx.enabled=false ...@@ -98,7 +103,7 @@ management.metrics.export.influx.enabled=false
server.tomcat.accesslog.enabled=true server.tomcat.accesslog.enabled=true
### The access log pattern: ### The access log pattern:
server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
### The directory of access log: ### The directory of access log:
server.tomcat.basedir= server.tomcat.basedir=
...@@ -109,7 +114,7 @@ server.tomcat.basedir= ...@@ -109,7 +114,7 @@ server.tomcat.basedir=
#spring.security.enabled=false #spring.security.enabled=false
### The ignore urls of auth, is deprecated in 1.2.0: ### The ignore urls of auth, is deprecated in 1.2.0:
nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
### The auth system to use, currently only 'nacos' is supported: ### The auth system to use, currently only 'nacos' is supported:
nacos.core.auth.system.type=nacos nacos.core.auth.system.type=nacos
...@@ -126,6 +131,13 @@ nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789 ...@@ -126,6 +131,13 @@ nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789
### Turn on/off caching of auth information. By turning on this switch, the update of auth information would have a 15 seconds delay. ### Turn on/off caching of auth information. By turning on this switch, the update of auth information would have a 15 seconds delay.
nacos.core.auth.caching.enabled=true nacos.core.auth.caching.enabled=true
### Since 1.4.1, Turn on/off white auth for user-agent: nacos-server, only for upgrade from old version.
nacos.core.auth.enable.userAgentAuthWhite=true
### Since 1.4.1, worked when nacos.core.auth.enabled=true and nacos.core.auth.enable.userAgentAuthWhite=false.
### The two properties is the white list for auth and used by identity the request from other server.
nacos.core.auth.server.identity.key=
nacos.core.auth.server.identity.value=
#*************** Istio Related Configurations ***************# #*************** Istio Related Configurations ***************#
### If turn on the MCP server: ### If turn on the MCP server:
...@@ -148,15 +160,18 @@ nacos.istio.mcp.server.enabled=false ...@@ -148,15 +160,18 @@ nacos.istio.mcp.server.enabled=false
### MemberLookup ### MemberLookup
### Addressing pattern category, If set, the priority is highest ### Addressing pattern category, If set, the priority is highest
# nacos.core.member.lookup.type=[file,address-server,discovery] # nacos.core.member.lookup.type=[file,address-server]
## Set the cluster list with a configuration file or command-line argument ## Set the cluster list with a configuration file or command-line argument
# nacos.member.list=192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809 # nacos.member.list=192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809
## for DiscoveryMemberLookup
# If you want to use cluster node self-discovery, turn this parameter on
# nacos.member.discovery=false
## for AddressServerMemberLookup ## for AddressServerMemberLookup
# Maximum number of retries to query the address server upon initialization # Maximum number of retries to query the address server upon initialization
# nacos.core.address-server.retry=5 # nacos.core.address-server.retry=5
## Server domain name address of [address-server] mode
# address.server.domain=jmenv.tbsite.net
## Server port of [address-server] mode
# address.server.port=8080
## Request address of [address-server] mode
# address.server.url=/nacos/serverlist
#*************** JRaft Related Configurations ***************# #*************** JRaft Related Configurations ***************#
...@@ -164,13 +179,11 @@ nacos.istio.mcp.server.enabled=false ...@@ -164,13 +179,11 @@ nacos.istio.mcp.server.enabled=false
# nacos.core.protocol.raft.data.election_timeout_ms=5000 # nacos.core.protocol.raft.data.election_timeout_ms=5000
### Sets the amount of time the Raft snapshot will execute periodically, default is 30 minute ### Sets the amount of time the Raft snapshot will execute periodically, default is 30 minute
# nacos.core.protocol.raft.data.snapshot_interval_secs=30 # nacos.core.protocol.raft.data.snapshot_interval_secs=30
### Requested retries, default value is 1
# nacos.core.protocol.raft.data.request_failoverRetries=1
### raft internal worker threads ### raft internal worker threads
# nacos.core.protocol.raft.data.core_thread_num=8 # nacos.core.protocol.raft.data.core_thread_num=8
### Number of threads required for raft business request processing ### Number of threads required for raft business request processing
# nacos.core.protocol.raft.data.cli_service_thread_num=4 # nacos.core.protocol.raft.data.cli_service_thread_num=4
### raft linear read strategy, defaults to index ### raft linear read strategy. Safe linear reads are used by default, that is, the Leader tenure is confirmed by heartbeat
# nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe # nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe
### rpc request timeout, default 5 seconds ### rpc request timeout, default 5 seconds
# nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000 # nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000
...@@ -29,7 +29,7 @@ server.port=8848 ...@@ -29,7 +29,7 @@ server.port=8848
#*************** Config Module Related Configurations ***************# #*************** Config Module Related Configurations ***************#
### If user MySQL as datasource: ### If use MySQL as datasource:
# spring.datasource.platform=mysql # spring.datasource.platform=mysql
### Count of DB: ### Count of DB:
...@@ -37,8 +37,8 @@ server.port=8848 ...@@ -37,8 +37,8 @@ server.port=8848
### Connect URL of DB: ### Connect URL of DB:
# db.url.0=jdbc:mysql://127.0.0.1:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC # db.url.0=jdbc:mysql://127.0.0.1:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC
# db.user=nacos # db.user.0=nacos
# db.password=nacos # db.password.0=nacos
#*************** Naming Module Related Configurations ***************# #*************** Naming Module Related Configurations ***************#
...@@ -98,7 +98,7 @@ management.metrics.export.influx.enabled=false ...@@ -98,7 +98,7 @@ management.metrics.export.influx.enabled=false
server.tomcat.accesslog.enabled=true server.tomcat.accesslog.enabled=true
### The access log pattern: ### The access log pattern:
server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
### The directory of access log: ### The directory of access log:
server.tomcat.basedir= server.tomcat.basedir=
...@@ -109,7 +109,7 @@ server.tomcat.basedir= ...@@ -109,7 +109,7 @@ server.tomcat.basedir=
#spring.security.enabled=false #spring.security.enabled=false
### The ignore urls of auth, is deprecated in 1.2.0: ### The ignore urls of auth, is deprecated in 1.2.0:
nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
### The auth system to use, currently only 'nacos' is supported: ### The auth system to use, currently only 'nacos' is supported:
nacos.core.auth.system.type=nacos nacos.core.auth.system.type=nacos
...@@ -148,15 +148,18 @@ nacos.istio.mcp.server.enabled=false ...@@ -148,15 +148,18 @@ nacos.istio.mcp.server.enabled=false
### MemberLookup ### MemberLookup
### Addressing pattern category, If set, the priority is highest ### Addressing pattern category, If set, the priority is highest
# nacos.core.member.lookup.type=[file,address-server,discovery] # nacos.core.member.lookup.type=[file,address-server]
## Set the cluster list with a configuration file or command-line argument ## Set the cluster list with a configuration file or command-line argument
# nacos.member.list=192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809 # nacos.member.list=192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809
## for DiscoveryMemberLookup
# If you want to use cluster node self-discovery, turn this parameter on
# nacos.member.discovery=false
## for AddressServerMemberLookup ## for AddressServerMemberLookup
# Maximum number of retries to query the address server upon initialization # Maximum number of retries to query the address server upon initialization
# nacos.core.address-server.retry=5 # nacos.core.address-server.retry=5
## Server domain name address of [address-server] mode
# address.server.domain=jmenv.tbsite.net
## Server port of [address-server] mode
# address.server.port=8080
## Request address of [address-server] mode
# address.server.url=/nacos/serverlist
#*************** JRaft Related Configurations ***************# #*************** JRaft Related Configurations ***************#
...@@ -164,13 +167,11 @@ nacos.istio.mcp.server.enabled=false ...@@ -164,13 +167,11 @@ nacos.istio.mcp.server.enabled=false
# nacos.core.protocol.raft.data.election_timeout_ms=5000 # nacos.core.protocol.raft.data.election_timeout_ms=5000
### Sets the amount of time the Raft snapshot will execute periodically, default is 30 minute ### Sets the amount of time the Raft snapshot will execute periodically, default is 30 minute
# nacos.core.protocol.raft.data.snapshot_interval_secs=30 # nacos.core.protocol.raft.data.snapshot_interval_secs=30
### Requested retries, default value is 1
# nacos.core.protocol.raft.data.request_failoverRetries=1
### raft internal worker threads ### raft internal worker threads
# nacos.core.protocol.raft.data.core_thread_num=8 # nacos.core.protocol.raft.data.core_thread_num=8
### Number of threads required for raft business request processing ### Number of threads required for raft business request processing
# nacos.core.protocol.raft.data.cli_service_thread_num=4 # nacos.core.protocol.raft.data.cli_service_thread_num=4
### raft linear read strategy, defaults to index ### raft linear read strategy. Safe linear reads are used by default, that is, the Leader tenure is confirmed by heartbeat
# nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe # nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe
### rpc request timeout, default 5 seconds ### rpc request timeout, default 5 seconds
# nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000 # nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000
...@@ -614,17 +614,17 @@ ...@@ -614,17 +614,17 @@
</logger> </logger>
</springProfile> </springProfile>
<logger name="com.alibaba.nacos.core.code.StartingSpringApplicationRunListener"> <logger name="com.alibaba.nacos.core.listener.StartingApplicationListener">
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
<level value="INFO"/> <level value="INFO"/>
</logger> </logger>
<logger name="com.alibaba.nacos.core.notify.NotifyCenter"> <logger name="com.alibaba.nacos.common.notify.NotifyCenter">
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
<level value="INFO"/> <level value="INFO"/>
</logger> </logger>
<logger name="com.alibaba.nacos.core.file.WatchFileCenter"> <logger name="com.alibaba.nacos.sys.file.WatchFileCenter">
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
<level value="INFO"/> <level value="INFO"/>
</logger> </logger>
......
...@@ -27,7 +27,7 @@ CREATE TABLE `config_info` ( ...@@ -27,7 +27,7 @@ CREATE TABLE `config_info` (
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`src_user` text COMMENT 'source user', `src_user` text COMMENT 'source user',
`src_ip` varchar(20) DEFAULT NULL COMMENT 'source ip', `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
`app_name` varchar(128) DEFAULT NULL, `app_name` varchar(128) DEFAULT NULL,
`tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
`c_desc` varchar(256) DEFAULT NULL, `c_desc` varchar(256) DEFAULT NULL,
...@@ -72,7 +72,7 @@ CREATE TABLE `config_info_beta` ( ...@@ -72,7 +72,7 @@ CREATE TABLE `config_info_beta` (
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`src_user` text COMMENT 'source user', `src_user` text COMMENT 'source user',
`src_ip` varchar(20) DEFAULT NULL COMMENT 'source ip', `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
`tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`)
...@@ -94,7 +94,7 @@ CREATE TABLE `config_info_tag` ( ...@@ -94,7 +94,7 @@ CREATE TABLE `config_info_tag` (
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`src_user` text COMMENT 'source user', `src_user` text COMMENT 'source user',
`src_ip` varchar(20) DEFAULT NULL COMMENT 'source ip', `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag';
...@@ -150,7 +150,7 @@ CREATE TABLE `his_config_info` ( ...@@ -150,7 +150,7 @@ CREATE TABLE `his_config_info` (
`gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
`gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
`src_user` text, `src_user` text,
`src_ip` varchar(20) DEFAULT NULL, `src_ip` varchar(50) DEFAULT NULL,
`op_type` char(10) DEFAULT NULL, `op_type` char(10) DEFAULT NULL,
`tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段',
PRIMARY KEY (`nid`), PRIMARY KEY (`nid`),
......
...@@ -27,7 +27,7 @@ CREATE TABLE config_info ( ...@@ -27,7 +27,7 @@ CREATE TABLE config_info (
gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00', gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00', gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
src_user varchar(128) DEFAULT NULL, src_user varchar(128) DEFAULT NULL,
src_ip varchar(20) DEFAULT NULL, src_ip varchar(50) DEFAULT NULL,
c_desc varchar(256) DEFAULT NULL, c_desc varchar(256) DEFAULT NULL,
c_use varchar(64) DEFAULT NULL, c_use varchar(64) DEFAULT NULL,
effect varchar(64) DEFAULT NULL, effect varchar(64) DEFAULT NULL,
...@@ -52,7 +52,7 @@ CREATE TABLE his_config_info ( ...@@ -52,7 +52,7 @@ CREATE TABLE his_config_info (
gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000', gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000', gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
src_user varchar(128), src_user varchar(128),
src_ip varchar(20) DEFAULT NULL, src_ip varchar(50) DEFAULT NULL,
op_type char(10) DEFAULT NULL, op_type char(10) DEFAULT NULL,
constraint hisconfiginfo_nid_key PRIMARY KEY (nid)); constraint hisconfiginfo_nid_key PRIMARY KEY (nid));
...@@ -73,7 +73,7 @@ CREATE TABLE config_info_beta ( ...@@ -73,7 +73,7 @@ CREATE TABLE config_info_beta (
gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00', gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00', gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
src_user varchar(128), src_user varchar(128),
src_ip varchar(20) DEFAULT NULL, src_ip varchar(50) DEFAULT NULL,
constraint configinfobeta_id_key PRIMARY KEY (id), constraint configinfobeta_id_key PRIMARY KEY (id),
constraint uk_configinfobeta_datagrouptenant UNIQUE (data_id,group_id,tenant_id)); constraint uk_configinfobeta_datagrouptenant UNIQUE (data_id,group_id,tenant_id));
...@@ -89,7 +89,7 @@ CREATE TABLE config_info_tag ( ...@@ -89,7 +89,7 @@ CREATE TABLE config_info_tag (
gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00', gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00', gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
src_user varchar(128), src_user varchar(128),
src_ip varchar(20) DEFAULT NULL, src_ip varchar(50) DEFAULT NULL,
constraint configinfotag_id_key PRIMARY KEY (id), constraint configinfotag_id_key PRIMARY KEY (id),
constraint uk_configinfotag_datagrouptenanttag UNIQUE (data_id,group_id,tenant_id,tag_id)); constraint uk_configinfotag_datagrouptenanttag UNIQUE (data_id,group_id,tenant_id,tag_id));
...@@ -210,3 +210,19 @@ CREATE TABLE permissions ( ...@@ -210,3 +210,19 @@ CREATE TABLE permissions (
INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE);
INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN'); INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN');
/******************************************/
/* ipv6 support */
/******************************************/
ALTER TABLE `config_info_tag`
MODIFY COLUMN `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip' AFTER `src_user`;
ALTER TABLE `his_config_info`
MODIFY COLUMN `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL AFTER `src_user`;
ALTER TABLE `config_info`
MODIFY COLUMN `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip' AFTER `src_user`;
ALTER TABLE `config_info_beta`
MODIFY COLUMN `src_ip` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT 'source ip' AFTER `src_user`;
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册