Commit Graph

213 Commits

Author SHA1 Message Date
Beldon
85a954525b remove the useless code that make ci errors 2019-10-21 23:48:09 +08:00
chuntaojun
5074d06903 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-09-11 22:44:02 +08:00
xianlaioy
4e6d8b67a2 refactor: IO改成try resource。instanceList循环直接改成addAll 2019-09-09 20:42:48 +08:00
pbting
1ecd5f385c
Merge branch 'develop' into feature_enhance_interface 2019-09-06 21:22:16 +08:00
pbting
46bcece7aa repair speel error and add debug log 2019-09-06 12:19:16 +08:00
ly
721c5a4a58 Compatible with older versions 2019-08-27 23:56:45 +08:00
pbting
caf01308e7 add comma division with some case to use 2019-08-16 09:46:04 +08:00
pbting
a6deeb1fed add comma division with some case to use 2019-08-16 09:45:47 +08:00
pbting
5222b9c407 cluster conf support multi instance inline seperator with ',' 2019-08-16 09:18:45 +08:00
pbting
be7237e8ae merge upstream develop the latest code 2019-08-15 16:48:43 +08:00
chuntaojun
2802247d6c Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-08-13 21:41:30 +08:00
chuntaojun
e981f3f787 feat: 2019-08-13 21:41:26 +08:00
nkorange
6ca2ee0cf8 Update version to 1.1.3 2019-08-06 18:55:05 +08:00
nkorange
15c913e346 Update version to 1.1.2 2019-08-06 17:10:37 +08:00
pbting
19a5ac632c RunningConfig support get from spring.properties configuration file 2019-08-06 16:43:48 +08:00
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
赵禹光
8320701f2e fmt 2019-07-11 20:27:59 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
得少
7f97289340 Merge branch 'develop' into feature_address_server 2019-07-04 15:07:03 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
得少
7336a8b7f5 fix #1458
support address server mode ,so nacos client will use the endpoint to initializer
2019-07-01 23:08:08 +08:00
Fury Zhu
819d5d1db5
Merge pull request #1404 from slievrly/charset
optimize charset、continue and return
2019-07-01 13:12:03 +08:00
nkorange
3a8575e22f Update version to 1.0.2-SNAPSHOT 2019-06-28 17:34:59 +08:00
nkorange
4605733595 Update version to 1.0.2 2019-06-28 17:18:59 +08:00
slievrly
e01a44702b optimize charset、continue and return
Signed-off-by: slievrly <slievrly@163.com>
2019-06-19 23:47:55 +08:00
IanCao
a98db447fe format code 2019-06-13 12:26:22 +08:00
nkorange
7a593ffaee Fix bug 2019-06-05 11:05:56 +08:00
Fury Zhu
9319b76d22
Merge pull request #1307 from pbting/namespace_unified
Namespace And Endpoint Support Multi Enviroment Switch
2019-06-04 17:15:26 +08:00
pbting
9963ca5f3f change the version 2019-05-31 15:25:25 +08:00
pbting
c4be24a536 nacos client namespace support multi enviroment switch 2019-05-31 15:21:58 +08:00
dupengcheng
67741c6712 fix: #1260 2019-05-24 13:18:47 +08:00
nkorange
a87cc12d47 Update version to 1.0.0 2019-04-15 20:01:34 +08:00
nkorange
699bdcb6dc Update to 1.0.0-SNAPSHOT 2019-04-15 16:36:10 +08:00
得少
427a746e82 change the default value of isUseEndpointParsingRule from false to true 2019-04-12 12:49:46 +08:00
nkorange
3c1c98aaf1 Update version to 1.0.0 2019-04-10 22:04:27 +08:00
pbting
b7a1fb22b3
Merge branch 'develop' into develop 2019-04-03 19:08:09 +08:00
得少
eca7a9a422 support parsing endpoint rule 2019-04-03 18:31:27 +08:00
Fury Zhu
8e20fd6832
Merge pull request #987 from hxy1991/fix_986
Fixes #986
2019-04-03 10:26:44 +08:00
hxy1991
9c9050207e Fixes #986 2019-04-01 11:48:53 +08:00
nkorange
37b9004569 Fix #973 2019-03-29 19:27:30 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
nkorange
52d4e01bc7 #502 Fix several bugs 2019-03-18 20:57:28 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
qingliang.ql
2ede41f3e8 增加hostname方式 2019-03-14 20:11:30 +08:00
nkorange
616a8031bc Merge branch 'develop' into feature_naming_group
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
2019-03-04 10:12:11 +08:00
xuechaos
80c260e207 Release 0.9.0 Nacos : Nacos server function mode and fix 13 issues
* [#840] Nacos server adds startup mode to distinguish between config and naming.
* [#762] Register instance returns failed when the health check mode is 'server' in standalone mode.
* [#473] Nacos Cluster Mode kubernate Startup nacos.log error Log.
* [#240] Log strong dependence problem.
* [#824] getServicesOfServer throws exception if service list is empty.
* [#802] Nacos server multi-boot mode support.
* [#800] Nacos's client-to-server addressing mode document introduction.
* [#768] The interval at which the heartbeat is sent in BeatReactor is not controlled by the server return value.
* [#759] why instance can't auto-delete.
* [#756] Format of instance and service should be validated.
* [#720] Memory leak in PushService.
* [#653] IoUtils under nacos-common-0.2.1-RC1.jar lacks "" judgment on encoding.
* [#588] Client compatible to jdk1.6. On branch develop
2019-03-01 00:46:50 +08:00
xuechaos
5711ace91f function mode server code completed 2019-02-27 20:00:05 +08:00
nkorange
493715973f Merge branch 'develop' into feature_naming_group
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-02-26 17:29:22 +08:00
qingliang.ql
5b711c676a static 2019-02-25 15:53:23 +08:00
qingliang.ql
7b60e2ef3f getBoolean 2019-02-25 15:49:47 +08:00
qingliang.ql
47e753170e constant 2019-02-25 14:43:26 +08:00
qingliang.ql
2b38145594 fix UT error 2019-02-25 14:31:25 +08:00
qingliang.ql
999a244eb3 fix read property file error 2019-02-25 12:16:21 +08:00
qingliang.ql
eb87625083 fetch self ip 2019-02-22 16:24:26 +08:00
water.lyl
f29209b114 release 0.8 2019-01-22 22:16:13 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
980e2a62ef Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/Switch.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-01-16 18:12:54 +08:00
nkorange
dee6857d28 #498 fix bug 2019-01-16 14:52:18 +08:00
nkorange
425a80167b Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
2019-01-15 18:15:55 +08:00
nkorange
e9811c84c6 Merge branch 'develop' into feature_multi_tenant 2019-01-15 14:55:59 +08:00
zhanglong
bf305eaa0e Fix #619 2019-01-14 22:07:49 +08:00
nkorange
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +08:00
nkorange
9898a3c8e4 Merge branch 'develop' into feature_multi_tenant
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java
2019-01-11 14:08:13 +08:00
nkorange
fed3c3f986 #498 Rename healthController bean and update pom version to 0.8.0-SNAPSHOT 2019-01-07 17:57:13 +08:00
zhanglong
2da6611cbc Fix #512 2018-12-24 21:05:38 +08:00
nkorange
7fac0909d4 Fix build error 2018-12-14 22:47:09 +08:00
nkorange
205929b50e Update version in banner.txt 2018-12-14 22:14:10 +08:00
nkorange
066aaeaec0 Merge branch 'master' into 0.7.0
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	console/src/main/resources/static/console-fe/src/i18ndoc.js
#	console/src/main/resources/static/console-fe/src/locales/en-US.js
#	console/src/main/resources/static/console-fe/src/locales/zh-CN.js
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
2018-12-14 17:55:20 +08:00
nkorange
be64c1acf7 Update version to 0.7.0 2018-12-14 17:48:57 +08:00
nkorange
a5e564dbe5 Update version to 0.6.1 2018-12-11 17:15:57 +08:00
hxy1991
0facefe9c3 Fixes #432 2018-12-11 16:44:26 +08:00
nkorange
1b3c5fb4ba Prepare for 0.6.1 2018-12-11 16:34:43 +08:00
anjia0532
0c5654cec8 1. change charset to UTF-8(replace GBK or utf8)
2. support custom nacos server logs path in application* profile(key:nacos.logs.path)
2018-12-09 13:24:17 +08:00
xuechaos
d4edde980b Nacos release 0.6.0 version
#388 Cluster name should be provided in the Instance
#377 Clean up messy code in Naming module
#369 Support instance list persisted on disk
#366 findbugs-maven-plugin version
#362 The metadata will lost when online or offline instance through web ui
#352 Refactoring internationalization Nacos console
#278 Nacos docker img
#243 optimize the efficiency of integration testing, it’s taking too long now
2018-12-07 15:19:43 +08:00
hxy1991
30e7c5273a Fixes #363 2018-12-01 13:57:03 +08:00
dungu.zpf
d795ad7d2b 0.5.0 release 2018-11-19 19:54:08 +08:00
nkorange
93246b3ded Merge branch 'naming-model-refactor' into develop
# Conflicts:
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2018-11-16 19:59:15 +08:00
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor 2018-11-16 18:16:51 +08:00
hxy1991
af21897608 correct license 2018-11-16 10:28:28 +08:00
hxy1991
7a3e9fd17b Fixes #222 2018-11-15 22:45:53 +08:00
hxy1991
cc9fa1f19c Fixes #222 2018-11-09 15:30:17 +08:00
hxy1991
0d90d6e895 Fixes #222 #231 2018-11-07 18:20:09 +08:00
yanlinly
608104c993
Merge pull request #212 from hxy1991/master
Fixes #92
2018-11-05 20:44:22 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +08:00
hxy1991
72b298e872 Fixes #196 2018-11-05 20:29:45 +08:00
nkorange
aa7e2e41e7 remove ip use weak raft 2018-10-30 16:16:01 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
mercyblitz
66a3930a4d Fixed test cases 2018-10-19 11:32:09 +08:00
mercyblitz
a826288f9c Add server.servlet.contextPath=/nacos 2018-10-19 11:18:17 +08:00
mercyblitz
69c3989a17 Update logging levels 2018-10-19 10:50:35 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +08:00
mercyblitz
8f7c743a00 Fixed test cases 2018-10-17 16:39:12 +08:00
mercyblitz
e08dca3d75 Polish alibaba/nacos#111 : Replace config module 2018-10-04 00:47:46 +08:00
mercyblitz
356d994e39 Fixed PMD issue 2018-10-03 21:58:09 +08:00
mercyblitz
0424a4a1db Polish alibaba/nacos#94 : adapter modular logback whether current application is Spring or Spring Boot 2018-10-03 04:00:33 +08:00
mercyblitz
8a73c805d8 Polish alibaba/nacos#110 : remove application.properties and copy to META-INF/nacos-default.properties 2018-10-03 01:18:09 +08:00
mercyblitz
0ef461f2b8 Polish alibaba/nacos#109 : Change implementation to be EnvironmentPostProcessor 2018-10-03 00:22:32 +08:00
mercyblitz
700a755ac5 Polish alibaba/nacos#109 : Exclude DataSourceAutoConfiguration using externalized configuration 2018-10-02 21:50:59 +08:00
mercyblitz
11204f8df6 Polish alibaba/nacos#108 : Remove duplicated banner.txt in sub-modules and move one into core module 2018-10-02 21:05:56 +08:00
mercyblitz
08af83caac Polish alibaba/nacos#95 : more generic implementation 2018-10-02 12:22:18 +08:00
mercyblitz
adaf5f54d1 Polish alibaba/nacos#95 : add "standalone" profile 2018-10-02 11:20:54 +08:00
mercyblitz
be8f3c2052 Polish alibaba/nacos#103 2018-10-01 10:58:27 +08:00
mercyblitz
a718c84d4c Polish alibaba/nacos#104 2018-10-01 10:48:34 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
nkorange
adafaf7086 Merge branch 'master' into 0.2.2 2018-09-26 21:20:22 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check
close #79
2018-09-26 20:05:17 +08:00
nkorange
b54a0a9b9d Update version to 0.2.2-SNAPSHOT 2018-09-21 16:46:49 +08:00
hxy1991
357702afaa Modify the version to 0.2.1-RC1 2018-09-21 15:46:53 +08:00
mercyblitz
1145260d64 Update 0.2.1 and refactor some APIs 2018-09-15 13:50:25 +08:00
nkorange
6bc052153d Update version to 0.2.0 2018-09-12 14:13:38 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00