Commit Graph

295 Commits

Author SHA1 Message Date
yanlinly
acaee3ffb5
Merge pull request #993 from alibaba/del_warnings
Remove spotbugs-annotations dependency
2019-04-02 10:31:06 +08:00
xxc
ec8046ef0d
Merge pull request #991 from yanlinly/master
remove lgpl dependency
2019-04-01 23:36:02 +08:00
water.lyl
0b6246e9f5 remove lgpl dependency 2019-04-01 21:16:44 +08:00
xuechaos
178b80ea41 del warnings spotbugs-annotations #981 2019-04-01 21:16:14 +08:00
hxy1991
df4f338a41 Fixes #984 2019-04-01 11:37:30 +08:00
nkorange
dc51aa5703 Merge branch 'hotfix_server_mode' into develop 2019-03-22 17:31:36 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
qingliang.ql
4cf86dfc66 fix derby size 大于32kb报错问题 2019-03-18 15:49:48 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
Fury Zhu
01feb230a3
Merge pull request #855 from paderlol/develop
Nacos+MySQL8 startup error
2019-03-14 17:45:00 +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
zhanglong
3cb5089fd0 Refactor maven pom dependency and remove mysql jar from plugins dir 2019-03-03 17:48:24 +08:00
pader.zhang
2f0c503da1 Fix #852 #613 2019-03-02 11:50:59 +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
678fc8a5f7 update version get for pom 2019-02-28 17:34:25 +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
hxy1991
0e9d3e678a Fixes #240 #826 #827 #828 2019-02-26 14:22:38 +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
cc9b6b58b7 Merge branch 'develop' into feature_naming_ap 2019-01-22 10:13:22 +08:00
water.lyl
9947e8565c change default user/password to nacos/nacos 2019-01-22 09:42:25 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
d064fe36bb Merge branch 'develop' into feature_naming_ap 2019-01-18 11:38:20 +08:00
wuyoushan
938666c7b8 remove useless semicolon 2019-01-17 18:02:44 +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
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
qingliang.ql
55c8f038e3 merge develop 2019-01-11 14:27:19 +08:00
Keep
21b7f96809
Merge pull request #446 from lostcharlie/develop
[ISSUE #442] Fix typos in class names and variables.
2019-01-11 14:19:43 +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
Keep
8fdbf685a8
Merge pull request #596 from fudali113/fix-get-remote-ip
Fixes #595
2019-01-09 20:35:17 +08:00
qingliang.ql
052901f27f support java 6 2019-01-09 20:06:02 +08:00
fudali
8ef18cbe7a fix: 添加新加测试文件授权头信息 2019-01-09 17:17:51 +08:00
fudali
0a229a7fcf fix: 在获取客服端真实 ip 的方法中添加获取根据 X-Forwarded-For header 来进行获取的实现 2019-01-09 16:21:38 +08:00
fudali
9ac02e638b feat: 获取客服端 ip 支持 X-Forwarded-For header 2019-01-09 16:13:31 +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
d4821d6460 config metrics 2019-01-07 20:44:16 +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
FrankBian
41001899db format code: add @Override; translate some chinese msg to english; remove unneccessary method modifier 2019-01-07 15:48:01 +08:00
water.lyl
f77dbd0e6d Fix #381 format code, add license info 2019-01-06 21:55:59 +08:00
water.lyl
6ba58f24c0 Fix #381 persist user info 2019-01-04 15:46:55 +08:00
nkorange
be64c1acf7 Update version to 0.7.0 2018-12-14 17:48:57 +08:00
qingliang.ql
505252cb60 Fixes #395 2018-12-13 21:16:04 +08:00
Zhen Tang
6fb97c44e7 Revert changes in HTTP header for backward compatibility. 2018-12-13 09:13:51 +08:00
Zhen Tang
98e447e146 Fix typo: Long pulling -> Long polling. 2018-12-13 09:13:28 +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
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
cbc8b0a75a Merge branch 'upstream-develop'
# Conflicts:
#	api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java
2018-12-03 10:29:40 +08:00
hxy1991
30e7c5273a Fixes #363 2018-12-01 13:57:03 +08:00
nkorange
e3e6682231 Modify author info 2018-11-30 13:25:58 +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
0e24b70642 Fixes #316 2018-11-20 14:22:41 +08:00
hxy1991
94dd0e5609 Merge branch 'upstream-master' 2018-11-20 14:02:40 +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
hxy1991
af21897608 correct license 2018-11-16 10:28:28 +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
adc7ecfe48 Merge branch 'upstream-develop' 2018-11-05 18:29:23 +08:00
water.lyl
db8e97bd35 Fix #216 2018-11-05 15:45:36 +08:00
hxy1991
7c626eb4f8 Fixes #92 2018-11-02 18:26:24 +08:00
yanlinly
24a2ede65f
Merge pull request #194 from yanlinly/master
Fix #38 #106 #188
2018-10-31 09:39:22 +08:00
Keep
ede4111300
Merge pull request #152 from hxy1991/master
fixes #92
2018-10-30 21:16:09 +08:00
nkorange
aa7e2e41e7 remove ip use weak raft 2018-10-30 16:16:01 +08:00
water.lyl
9d70f720ca Fix #188 2018-10-30 15:55:06 +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
hxy1991
c854236a8e fixes #92 2018-10-24 19:53:28 +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
mercyblitz
cc616f8d6d Revert Constants.java & testcase 2018-10-19 11:00:37 +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
251b2f01d8 merge master 2018-10-17 19:45:35 +08:00
mercyblitz
8f7c743a00 Fixed test cases 2018-10-17 16:39:12 +08:00
mercyblitz
c0ee2f2764 Polish to resolve compilation issue 2018-10-15 17:17:25 +08:00
小马哥
5c3ebf8f9f
Merge branch 'master' into 0.2.2 2018-10-15 17:10:48 +08:00
hxy1991
074d6aa77a Fix #119 2018-10-09 20:23:33 +08:00
小马哥
55433f0995
Merge pull request #23 from javartisan/master
improving code quality
2018-10-09 10:13:58 +08:00
xiaomage
8d55b3fd33 Bug fix 2018-10-05 19:51:20 +08:00
mercyblitz
e08dca3d75 Polish alibaba/nacos#111 : Replace config module 2018-10-04 00:47:46 +08:00
mercyblitz
91e8795486 Polish alibaba/nacos#94 : fixed logback missing 2018-10-03 05:10:39 +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
c4374dbf4e Polish alibaba/nacos#94 : fixed the grammar of logback xml files 2018-10-02 18:21:54 +08:00
mercyblitz
adaf5f54d1 Polish alibaba/nacos#95 : add "standalone" profile 2018-10-02 11:20:54 +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
83f536b27d Polish alibaba/nacos#102 2018-10-01 11:43:48 +08:00
mercyblitz
99b5827409 Polish alibaba/nacos#101 2018-10-01 11:19:53 +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
4f273e70c5 Add Configurations for Database 2018-10-01 00:12:31 +08:00
mercyblitz
ae0feb80f4 Move the location of SQL scripts for code 2018-09-30 20:55:20 +08:00
mercyblitz
7b2549131b Move the location of SQL scripts 2018-09-30 20:54:43 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
hxy1991
77a162d671 Fix #92 2018-09-30 11:08:49 +08:00
hxy1991
d3013f800a Merge branch 'upstream' 2018-09-28 16:06:26 +08:00
water.lyl
802979e27b [motify info] recovery static file 2018-09-28 11:48: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
20a5f80956 [motify info] fix pmd 2018-09-28 09:44:29 +08:00
water.lyl
386d3cc1ad [motify info] namespace manage 2018-09-27 22:44:13 +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
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
hxy1991
b69e7da751 Eliminate warnings: Redundant array creation for calling varargs method 2018-09-24 22:18:16 +08:00
xuechaos
01afa98697 update config pom 2018-09-21 16:58:31 +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
xuechaos
4603fb221a update shell 2018-09-21 15:11:23 +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
water.lyl
1083a55677 [modify info] fix notify unhealth problem 2018-09-13 20:29:49 +08:00
water.lyl
de1d976432 Merge remote-tracking branch 'origin/0.3.0' into v0.2
* origin/0.3.0: (32 commits)
  [modify info] restruct equal name to void conflict
  [motify info] fix pmd
  [motify info] Api split
  fix bug and change some input style
  fix: modify wrong code
  [motify info] fix rollback problem
  update code
  [motify info] push web ui,and build shell
  gitignore add build dir
  fix: setParams decode bug
  [motify info] push static result
  [motify info] fix edit info
  [motify info] push build result,and fix namespace undefined problem
  fix tags bug
  update add index.css
  [motify info] mix useful
  [motify info] push core ui
  feat: add i18n feature
  替换白底logo
  update: update header css
  ...
2018-09-13 15:48:24 +08:00
nkorange
6bc052153d Update version to 0.2.0 2018-09-12 14:13:38 +08:00
water.lyl
7790a2255a [motify info] push web ui,and build shell 2018-09-11 17:00:54 +08:00
water.lyl
f97adcc42a [motify info] push static result 2018-09-07 14:35:19 +08:00
water.lyl
ea45b180c8 [motify info] fix edit info 2018-09-07 14:29:16 +08:00
water.lyl
cc9c1ade5f [motify info] push build result,and fix namespace undefined problem 2018-09-07 11:32:19 +08:00
water.lyl
1228177679 [motify info] config list/ history & rollback 2018-09-05 21:15:50 +08:00
water.lyl
57d704cfc9 【motify info】 test static console 2018-08-27 10:29:24 +08:00
hxy1991
785c4236c3 Fixed #28 2018-08-10 16:30:20 +08:00
javartisan
3320de2fa2 delete useless code 2018-08-02 09:55:29 +08:00
yanlinly
9090e1d870
删除非utf-8编码sql 2018-07-22 16:10:54 +08:00
yanlinly
5f3452f568
提交utf-8编码的创表语句 2018-07-22 16:05:44 +08:00
yanlinly
10aa4fc2eb
删除无用文件 2018-07-22 16:03:54 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00