Commit Graph

2117 Commits

Author SHA1 Message Date
nkorange
bca216fd99 Update travis config 2020-01-11 22:11:08 +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
8df4c0ed54
Merge pull request #2286 from lidaoyang/hotfix_2285
Hotfix 2285
2020-01-10 17:48:52 +08:00
lidaoyang
848b1b1349 Fix #2285 2020-01-10 17:38:21 +08:00
LoadChange
9f7e4f5a60 merge develop 2020-01-10 17:32:05 +08:00
LoadChange
c9b48081f1 feat: fe build 2020-01-10 17:26:03 +08:00
lidaoyang
ac502b305b Fix #2285 2020-01-10 17:11:55 +08:00
lidaoyang
3aa42b6014 Revert "Fix #2285"
This reverts commit 1d9495d5
2020-01-10 17:10:34 +08:00
LoadChange
38e5dd9447 fix: authority menu 2020-01-10 16:47:15 +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
wb-ldy613915
1d9495d50b Fix #2285 2020-01-10 15:33:59 +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
Peter Zhu
0ed8e6f812
Merge pull request #2265 from JerryChin/develop
[ISSUE  #1781]  Fix hard-coded file separator
2020-01-08 16:56:49 +08:00
LoadChange
d3cfcf7738 fix: 老接口加accessToken 2020-01-07 17:37:07 +08:00
LoadChange
df480e537e feat: privilege management i18n 2020-01-07 17:22:17 +08:00
LoadChange
4952172103 feat: roles management i18n 2020-01-07 16:57:45 +08:00
LoadChange
314e7b8cb2 feat: user management i18n 2020-01-07 16:45:18 +08:00
Qin Meijie
aa9cd362e3 Fix #1781 2020-01-07 10:13:50 +08:00
LoadChange
a43f337a5e feat: roles management 2020-01-06 19:50:26 +08:00
LoadChange
c5443dc9a7 feat: user management 2020-01-06 19:47:43 +08:00
nkorange
02fea89f49 #1105 Add user test case 2020-01-06 16:23:00 +08:00
nkorange
3e312e7537 #1105 Add test cases 2020-01-06 16:02:32 +08:00
nkorange
41dfcf5596 #1105 Read cache instead of accessing DB directly. 2020-01-06 14:35:11 +08:00
nkorange
5ac3c17e4c Fix #2248 2020-01-02 16:48:59 +08:00
nkorange
b415ddaedf #1105 Access control finish 83% 2019-12-26 15:01:43 +08:00
Peter Zhu
45c333cf37
Merge pull request #2217 from KeRan213539/README.md
Readme.md
2019-12-25 15:11:44 +08:00
qq213539
94484a12fe Who is using 里去掉一个 2019-12-25 14:56:21 +08:00
qq213539
54043f7735 修改配制导出的文件名中的日期格式为 yyyyMMddHHmmss 2019-12-24 17:39:27 +08:00
nkorange
bdda8a526b refactor application.properties 2019-12-20 16:29:08 +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
邪影oO
df279e4ae1
Merge pull request #11 from alibaba/develop
拉代码
2019-12-20 14:48:12 +08:00
LoadChange
7fa38b6389 refactor: update configuration && build 2019-12-19 17:40:19 +08:00
WG-Roy
be2ea09871 [优化muti delete config js展示bug] (#2191) 2019-12-19 16:55:04 +08:00
nkorange
aef7565403 #1105 Access control finish 82% 2019-12-19 15:33:20 +08:00
邪影oO
6ebec735f5
Merge pull request #10 from alibaba/develop
拉代码
2019-12-19 14:02:50 +08:00
Peter Zhu
83eeeb6a23
Merge pull request #2199 from KeRan213539/RemoveDuplicateMethods
Remove duplicate methods
2019-12-19 13:32:28 +08:00
qq213539
0723fa279d tenantInfoCountByTenantId 2019-12-19 12:36:18 +08:00
Peter Zhu
c9fb61b20f
Merge pull request #2169 from zhenxianyimeng/zhenxianyimeng_fix_console_page_enter
fix page enter bug in configuration Management page
2019-12-19 11:59:41 +08:00
邪影oO
afeb736f2e
Merge pull request #9 from alibaba/develop
拉代码
2019-12-19 11:52:28 +08:00
Peter Zhu
2acd50db1c
Merge pull request #2147 from easyhaloo/pageSize_change
fix #2092 pageSize change
2019-12-19 11:45:46 +08:00
Peter Zhu
a44fa8d0d9
Merge pull request #2163 from KeRan213539/customNamespaceId
Custom namespace id
2019-12-19 11:38:18 +08:00
Peter Zhu
bf10a32a0b
Merge pull request #2149 from codeimport/develop-fuzzyget-subscriber
[ISSUE #2148] subscribers list page support fuzzy query
2019-12-19 11:35:18 +08:00