Commit Graph

314 Commits

Author SHA1 Message Date
qingliang.ql
052901f27f support java 6 2019-01-09 20:06:02 +08:00
nkorange
e240f2d92f #498 Fix bug 2019-01-09 16:26:08 +08:00
nkorange
a1444124ea #498 Fix bug 2019-01-09 16:12:21 +08:00
qingliang.ql
4101814db6 add license 2019-01-09 12:05:14 +08:00
qingliang.ql
fb5bbf3689 merge develop 2019-01-09 11:27:51 +08:00
qingliang.ql
4bcf4313e3 collect metrics to metrics monitor 2019-01-09 10:35:24 +08:00
qingliang.ql
62849ec816 naming metrics 2019-01-07 20:54:09 +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
nkorange
f0a8ece552 #502 Add new consistency package 2019-01-07 11:34:44 +08:00
nkorange
3250533516 #526 Make more effort 2018-12-29 13:44:12 +08:00
nkorange
6deb198e2c Fix #526 2018-12-27 00:30:23 +08:00
nkorange
16794d15e5 #523 add switch 2018-12-25 20:59:08 +08:00
nkorange
478cb1533e #498 Naming supports namespace 2018-12-25 16:48:27 +08:00
gqxie
a4c2ffe82a fix some spelling mistakes 2018-12-19 16:57:27 +08:00
gqxie
4420c319dd fix a spelling mistake 2018-12-19 14:08:50 +08:00
nkorange
947e0439b0 #269 Register instance with tenant info 2018-12-19 11:02:31 +08:00
nkorange
7fac0909d4 Fix build error 2018-12-14 22:47:09 +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
d2e4f4e6b4 Merge branch 'feature_cmdb' into 0.7.0
# Conflicts:
#	api/pom.xml
#	api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/conf/nacos-logback.xml
#	distribution/pom.xml
#	distribution/release-nacos.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
2018-12-14 17:15:32 +08:00
nkorange
7a64ce2177 #187 Fix bug 2018-12-14 17:00:18 +08:00
nkorange
a631ec3bf7 Fix #461 2018-12-14 16:23:04 +08:00
nkorange
f96794e170 #187 Fix bug 2018-12-13 20:01:07 +08:00
nkorange
5f6bdf2d39 Update expression syntax 2018-12-13 15:12:57 +08:00
nkorange
a5e564dbe5 Update version to 0.6.1 2018-12-11 17:15:57 +08:00
nkorange
1b3c5fb4ba Prepare for 0.6.1 2018-12-11 16:34:43 +08:00
nkorange
8c50599a15 #429 Filter services by metadata 2018-12-11 16:10:48 +08:00
nkorange
7115834a98 #421 Fixed 2018-12-10 19:52:58 +08:00
nkorange
3198ec69ca #187 Refactor some logic 2018-12-10 15:37:48 +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
nkorange
0409aaecb0 #187 Add Java docs 2018-12-07 11:24:22 +08:00
nkorange
7d2f652b36 #187 Refactor selector 2018-12-06 20:14:07 +08:00
JianweiWang
3f5955f69c
Merge pull request #392 from alibaba/hotfix_cluster_lost_in_instance
Hotfix cluster lost in instance
2018-12-05 17:08:48 +08:00
nkorange
cce2679670 Fix #388 2018-12-05 14:11:03 +08:00
nkorange
aace49640a #187 provide CMDB module 2018-12-05 12:08:49 +08:00
nkorange
3ae5e20898 #387 refactor service operate url 2018-12-05 12:07:29 +08:00
nkorange
78523976ba #97 Support integrating to third-party CMDB to filter service providers by their labels. 2018-12-03 17:56:11 +08:00
JianweiWang
be0ba62bbd
Merge pull request #378 from alibaba/feature_debug_log
#377 Clean up code
2018-12-02 18:00:36 +08:00
nkorange
5f60644d9e #377 Clean up code 2018-12-02 17:40:06 +08:00
nkorange
75d9d24345 #369 Update property name 2018-11-30 22:35:43 +08:00
nkorange
e3e6682231 Modify author info 2018-11-30 13:25:58 +08:00
nkorange
c2672953d2 #369 Instance list persisted on disk if enabled. 2018-11-30 13:24:03 +08:00
Fury Zhu
79745783e9
Merge pull request #361 from alibaba/hotfix_decide_leader_bug
Fix #357
2018-11-28 17:38:35 +08:00
nkorange
44cb206794 Fix #357 2018-11-28 15:47:21 +08:00
ethon
fb1cf6fcec bugfix, when -Dnacos.preferHostnameOverIp=true , the localhostIp error . bug #325 2018-11-21 17:33:00 +08:00
dungu.zpf
d795ad7d2b 0.5.0 release 2018-11-19 19:54:08 +08:00
nkorange
807c7dc153 Fix raft publish unstable problem. 2018-11-19 16:58:19 +08:00
nkorange
3a6eafc4a1 Fix #172 2018-11-19 16:56:36 +08:00
nkorange
c7100e25f8 Fix conflict 2018-11-16 20:33:05 +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
nkorange
46c141900e Fix PMD 2018-11-16 12:07:25 +08:00
hxy1991
af21897608 correct license 2018-11-16 10:28:28 +08:00
nkorange
eba3ca9c74 Fix ip registered failed bug 2018-11-15 15:25:45 +08:00
nkorange
361ae0b2dd Fix raft publish bug 2018-11-15 14:19:08 +08:00
yanlinly
30919083e8
Merge pull request #247 from hxy1991/master
[ISSUE #222] [ISSUE #231] [ISSUE #246]
2018-11-12 10:49:32 +08:00
Fury Zhu
724ced4861
Merge pull request #213 from paderlol/develop
Fixes #193
2018-11-11 23:08:01 +08:00
zhanglong
d60c03edcd support domain for server cluster into k8s 2018-11-11 15:15:09 +08:00
nkorange
24485abcf9 Fix #249 2018-11-08 21:28:20 +08:00
nkorange
8fe38f7dcb Fix #249 2018-11-08 21:24:50 +08:00
nkorange
6aaae5d95f Call local method instead of sending HTTP request to localhost 2018-11-08 19:50:34 +08:00
nkorange
d3751a99af #209 Disable service and cluster level customization in client 2018-11-08 16:34:18 +08:00
hxy1991
0d90d6e895 Fixes #222 #231 2018-11-07 18:20:09 +08:00
nkorange
d6f4834688 Separate locked publish from unlocked publish 2018-11-07 11:28:46 +08:00
Fury Zhu
bdc3026798
Merge pull request #198 from alibaba/hotfix_update_service_error
Fix #197
2018-11-07 10:11:42 +08:00
Fury Zhu
3cbcbe94c0
Merge pull request #220 from nanamikon/master
PUT /instance should use param key "useIPPort4Check" instead of "userIPPort4Check"
2018-11-06 11:42:27 +08:00
nkorange
c348398d45 Fix #168 2018-11-06 09:45:07 +08:00
nkorange
db2a6498b6 Fix #181 2018-11-05 20:42:14 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +08:00
kaitai.zj
1a4c0e0550 bug fix: The key in the com.alibaba.nacos.api.naming.pojo.Cluster is "useIPPort4Check" instead of "userIPPort4Check" 2018-11-05 18:20:23 +08:00
nkorange
bbc3c24226 Use HTTP redirect instead of resend request 2018-11-05 17:09:00 +08:00
zhanglong
713fe2e635 Merge branch 'develop' of https://github.com/paderlol/nacos into develop 2018-11-03 16:10:20 +08:00
zhanglong
1f6271e1a1 support hostname for server cluster 2018-11-03 16:08:14 +08:00
nkorange
a020bcd783 #177 Finish backend. 2018-10-31 21:16:55 +08:00
nkorange
50be11d0ef Fix #197 2018-10-31 15:48:24 +08:00
xxc
eab2110033
Merge pull request #192 from alibaba/hotfix-clientbeat-lose-info
Fix #190
2018-10-31 15:30:17 +08:00
nkorange
ad36fba84b Enable default TTL 2018-10-31 15:21:15 +08:00
nkorange
4ff38aca3a Differentiate temporary data and persistent data 2018-10-31 10:48:15 +08:00
nkorange
3e01285ab7 Merge branch 'hotfix-clientbeat-lose-info' into raft-performance 2018-10-30 20:11:30 +08:00
nkorange
dc7cb2bdee Fix #190 2018-10-30 17:59:05 +08:00
nkorange
aa7e2e41e7 remove ip use weak raft 2018-10-30 16:16:01 +08:00
nkorange
ceb2787944 Merge branch 'hotfix-register-hangs' into raft-performance
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
2018-10-30 08:54:50 +08:00
nkorange
ebb5cddd84 Not remove lock 2018-10-29 22:34:44 +08:00
nkorange
25f219623c Fix #150 2018-10-29 21:25:53 +08:00
nkorange
6466218baf Raft performance improved. 2018-10-29 20:34:12 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
xuechaos
9275dd7c24 update copyright 2018-10-25 19:02:32 +08:00
nkorange
abdc48fc84 Fix register instance with customized cluster name failed bug. 2018-10-25 15:56:02 +08:00
nkorange
855037cac6 Fix client side health check error 2018-10-25 13:22:22 +08:00
wyp12
1cf0a5b731 Merge remote-tracking branch 'origin/hotfix-clientbeat-failed' into feature_ServiceMesh 2018-10-24 18:00:02 +08:00
nkorange
f4e8684fdf Fix #149 2018-10-24 17:54:34 +08:00
nkorange
e3276d0114 Fix #150 2018-10-24 17:52:55 +08:00
wyp12
4da7557620 add enable 2018-10-24 11:17:47 +08:00
wyp12
5cc9137d66 update 2018-10-23 14:56:26 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
nkorange
6da8bf89fc Resolve conflicts and fix log error 2018-10-18 22:23:26 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +08:00
nkorange
baa8594fe7 Merge branch 'master' into 0.3.0
# Conflicts:
#	api/pom.xml
#	config/pom.xml
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
#	console/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/main/resources/application.properties
2018-10-18 17:11:32 +08:00
wyp12
503fb213ef Merge remote-tracking branch 'origin/0.3.0' into feature_ServiceMesh 2018-10-18 10:39:56 +08:00
nkorange
96abf18b41 Fix health check disabled bug 2018-10-18 10:28:50 +08:00
nkorange
0c034d5ee3 Fix health check is disabled bug 2018-10-17 20:26:15 +08:00
wyp12
a84fe24780 Merge remote-tracking branch 'origin/0.3.0' into feature_ServiceMesh 2018-10-17 19:59:40 +08:00
nkorange
f1b3e7d82d Optimize log display 2018-10-17 19:49:01 +08:00
wyp12
27d797ae60 Merge remote-tracking branch 'origin/0.3.0' into feature_ServiceMesh 2018-10-17 19:46:12 +08:00
wyp12
251b2f01d8 merge master 2018-10-17 19:45:35 +08:00
nkorange
698cf480e0 Fix #130 2018-10-17 18:12:39 +08:00
mercyblitz
8f7c743a00 Fixed test cases 2018-10-17 16:39:12 +08:00
nkorange
7eaafd754d Fix health check incorrect bug 2018-10-17 14:51:24 +08:00
nkorange
e8c81e24ed Modify page display 2018-10-16 17:28:19 +08:00
nkorange
22d81e05ef Fix cluster name value incorrect bug. 2018-10-15 22:59:24 +08:00
nkorange
2be5171cf2 Fix service list page index error 2018-10-15 20:20:59 +08:00
nkorange
216007ff97 Fix update metadata failed bug, modify health status display words 2018-10-15 20:16:55 +08:00
小马哥
5c3ebf8f9f
Merge branch 'master' into 0.2.2 2018-10-15 17:10:48 +08:00
nkorange
71cf53361f Fix test failed bug 2018-10-14 12:07:50 +08:00
nkorange
712c0216d0 Make parameter 'enable' optional 2018-10-14 11:16:22 +08:00
nkorange
2ffeb256d3 Support update instance and query instance list 2018-10-13 12:19:10 +08:00
wyp12
e65459d088 add service Metadata 2018-10-12 18:07:55 +08:00
dungu.zpf
86d8c7a4c4 fix #121 and refactor health check model 2018-10-11 16:11:48 +08:00
小马哥
a5e9528dca
Merge pull request #113 from UfukOzcelik/change-apache-object-util-equals
[ISSUE #89] Change deprecated apache ObjectUtils equals to java.util Objects equals in PeerSet
2018-10-09 10:12:32 +08:00
zhangrenjie
43d73a1eb4 remove useless import 2018-10-08 17:57:45 +08:00
wyp12
dad2b1d370 fix verison fetch 2018-10-08 10:59:32 +08:00
UfukOzcelik
af36909e47 Change apache ObjectUtils equals to java.util Objects equals in PeerSet 2018-10-06 15:00:22 +03:00
dungu.zpf
fe47b683b3 1. Support get service detail, cluster detail and instance detail in a single method;
2. Server model refactored to extend classes in nacos-api;
2018-10-06 10:22:01 +08:00
mercyblitz
741ea7cbd7 Polish alibaba/nacos#111 : Replace naming module 2018-10-04 00:53:05 +08:00
mercyblitz
a203ab309f Polish alibaba/nacos#94 : remove <filtering>true</filtering> 2018-10-03 04:01:40 +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
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
c0a25c148a Polish alibaba/nacos#105 2018-10-01 22:54:37 +08:00
mercyblitz
3b5eb060e8 Polish alibaba/nacos#103 2018-10-01 12:15:21 +08:00
mercyblitz
dc7a4eaa85 Polish alibaba/nacos#102 2018-10-01 11:34:36 +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
xiaomage
421e9a347f Bug fix 2018-10-01 10:00:29 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
nkorange
b603b2ca39 Add naming console api 2018-09-28 16:23:55 +08:00
nkorange
5331546d2f Add naming console api 2018-09-28 16:22:34 +08:00
caogu.wyp@alibaba-inc.com
e8d1619c38 * fix config pom.xml version
* support nacos go version and language recognition(#87)
2018-09-27 14:39:21 +08:00
xxc
0b5add22c7
Merge pull request #81 from alibaba/0.2.2
0.2.2
2018-09-27 14:28:08 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
caogu.wyp@alibaba-inc.com
5803c6b34d fix duplicate Maven dependencies(#82) 2018-09-27 00:04:06 +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
caogu.wyp@alibaba-inc.com
5dfd4b6451 update version 2018-09-26 19:59:41 +08:00
nkorange
f1c5dac508 Fix #78 2018-09-26 17:38:25 +08:00
caogu.wyp@alibaba-inc.com
be97fbd5c7 init nacos serviceMesh 2018-09-26 17:36:21 +08:00
nkorange
b54a0a9b9d Update version to 0.2.2-SNAPSHOT 2018-09-21 16:46:49 +08:00
nkorange
ba84fda664 Fix #66 2018-09-21 16:19:25 +08:00
nkorange
4b5bdec0ab Fix #66, Enable deregistering the last instance 2018-09-21 16:13:41 +08:00
hxy1991
357702afaa Modify the version to 0.2.1-RC1 2018-09-21 15:46:53 +08:00
xuechaos
4603fb221a update shell 2018-09-21 15:11:23 +08:00
xuechaos
b5fe4fd434 client jdk support 1.6 and del unuse file 2018-09-19 22:18:31 +08:00
nkorange
e2ef1f3da2 Fix #66 2018-09-19 19:45:44 +08:00
nkorange
413512661b Fix #68 2018-09-19 19:21:42 +08:00
nkorange
f009fa1c9a Fix #64 2018-09-19 19:14:19 +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
nkorange
899bee7ae7 1. Support get all services from client; 2. Refactor dom class 2018-09-11 18:04:02 +08:00
nkorange
84df9affb7 Fix #35 2018-08-31 07:46:43 +08:00
nkorange
4189d6f178 Remove unused code 2018-07-21 17:08:16 +08:00
敦谷
e6be0f7634 Remove tmp directory 2018-07-21 15:07:46 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00