zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,830 Commits 2 Branches 3 Tags 58 MiB
f60402cfda
Commit Graph

245 Commits

Author SHA1 Message Date
qingliang.ql
def3c196a1 add url 2019-01-18 14:24:53 +08:00
nkorange
d064fe36bb Merge branch 'develop' into feature_naming_ap 2019-01-18 11:38:20 +08:00
nkorange
a889642ca9 Fix CMDB JVM option error in JDK 9 2019-01-18 10:57:44 +08:00
water.lyl
920ff30961 Fix HmacSHA256 not available，change -Djava.ext.dirs 2019-01-17 16:39:38 +08:00
water.lyl
fcbb582e53 1、Fix HmacSHA256 not available，change -Djava.ext.dirs 
2、update jjwt to newest version
3、longger security key,and change hs512 to hs256
 2019-01-16 22:54:51 +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
wfnuser
973c522834 fix conflict 2019-01-15 12:48:28 +08:00
nkorange
d0bfc0e179 Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
 2019-01-14 16:59:13 +08:00
nkorange
7abee38ff4 Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.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/raft/RaftStore.java
 2019-01-14 16:01:58 +08:00
nkorange
fdc48028fc Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.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/raft/RaftStore.java
 2019-01-14 16:01:14 +08:00
water.lyl
78f3e44839 Fix #381 update mysql user table and security ignore url 2019-01-13 20:39:35 +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
qingliang.ql
72f69902bc tomcat access log 2019-01-09 16:02:34 +08:00
qingliang.ql
fb5bbf3689 merge develop 2019-01-09 11:27:51 +08:00
qingliang.ql
9debca5659 default close metrics 2019-01-09 11:02:44 +08:00
qingliang.ql
ef5fa53afa console and configfile 2019-01-07 20:53:34 +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
dda1bafb86 Fix #560 2019-01-04 14:16:15 +08:00
Fury Zhu
957d9823be
Merge pull request #559 from alibaba/hotfix_server_side_check_lose_data 
#558 Add access log setting
 2019-01-03 17:16:48 +08:00
nkorange
5e244a7316 #558 Add access log setting 2019-01-03 16:49:57 +08:00
Fury Zhu
35e6daf948
Merge pull request #538 from canglang1973/master 
translate javadoc to English.
 2019-01-03 12:26:11 +08:00
nkorange
3250533516 #526 Make more effort 2018-12-29 13:44:12 +08:00
nkorange
c56947c692 Fix windows startup error 2018-12-20 15:10:18 +08:00
nkorange
64f29ddd78 #187 Add label dump task 2018-12-18 16:03:26 +08:00
nkorange
b35b483e87 Add plugin directory 2018-12-14 20:48:26 +08:00
nkorange
dc3d95d055 Disable CMDB by default 2018-12-14 20:25:53 +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
qingliang.ql
505252cb60 Fixes #395 2018-12-13 21:16: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
hxy1991
ff55be27d3 Merge branch 'anjia0532-master' into upstream-develop 
# Conflicts:
#	console/src/main/resources/diamond-server-logback.xml
 2018-12-11 19:17:43 +08:00
hxy1991
97743685ac Fixes #363 2018-12-10 19:53:15 +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
xuechaos
b39733e463 findbugs-maven-plugin version to 3.0.4 
issue #366
 2018-12-07 14:31:31 +08:00
nkorange
7d2f652b36 #187 Refactor selector 2018-12-06 20:14:07 +08:00
nkorange
aace49640a #187 provide CMDB module 2018-12-05 12:08:49 +08:00
hxy1991
09f2da0382 Restore index names for compatibility 2018-11-28 10:23:04 +08:00
hxy1991
631d2e49a1 Merge branch 'upstream-master' 2018-11-20 16:30:42 +08:00
hxy1991
94dd0e5609 Merge branch 'upstream-master' 2018-11-20 14:02:40 +08:00
xuechaos
dc8d44597f fix : GC log does not take effect 
issue ##314
 2018-11-20 11:03:25 +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
9ab50bbc87 Fixes #255 2018-11-16 14:59:05 +08:00
xuechaos
b6e1ad91b8 feature : Support JDK 11 
issue #214
 2018-11-16 14:22:12 +08:00
nkorange
46c141900e Fix PMD 2018-11-16 12:07:25 +08:00
hxy1991
7a3e9fd17b Fixes #222 2018-11-15 22:45:53 +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
bbc3c24226 Use HTTP redirect instead of resend request 2018-11-05 17:09:00 +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
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
nkorange
abdc48fc84 Fix register instance with customized cluster name failed bug. 2018-10-25 15:56:02 +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
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
fa163631a1 Update version to 0.3.0-rc1 2018-10-18 23:06:42 +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
251b2f01d8 merge master 2018-10-17 19:45:35 +08:00
mercyblitz
baa3e30739 Polish alibaba/nacos#96 : fixed logging file name 2018-10-03 04:26:40 +08:00
mercyblitz
e91ccc9c0f Polish alibaba/nacos#96 : add command arguments into startup scripts 2018-10-03 03:58:26 +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
c4374dbf4e Polish alibaba/nacos#94 : fixed the grammar of logback xml files 2018-10-02 18:21:54 +08:00
mercyblitz
be8f3c2052 Polish alibaba/nacos#103 2018-10-01 10:58:27 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
nkorange
af35525850 Merge branch 'master' into 0.3.0 
Conflicts:
	console/src/main/resources/static/.gitignore
	console/src/main/resources/static/.webpackrc
	console/src/main/resources/static/README.md
	console/src/main/resources/static/i18ndoc.js
	console/src/main/resources/static/index.js
	console/src/main/resources/static/package.json
	console/src/main/resources/static/public/i18ndoc.js
	console/src/main/resources/static/src/components/EditorNameSpace.js
	console/src/main/resources/static/src/components/NameSpaceList.js
	console/src/main/resources/static/src/components/NewNameSpace.js
	console/src/main/resources/static/src/components/ValidateDialog.js
	console/src/main/resources/static/src/menu.js
	console/src/main/resources/static/src/pages/Configeditor.js
	console/src/main/resources/static/src/pages/ConfigurationManagement.js
	console/src/main/resources/static/src/pages/Namespace.js
	console/src/main/resources/static/src/router.js
 2018-09-28 10:29:11 +08:00
water.lyl
fc44a1264b [motify info] update namespace config 2018-09-27 22:54:19 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
nkorange
37f8260940 Fix version error 2018-09-27 12:33:54 +08:00
xuechaos
e3a40d7610 fix wrong shell to startup server, thanks to yanj0609 2018-09-26 20:32:28 +08:00
xxc
874f4403a2
Merge pull request #72 from yanj0609/master 
[ISSUE #69] Fix application cannot use {BASE_DIR}/conf/application.properties
 2018-09-26 20:24:56 +08:00
xuechaos
7997644589 del nacos server port in startup.cmd 2018-09-26 20:14:36 +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
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
yanj0609
135524a8c8 Fix #69 
* Add external config location to default config locations.

* The option '-cp' will be ignored when using 'java -jar'.
 2018-09-20 23:23:06 +08:00
xuechaos
b5fe4fd434 client jdk support 1.6 and del unuse file 2018-09-19 22:18:31 +08:00
water.lyl
9839062d32 Fix #67 
The configuration module log is changed to config
 2018-09-19 19:15:54 +08:00
water.lyl
b9cd75b640 Fix #65 
Nacos default port changed from 8080 to 8848
 2018-09-19 19:06:03 +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
xuechaos
cc33ccd1ad add mysql sql file 2018-07-30 23:05:11 +08:00
xuechaos
4b619cf25a fix windows startup 2018-07-21 13:42:47 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00