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

617 Commits

Author SHA1 Message Date
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
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
LoadChange
38e5dd9447 fix: authority menu 2020-01-10 16:47:15 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +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
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
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
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
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
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
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
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
qq213539
52ceeecfa4 #2171 2019-12-18 14:41:03 +08:00
zhenxianyimeng
d457f58869 rebuild main.js and css.js 2019-12-13 10:17:57 +08:00
Peter Zhu
4029dd3d11
Merge pull request #2131 from hykjtt/develop 
issue fix #2093
 2019-12-12 22:47:56 +08:00
nkorange
013125c1ee #1105 Access control finish 60% 2019-12-12 18:57:36 +08:00
zhenxianyimeng
317ff2c0b7 fix page enter bug 2019-12-11 20:41:53 +08:00
nkorange
952ee8a3c1 #1105 Access control finish 50% 2019-12-11 19:25:33 +08:00
qq213539
592385b43e 解决魔法值问题... 2019-12-10 22:19:05 +08:00
qq213539
374b35200d #2145 增加方法注释 2019-12-10 21:42:32 +08:00
qq213539
3f5a0d0150 Merge branch 'customNamespaceId' of https://github.com/KeRan213539/nacos into customNamespaceId 2019-12-10 21:40:31 +08:00
qq213539
ed43d5c829 #2145 namespace id 为空允许新增 2019-12-10 21:39:24 +08:00
qq213539
1d42cde1b5 #2145 完善前端逻辑 2019-12-10 21:38:17 +08:00
qq213539
6703b2abbb #2145 自定义namespaceId 服务端部分 2019-12-10 21:18:56 +08:00
qq213539
866e6e386d #2145 自定义namespaceId 前端部分 2019-12-10 21:17:50 +08:00
shenggangshu
4148a1985a fix #2092 pageSize change 2019-12-04 17:03:26 +08:00
hykjtt
448120c15c issue fix #2093 2019-12-04 15:07:30 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
xilipilige
20c75f38fd format code 2019-11-28 07:26:56 +08:00
xilipilige
c75b952dd3 add nacos console cors 2019-11-27 21:02:54 +08:00
Peter Zhu
a70950c3ef
Merge pull request #2105 from KeRan213539/#2098_bug_fix 
#2098 bug fix
 2019-11-25 18:42:43 +08:00
qq213539
dd9b68715e 修复 #2098 2019-11-25 18:08:39 +08:00
Fury Zhu
6176360597
Merge pull request #1971 from sheiy/develop 
issues:调用修改实例接口,未传的参数值会被清空
 2019-11-07 16:28:49 +08:00
nkorange
c431a852b5 #2018 Close inpuststream instead of connection. 2019-11-07 16:02:01 +08:00
sheiy
e8691ac0ad issues:调用修改实例接口,未传的参数值会被清空 
https://github.com/alibaba/nacos/issues/1957
 2019-11-04 10:59:33 +08:00
sheiy
96f81e0db4 issues:调用修改实例接口,未传的参数值会被清空 
https://github.com/alibaba/nacos/issues/1957
 2019-11-04 10:42:32 +08:00
nkorange
4d68565667 Update version to 1.1.4 2019-10-24 14:46:46 +08:00
Fury Zhu
3f68ce083d
Merge pull request #1953 from nkorange/feature_mcp 
Feature mcp
 2019-10-22 18:02:15 +08:00
Beldon
3e03462038 fix the CI errors 2019-10-21 23:16:58 +08:00
Beldon
92fcfce50a clean code 2019-10-21 22:53:02 +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
Fury Zhu
fcf62bbd5d
Merge branch 'develop' into feature_mcp 2019-10-21 16:21:42 +08:00
Fury Zhu
4a30210345
Merge pull request #1879 from ly641921791/clean_code 
Clean up redundant StringUtils
 2019-10-21 14:55:29 +08:00
nkorange
21e7bcdde0 #1409 Fix PMD 2019-10-15 18:07:27 +08:00
bruce
63d044c6cb
bug fix 1841 
bug fix https://github.com/alibaba/nacos/issues/1841
 2019-09-27 18:42:42 +08:00
ly
221d81dab8 Clean up redundant StringUtils 2019-09-25 20:49:37 +08:00
LoadChange
4f85dc0df3 build fe 2019-09-25 20:23:09 +08:00
freekry
71ce4dad4d fix bug #1775 
fix bug #1775
 2019-09-25 20:18:58 +08:00
nkorange
6b7b894a0d Fix #1874 2019-09-25 15:46:34 +08:00
Fury Zhu
43d44d015a
Merge pull request #1836 from universefeeler/improve_instance_health_flag 
[ISSUE 182]Improve instance health flag
 2019-09-20 14:59:13 +08:00
universefeeler
5413402869 improve(triggerFlag): improve instance health flag 2019-09-19 20:03:09 +08:00
Fury Zhu
caba884069
Merge pull request #1624 from KeRan213539/#1583_bug_fix 
#1583 bug fix
 2019-09-19 16:57:05 +08:00
Beldon
977e2f76b7 Merge remote-tracking branch 'upstream/develop' into develop 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java
 2019-09-18 21:18:04 +08:00
Beldon
83aa8e2186 clean controllers code 2019-09-18 00:12:20 +08:00
Fury Zhu
117eb6630f
Merge pull request #1792 from loadchange/issues/1759 
fix: closes #1759
 2019-09-17 14:36:42 +08:00
universefeeler
5681ca3f78 feture(triggerFlag): add frontend show triggerFlag 2019-09-09 15:13:24 +08:00
LoadChange
519c2c0450 fix: closes #1759 2019-09-02 11:36:45 +08:00
pbting
17ab94dba8
Merge branch 'develop' into feature_enhance_interface 2019-08-28 18:19:01 +08:00
Yangkai.Shen
a1da8c121e 🐛 remove server.contextPath 2019-08-23 14:06:27 +08:00
赵禹光
d3fd616626 页面修复 2019-08-21 16:50:50 +08:00
赵禹光
571389ef4e Merge branch 'develop' into zen5 
# Conflicts:
#	console/src/main/resources/static/js/main.js
 2019-08-21 16:49:48 +08:00
pbting
be7237e8ae merge upstream develop the latest code 2019-08-15 16:48:43 +08: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
pbting
19a5ac632c RunningConfig support get from spring.properties configuration file 2019-08-06 16:43:48 +08:00
LoadChange
fdcd2f32ee fix: font privatization 2019-08-05 17:50:45 +08:00
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
赵禹光
6ecabd70e7 reverse Service Name and Group Name 2019-08-01 21:37:26 +08:00
赵禹光
87850d46b8 Merge commit 'df82ed3c296b12c3731badc40b1f881e5f1c183b' into zen5 
# Conflicts:
#	console/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js
#	console/src/main/resources/static/js/main.js
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
 2019-08-01 19:55:10 +08:00
nkorange
df82ed3c29 build console 2019-08-01 15:58:10 +08:00
赵禹光
a5b67493e8 Merge commit '838ef83f9f19d25a9f29c808d77d7ea4a6854ee2' into fix-1535-1 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
 2019-08-01 11:16:43 +08:00
赵禹光
20c73a108d remove unness const 2019-08-01 11:14:57 +08:00
赵禹光
f6007660b8 add refresh memory 2019-08-01 11:13:27 +08:00
yanlinly
ebca6772bd
Merge pull request #1547 from wfnuser/develop 
feat: support update password api
 2019-08-01 10:31:36 +08:00
赵禹光
289ef2a907 npm build 2019-07-31 21:06:24 +08:00
赵禹光
b10402a6a8 fix FE 2019-07-31 20:41:39 +08:00
赵禹光
ce222f199f fix build 2019-07-31 18:48:05 +08:00
赵禹光
0a54af1179 Merge commit '32c29149590022c335d8f64c6903a82619fd1bc9' into fix-1535-1 
# Conflicts:
#	console/src/main/resources/static/js/main.js
 2019-07-31 18:40:39 +08:00
赵禹光
814a4b9cbe no message 2019-07-31 18:39:42 +08:00
Fury Zhu
32c2914959
Merge pull request #1544 from zhaoyuguang/z_wcek_1479 
Fix1479
 2019-07-31 10:50:43 +08:00
邪影oO
b3e75b31d0
Merge branch 'develop' into #1583_bug_fix 2019-07-30 17:15:40 +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
302de9c885
Merge pull request #1578 from loadchange/issues/1569 
Fix: closes #1569
 2019-07-30 16:47:45 +08:00
赵禹光
f69b0542be 编译 main.* 2019-07-30 15:50:00 +08:00
赵禹光
de49db7ee6 Merge commit 'dea95fa11af55f3da8bc6d4cfe3e1ee8842cb9ee' into zen5 
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
 2019-07-30 15:48:37 +08:00
Fury Zhu
dea95fa11a
Merge pull request #1525 from ly641921791/develop 
Fix #1519 The subscriber list is not displayed correctly
 2019-07-30 15:36:59 +08:00
赵禹光
61ae002cea no message 2019-07-30 15:06:04 +08:00
赵禹光
224f2237e6 Merge commit 'ad5c249e7c852daf4e2f7b09b9c12c432d5b3cf7' into z_wcek_1479 
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
 2019-07-30 15:04:42 +08:00
keran
74694ede6e 修复#1583 2019-07-30 13:56:12 +08:00