From 00ba3cd62824941f8f6796637ead8da0414aec18 Mon Sep 17 00:00:00 2001 From: lilin Date: Mon, 29 Apr 2019 16:49:08 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E5=88=9B=E5=BB=BA=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=97=B6=E7=BB=99=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BC=9A=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/escheduler/api/service/ResourcesService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java index e0ab90185d..291c59ea22 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java +++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java @@ -701,17 +701,19 @@ public class ResourcesService extends BaseService { if (checkAdmin(loginUser, result)) { return result; } - List resourceList = resourcesMapper.queryResourceExceptUserId(userId); - Set resourceSet = null; + List list ; if (resourceList != null && resourceList.size() > 0) { - resourceSet = new HashSet<>(resourceList); - + Set resourceSet = new HashSet<>(resourceList); List authedResourceList = resourcesMapper.queryAuthorizedResourceList(userId); getAuthorizedResourceList(resourceSet, authedResourceList); + list = new ArrayList<>(resourceSet); + }else { + list = new ArrayList<>(0); } - result.put(Constants.DATA_LIST, new ArrayList<>(resourceSet)); + + result.put(Constants.DATA_LIST, list); putMsg(result,Status.SUCCESS); return result; } From 84426d323a7f79e59f30472183808b71f48a05fa Mon Sep 17 00:00:00 2001 From: lilin Date: Mon, 29 Apr 2019 16:49:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- escheduler-ui/src/js/module/i18n/locale/zh_CN.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js index 87aa0e44e8..9f7f5ee853 100644 --- a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/escheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -130,7 +130,7 @@ export default { 'Please enter database name': '请输入数据库名', 'jdbc connect parameters': 'jdbc连接参数', 'Test Connect': '测试连接', - 'Please enter resource name': '请输入资源名称', + 'Please enter resource name': '请输入数据源名称', 'Please enter IP/hostname': '请输入IP/主机名', 'jdbc connection parameters is not a correct JSON format': 'jdbc连接参数不是一个正确的JSON格式', '#': '编号', @@ -419,7 +419,7 @@ export default { 'Create token': '创建令牌', 'Edit token': '编辑令牌', 'Please enter the IP address separated by commas': '请输入IP地址多个用逗号隔开', - 'Note: Multiple IP addresses have been comma separated': '注意：多个IP地址已逗号分割', + 'Note: Multiple IP addresses have been comma separated': '注意：多个IP地址以逗号分割', 'Failure time': '失效时间', 'User': '用户', 'Please enter token': '请输入令牌', From 1a371264fe02ba6451ddd234914b1772087ecdd5 Mon Sep 17 00:00:00 2001 From: baoliang Date: Tue, 30 Apr 2019 11:11:45 +0800 Subject: [PATCH 3/6] update documents --- docs/zh_CN/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh_CN/README.md b/docs/zh_CN/README.md index 8e4cb08a4c..ff6b0cc04f 100644 --- a/docs/zh_CN/README.md +++ b/docs/zh_CN/README.md @@ -43,7 +43,7 @@ Easy Scheduler - [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") -- 我要体验 普通用户登录：demo/demo123 +- 我要体验 更多文档请参考 easyscheduler中文在线文档 From ce571c53a1b8c38deace0cf8e1c5152b342a9598 Mon Sep 17 00:00:00 2001 From: baoliang Date: Tue, 30 Apr 2019 11:20:07 +0800 Subject: [PATCH 4/6] update documents, remove demo and password --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c6f48b2bc3..19c1d2e45b 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Easy Scheduler - [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") -- 我要体验 普通用户登录：demo/demo123 +- 我要体验 更多文档请参考 easyscheduler中文在线文档 From 33b8a429b20953937d6021317e9c542266bb48a2 Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Tue, 30 Apr 2019 14:08:02 +0800 Subject: [PATCH 5/6] project index date update --- .../pages/projects/pages/index/_source/defineUserCount.vue | 1 - .../src/js/conf/home/pages/projects/pages/index/index.vue | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue index e0e6297307..818765dae1 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue @@ -59,7 +59,6 @@ this._handleDefineUser(res) this.isSpin = false }).catch(e => { - this.msg = e.msg || 'error' this.isSpin = false }) }, diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue index f8f11d7180..4d5d923ac2 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue @@ -2,7 +2,7 @@