Commit Graph

295 Commits

Author SHA1 Message Date
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
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
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