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

561 Commits

Author SHA1 Message Date
chuntaojun
87a32a926b refactor: merge develop 2020-05-21 18:08:29 +08:00
chuntaojun
c615699933 refactor: removes the request forwarding logic for the configuration module 2020-05-21 14:53:23 +08:00
chuntaojun
c4a93d1c37 refactor: code refactor 2020-05-20 15:45:15 +08:00
chuntaojun
10d8edb4f3 refactor: optimize code logic 2020-05-19 14:16:52 +08:00
chuntaojun
b8dddf0ec1 refactor: block initialization before dump completes 2020-05-19 14:04:11 +08:00
chuntaojun
f9412fd4d6 fix: fix config dump 2020-05-18 22:57:40 +08:00
chuntaojun
587a0937c9 refactor: perform consistency logic 2020-05-17 23:13:40 +08:00
chuntaojun
eb64afecba perf: optimize the configuration publishing process 2020-05-16 22:47:49 +08:00
chuntaojun
baae3c7572 perf: config 2020-05-16 22:04:06 +08:00
chuntaojun
feebd1623f refactor: performance optimization 2020-05-16 19:23:11 +08:00
chuntaojun
b86f633c8a Merge branch 'develop' of https://github.com/alibaba/nacos into feature_1.3.0_beta_grpc 2020-05-16 14:36:49 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +08:00
chuntaojun
a317c7a80b refactor: jraft node removal logic optimization 2020-05-15 15:20:39 +08:00
chuntaojun
08623c9ef3 refactor: support grpc 2020-05-14 18:10:40 +08:00
chuntaojun
0c6a03724a fix: fix grpc-version bug 2020-05-14 16:25:41 +08:00
chuntaojun
a68f5e22cf fix: fix code style 2020-05-13 18:14:27 +08:00
chuntaojun
82bcbd9b17 refactor: jRaft partial logical adjustment 2020-05-13 09:38:46 +08:00
water.lyl
54e251da39 release 1.3-beta 2020-05-11 23:06:23 +08:00
zongtanghu
f46fa41d1e [#2738]add tenant legality verification. 2020-05-11 19:48:51 +08:00
yanlinly
9f4061eed6
Revert "[#2738]add tenant legality verification." 2020-05-11 19:33:57 +08:00
zongtanghu
c2c752a969 Merge remote-tracking branch 'origin/feature_tenant_verify' into feature_tenant_verify 
# Conflicts:
#	client/src/test/java/com/alibaba/nacos/client/BeatReactorTest.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
#	config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java
 2020-05-11 18:57:41 +08:00
zongtanghu
71ce203768 [#2738]rebase and resolve conflict codes. 2020-05-11 18:13:06 +08:00
zongtanghu
b7207cbe73 [#2738]Put ParamUtils into origin place for tenant legality verification. 2020-05-11 18:06:20 +08:00
zongtanghu
0305c0d01f [#2738]add tenant legality verification. 2020-05-11 18:05:01 +08:00
zongtanghu
18de6388a0 [#2738]remove redundant codes. 2020-05-11 16:59:09 +08:00
zongtanghu
f71c435f89 [#2738]remove redundant codes. 2020-05-11 16:51:06 +08:00
zongtanghu
1bb7613ff2 [#2738]Put ParamUtils into origin place for tenant legality verification. 2020-05-11 15:57:53 +08:00
zongtanghu
2b091f1a5d [#2738]add tenant legality verification. 2020-05-11 11:13:38 +08:00
chuntaojun
6a6725a269 fix: fix expansion issues 2020-05-09 20:32:55 +08:00
chuntaojun
5879b03c7d fix: expansion and volume timing issue fixed 2020-05-09 14:49:04 +08:00
chuntaojun
29a6edc8c5 refactor: fix bugs 2020-05-08 14:53:29 +08:00
chuntaojun
5e281892a1 refactor: remove debug log 2020-05-07 00:33:06 +08:00
chuntaojun
272abe6135 fix: fix parameter encode 2020-05-06 18:33:18 +08:00
chuntaojun
60b84a4981 refactor: merge upstream develop 2020-05-05 16:06:02 +08:00
chuntaojun
1563dc7104 fix: fixed a problem where parameters were encoded multiple times 2020-05-05 09:43:54 +08:00
chuntaojun
2526c5d8f2 fix: fix naming request redirect 2020-05-03 20:26:35 +08:00
chuntaojun
a82bcc1d6e fix: fix request transfer bug 2020-05-02 13:12:38 +08:00
chuntaojun
eca2aca6bb fix: bug fix 2020-05-01 10:09:08 +08:00
chuntaojun
eb11ff945b fix: fix standalone sync node info bug 2020-04-30 20:02:54 +08:00
chuntaojun
041effebc7 refactor: some code refactor 2020-04-30 13:46:04 +08:00
chuntaojun
a937e3090c fix: fix some bugs 2020-04-30 10:49:34 +08:00
chuntaojun
a025e56b3a fix: fix config dump bug 2020-04-28 15:08:38 +08:00
chuntaojun
bf94c96af1 refactor: none 2020-04-24 22:43:15 +08:00
chuntaojun
41e1f04914 refactor: code refactor 2020-04-24 22:42:02 +08:00
chuntaojun
853a8f587f refactor: core 
logic optimization
 2020-04-22 22:16:27 +08:00
chuntaojun
ef405e09e2 refactor: remove complex listening logic and bug fixes 2020-04-22 17:28:53 +08:00
chuntaojun
f222dccd3d refactor: code optimization 2020-04-21 17:14:59 +08:00
wangwei
dcdbaf50ea use MD5Utils replace MD5 2020-04-20 14:18:23 +08:00
wangwei
aeb14910e7 unify the MD5 generation on both sides by MD5 utility classes in the common module 2020-04-19 18:42:59 +08:00
chuntaojun
a9918f2332 refactor: request forwarding logic adjustment 2020-04-19 09:25:28 +08:00
chuntaojun
0b3b5e83ac refactor(all): code optimization 2020-04-16 23:50:08 +08:00
chuntaojun
1aca7bc3e0 refactor: core 2020-04-13 22:44:08 +08:00
chuntaojun
7586354476 refactor: bug fix and refactor init logic 2020-04-13 16:13:49 +08:00
chuntaojun
9f8c19cafb refactor: Change the distributed ID logic 2020-04-02 19:24:11 +08:00
chuntaojun
66db5207d3 fix: merge upstream develop 2020-03-30 13:42:55 +08:00
Peter Zhu
b7a2c756fe
Merge pull request #2403 from lkxiaolou/develop 
fix checksum bug #2401
 2020-03-29 23:01:48 +08:00
chuntaojun
89a8dddc1c Merge branch 'develop' of https://github.com/alibaba/nacos into feature_consistency 2020-03-28 17:38:26 +08:00
chuntaojun
3dd42fed27 refactor: Generic fetch method modification 2020-03-27 18:48:00 +08:00
nkorange
ea2a83c4be Update version to 1.2.1 2020-03-27 15:48:32 +08:00
chuntaojun
da7ef15196 style: fix code style 2020-03-26 20:53:46 +08:00
chuntaojun
ce6dc51bcf fix: fix some bugs 2020-03-26 20:32:52 +08:00
chuntaojun
16ba537a37 feat: #2530 2020-03-26 12:06:35 +08:00
lkxiaolou
83c098b8ca 统一md5计算 2020-03-14 17:54:06 +08:00
liaochuntao
76ca05edc1
Merge pull request #2304 from KeRan213539/fix#2275 
fix #2275
 2020-03-13 18:48:41 +08:00
nkorange
82d7147a58 Update version to 1.2.0 2020-03-03 16:24:08 +08:00
nkorange
025b1b4980 Fix test case error 2020-03-02 16:47:13 +08:00
nkorange
cc0a4915c7 Merge branch 'develop_1.2.0' into develop 
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
 2020-02-27 16:18:54 +08:00
nkorange
31e6063209 Update version to 1.2.0-beta.1 2020-02-23 20:02:13 +08:00
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
nkorange
374c575c79 #1105 fix bug 2020-02-04 17:21:33 +08:00
qq213539
9673afd068 修改重复代码 2020-01-17 17:08:51 +08:00
zhanglong
74b9d3a197 Fixed heath check error with Nacos by standalone #2295 2020-01-17 01:45:57 +08:00
nkorange
1fb1f5f3e3 #1105 Add auth test case for config 2020-01-14 18:01:00 +08:00
qq213539
58db0e266e fix #2275 2020-01-14 16:33:06 +08:00
nkorange
2da88de159 Fix findbugs 2020-01-12 16:57:03 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
13f5810751
Merge pull request #2266 from nkorange/feature_access_control 
Feature access control
 2020-01-10 17:54:29 +08:00
Peter Zhu
47f1085563
Merge pull request #2283 from rushsky518/log_config 
#2245 correct log config
 2020-01-10 16:04:29 +08:00
Peter Zhu
a96cb67f44
Merge pull request #2276 from langghaha/develop 
replace null return value
 2020-01-10 16:02:38 +08:00
Peter Zhu
1849d96935
Merge pull request #1715 from rushsky518/develop 
receive config change event
 2020-01-10 15:41:24 +08:00
Peter Zhu
f4c01068c9
Merge pull request #2282 from jzdayz/no_necessary 
简化一点代码
 2020-01-10 15:25:23 +08:00
Peter Zhu
7e2e530729
Merge pull request #2194 from KeRan213539/sameNamespaceClone#2171 
Same namespace clone#2171
 2020-01-10 15:24:35 +08:00
rushsky518
91368b4389 #2245 correct log config 2020-01-10 14:46:32 +08:00
jzdayz
6a88ca3539 简化一些代码。。 2020-01-10 09:46:10 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +08:00
langghaha
6f777607d8 replace null return value 2020-01-08 19:07:50 +08:00
Qin Meijie
aa9cd362e3 Fix #1781 2020-01-07 10:13:50 +08:00
nkorange
41dfcf5596 #1105 Read cache instead of accessing DB directly. 2020-01-06 14:35:11 +08:00
nkorange
b415ddaedf #1105 Access control finish 83% 2019-12-26 15:01:43 +08:00
qq213539
54043f7735 修改配制导出的文件名中的日期格式为 yyyyMMddHHmmss 2019-12-24 17:39:27 +08:00
qq213539
29fd50456f Merge branch 'develop' into sameNamespaceClone#2171 
# Conflicts:
#	console/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
 2019-12-20 15:02:30 +08:00
qq213539
0723fa279d tenantInfoCountByTenantId 2019-12-19 12:36:18 +08:00
Peter Zhu
a44fa8d0d9
Merge pull request #2163 from KeRan213539/customNamespaceId 
Custom namespace id
 2019-12-19 11:38:18 +08:00
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
qq213539
6ee99aaf5a #2171 服务端部分 2019-12-18 14:41:56 +08:00
nkorange
2460dcddcb #1105 Access control finish 70% 2019-12-12 21:50:34 +08:00
nkorange
013125c1ee #1105 Access control finish 60% 2019-12-12 18:57:36 +08:00
qq213539
b47cb1e381 sql注入修改 2019-12-12 09:26:04 +08:00
nkorange
952ee8a3c1 #1105 Access control finish 50% 2019-12-11 19:25:33 +08:00
qq213539
6703b2abbb #2145 自定义namespaceId 服务端部分 2019-12-10 21:18:56 +08:00
shenggangshu
7e277ae2f1 fix #2142 CI error 2019-12-04 11:36:28 +08:00
shenggangshu
1082539d89 refactor #2134 optimization code 2019-12-03 18:45:10 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
rushsky518
2acee95885 #1550 完善单元测试 2019-11-30 13:22:47 +08:00
rushsky518
93773c47d6 #1550 抽象出 spi 接口 2019-11-26 21:35:05 +08:00
Peter Zhu
a219dbeafc
Merge pull request #2061 from MistRay/develop 
fix #1966
 2019-11-25 20:51:40 +08:00
Peter Zhu
3b19a30a32
Merge pull request #2085 from lzf971107/a_1 
optimize: the Boolean.parseBoolean(String s) method should be used when converting a String to a Boolean type
 2019-11-25 13:20:23 +08:00
黄大相
31a59e8451 fix 2025 2019-11-21 16:19:51 +08:00
withthewind
ec6e52ee9d optimize: the Boolean.parseBoolean(String s) method should be used when converting a String to a Boolean type 2019-11-21 15:59:28 +08:00
junyi
36a5259930 add toUpperCase 2019-11-14 15:36:03 +08:00
nkorange
c431a852b5 #2018 Close inpuststream instead of connection. 2019-11-07 16:02:01 +08:00
nkorange
0212de87a3 fix #2000 2019-11-06 13:46:39 +08:00
nkorange
4d68565667 Update version to 1.1.4 2019-10-24 14:46:46 +08:00
Beldon
927e8d6fe4 Merge remote-tracking branch 'upstream/develop' into develop 
# Conflicts:
#	console/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
 2019-10-21 22:36:24 +08:00
rushsky518
a815d7b7de Merge branch 'develop' of https://github.com/rushsky518/nacos into develop 
# Conflicts:
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
 2019-10-11 20:09:19 +08:00
rushsky518
f3bd147317 #1550 nacos server return config type 2019-10-11 19:58:42 +08:00
ly
221d81dab8 Clean up redundant StringUtils 2019-09-25 20:49:37 +08:00
nkorange
6b7b894a0d Fix #1874 2019-09-25 15:46:34 +08:00
Fury Zhu
4b1a65c1cf
Merge pull request #1659 from Diffblue-benchmarks/add-GroupKey-tests 
Add unit tests for com.alibaba.nacos.config.server.utils.GroupKey
 2019-09-19 17:19:31 +08:00
Beldon
83aa8e2186 clean controllers code 2019-09-18 00:12:20 +08:00
chuntaojun
5074d06903 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-09-11 22:44:02 +08:00
chuntaojun
8c47619af9 feat: 2019-09-11 22:43:57 +08:00
xianlaioy
08e69a0b21 refactor: 局部变量是线程安全的； 
urlPattern改成static final；
          GroupKey重构
 2019-09-09 20:15:19 +08:00
xianlaioy
7b5c6e9273 style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容； 2019-09-09 17:56:14 +08:00
xianlaioy
13e509679d style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容； 2019-09-09 17:55:02 +08:00
ly
40be568c01 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-31 10:39:42 +08:00
ly
59a36f91e4 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-30 21:31:40 +08:00
ly
1fd5ee360e [Issue] #1769 Solve the bug of the clone configuration function 2019-08-29 01:23:12 +08:00
Thomas Perkins
934c4238c1 Add unit tests for com.alibaba.nacos.config.server.utils.GroupKey 
These tests were written using Diffblue Cover
 2019-08-06 17:15:01 +01: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
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
Fury Zhu
838ef83f9f
Merge pull request #1534 from zhaoyuguang/zen3 
format code
 2019-08-01 11:04:24 +08:00
Fury Zhu
9b2367eb91
Merge pull request #1552 from nkorange/hotfix_log_optimization 
Fix #290
 2019-08-01 11:02:55 +08:00
yanlinly
ebca6772bd
Merge pull request #1547 from wfnuser/develop 
feat: support update password api
 2019-08-01 10:31:36 +08:00
Fury Zhu
b0dd759a85
Merge pull request #1511 from KeRan213539/multipleSelectionDeletion 
Multiple selection deletion
 2019-07-30 17:11:40 +08:00
Fury Zhu
ad5c249e7c
Merge pull request #1499 from chuntaojun/fix_issue_1492 
feat(config): support different db name and password
 2019-07-30 14:52:29 +08:00
nkorange
1711c3765f Fix #290 2019-07-15 15:47:02 +08:00
wfnuser
c5aec4c227 feat: support update password api 2019-07-14 22:28:34 +08:00
赵禹光
8320701f2e fmt 2019-07-11 20:27:59 +08:00
赵禹光
fb5a352ec6 fmt 2019-07-11 20:24:13 +08:00
赵禹光
1042831c2a fmt 2019-07-11 20:22:31 +08:00
赵禹光
60ae75f870 fmt 2019-07-11 20:21:10 +08:00
keran
b0530d6558 多选删除接口部分 2019-07-09 17:27:03 +08:00
keran
ac5acc9c6a Merge branch 'develop' into multipleSelectionDeletion 2019-07-09 14:13:27 +08:00
Fury Zhu
627331ef12
Merge pull request #1508 from KeRan213539/develop 
导出查询结果增加dataId条件,修复导入失败的问题
 2019-07-09 14:07:35 +08:00
keran
a39d288d15 导出查询结果增加dataId条件,修复导入失败的问题 2019-07-09 13:40:02 +08:00
keran
6f8bd9b1b1 增加多选删除的服务端接口 2019-07-09 11:15:09 +08:00
nkorange
65c2f55617 Fix standalone use derby failed bug 2019-07-09 11:04:00 +08:00
nkorange
d8eef4f2f5 Fix standalone mode cannot use MySQL bug. 2019-07-08 11:00:00 +08:00
chuntaojun
93a9b089cc feat(config): support different db name and password 2019-07-06 12:03:14 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
Fury Zhu
402b31adb6
Merge pull request #1254 from KeRan213539/exportAndImport 
#1115 feature: configs export/import and clone
 2019-07-02 12:42:30 +08:00
Fury Zhu
702289ad69
Merge pull request #1454 from zhaoyuguang/zen1 
Fix #1453
 2019-07-02 11:44:49 +08:00
邪影oO
39d49bb141
Merge branch 'develop' into exportAndImport 2019-07-01 17:54:44 +08:00
keran
51990b6a11 还原误提交的 2019-07-01 17:52:17 +08:00
keran
61b6302625 按照review意见修改 2019-07-01 17:48:45 +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
赵禹光
ea5eaf5441 fix2 2019-07-01 11:59:04 +08:00
赵禹光
179f810d89 bugfix and opt 2019-07-01 11:45:19 +08:00
Fury Zhu
fe950dccc2
Merge pull request #1401 from slievrly/develop 
optimize array and negated codestyle
 2019-06-30 22:47:46 +08:00
Fury Zhu
268d1d4ea9
Merge pull request #1443 from iHelin/develop 
[ISSUE #1442] Fix JSONUtils#deserializeObject method.
 2019-06-30 22:41:13 +08:00
nkorange
2c4e659d6c Update version to 1.0.2-SNAPSHOT 2019-06-28 17:51:04 +08:00
nkorange
4605733595 Update version to 1.0.2 2019-06-28 17:18:59 +08:00
keran
98edb0edfa 统一code枚举和result生成工具 2019-06-28 15:43:16 +08:00
iHelin
368b355fca Modify JSONUtils's deserializeObject method. 2019-06-28 15:23:06 +08:00
Fury Zhu
7ec7f525fd
Merge branch 'develop' into develop 2019-06-28 12:53:19 +08:00
Fury Zhu
fac3dc8a23
Merge branch 'develop' into charset 2019-06-27 18:50:57 +08:00
caoyixiong
65a4d27e1e fix 2019-06-26 12:15:11 +08:00
slievrly
f17f40e0af fix review 
Signed-off-by: slievrly <slievrly@163.com>
 2019-06-25 21:42:13 +08:00
Fury Zhu
94f034bccf
Merge pull request #1407 from slievrly/junit 
optimize junit
 2019-06-24 10:23:47 +08:00
Fury Zhu
1898bcfb89
Merge pull request #1403 from slievrly/modifier 
optimize modifier access
 2019-06-24 10:17:39 +08:00
slievrly
15ad43b924 optimize junit 
Signed-off-by: slievrly <slievrly@163.com>
 2019-06-20 14:40:57 +08:00
slievrly
e01a44702b optimize charset、continue and return 
Signed-off-by: slievrly <slievrly@163.com>
 2019-06-19 23:47:55 +08:00
slievrly
21bf279532 optimize modifier access 
Signed-off-by: slievrly <slievrly@163.com>
 2019-06-19 23:12:43 +08:00
slievrly
443679c1c8 remove unused import 2019-06-19 22:52:31 +08:00
slievrly
8d74ac90aa optimize array and negated codestyle 2019-06-19 22:35:52 +08:00
Fury Zhu
d5e8ef5063
Merge branch 'develop' into study 2019-06-18 10:47:21 +08:00
Fury Zhu
c691739300
Merge pull request #1365 from IanCao/dev_cyx 
format code and remove useless code
 2019-06-17 16:58:01 +08:00
赵禹光
170a0d7d0a better 2019-06-15 12:52:54 +08:00
赵禹光
ebeacb0e31 Avoid accessing static variables or static methods of this class through object references of a class. It increases the cost of compiler parsing and can be accessed directly by class name. 2019-06-15 00:16:51 +08:00
赵禹光
10aa620315 All overriding methods must be preceded by @Override annotations. 2019-06-14 18:54:04 +08:00
IanCao
a98db447fe format code 2019-06-13 12:26:22 +08:00
nkorange
a60bed8dee Update version to 1.0.1 2019-06-12 16:28:12 +08:00
nkorange
a7f3cabf3c Update version to 1.0.1-SNAPSHOT 2019-06-11 17:04:36 +08:00
chuntaojun
ecc015402e refactor(nacos-client): 修改与本pr无关的注释信息 2019-06-07 21:25:09 +08:00
chuntaojun
456e84785f refactor(nacos-client:config): Rewrite the HTTP retry rule 2019-06-07 18:41:08 +08:00
chuntaojun
5623577a36 refactor(nacos-client): 修改config的LongPoll轮询的机制 2019-06-06 21:44:42 +08:00
chuntaojun
1f102f52f4 feat: 2019-06-06 20:38:24 +08:00
chuntaojun
72a3a9b213 feat: 2019-06-05 22:31:09 +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
keran
162f505fad no message 2019-05-28 14:06:53 +08:00
keran
e0fb599303 no message 2019-05-28 13:15:01 +08:00
keran
eb7009003b 修复当导入目标为public时会报namespace不存在的BUG 2019-05-28 13:04:13 +08:00
keran
0321a0a060 删除不该提交的测试 2019-05-27 22:48:56 +08:00
keran
8e92e5a907 新增克隆相关功能接口 2019-05-27 22:32:19 +08:00
keran
8eba1e4a45 no message 2019-05-23 11:49:08 +08:00
keran
7e01606347 修改注释 2019-05-23 10:38:08 +08:00
keran
4db743072c 新增类加入licences 2019-05-22 16:30:44 +08:00
keran
01a0622c75 增加导入导出功能 2019-05-22 15:31:05 +08:00
keran
14e8d92ec6 导入修改为阿里云ACM方式,支持导入ACM文件 2019-05-19 22:27:15 +08:00
keran
ad3a6953cb 导出重写,导出格式兼容阿里云ACM 2019-05-19 16:49:22 +08:00
keran
66d3dfd12d 前端增加上传组件和导出导入功能 2019-05-16 12:40:11 +08:00
keran
6092f25f7a 新增类中增加licensed 2019-05-15 09:59:30 +08:00
keran
5aec982e58 String.getBytes()的调用中指定编码 2019-05-15 09:13:50 +08:00
keran
c34216d52a 增加配制数据导入导出接口,支持根据 group,appName,tenant 查询并导出查询结果 2019-05-14 17:39:12 +08:00
Fury Zhu
a3da3136f6
Merge pull request #1161 from rushsky518/master 
[ISSUE #1118] 历史配置文件保留天数，可配置
 2019-05-12 00:12:31 +08:00
rushsky518
f1fd3bbb64
Update DumpService.java 
property with prefix nacos.config
 2019-05-10 17:31:55 +08:00
chuntaojun
7ae757ac02 refactor(config): correct the mistake to Constants.HEALTH_CONTROLLER_PATH 2019-05-07 11:24:11 +08:00
chuntaojun
4817b26bc9 refactor(client): Fix the issues raised in the comments 2019-05-07 11:11:24 +08:00
chuntaojun
f2c046a395 refactor(client): Service operation function module split 2019-04-30 17:46:10 +08:00
rushsky518
71d9cb3e04 历史配置文件保留天数，可配置 2019-04-30 17:28:52 +08:00
nkorange
3c1c98aaf1 Update version to 1.0.0 2019-04-10 22:04:27 +08:00
得少
eca7a9a422 support parsing endpoint rule 2019-04-03 18:31:27 +08:00
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