Merge remote-tracking branch 'upstream/dev' into dev

README.md

@@ -43,7 +43,7 @@ Easy Scheduler
 
 - [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") 
 
-- <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 普通用户登录：demo/demo123
+- <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 
 
 更多文档请参考 <a href="https://analysys.github.io/easyscheduler_docs_cn/" target="_blank">easyscheduler中文在线文档</a>
 

docs/zh_CN/README.md

@@ -43,7 +43,7 @@ Easy Scheduler
 
 - [**升级文档**](https://analysys.github.io/easyscheduler_docs_cn/升级文档.html?_blank "升级文档") 
 
-- <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 普通用户登录：demo/demo123
+- <a href="http://52.82.13.76:8888" target="_blank">我要体验</a> 
 
 更多文档请参考 <a href="https://analysys.github.io/easyscheduler_docs_cn/" target="_blank">easyscheduler中文在线文档</a>
 

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<Resource> resourceList = resourcesMapper.queryResourceExceptUserId(userId);
-        Set<Resource> resourceSet = null;
+        List<Object> list ;
         if (resourceList != null && resourceList.size() > 0) {
-            resourceSet = new HashSet<>(resourceList);
-
+            Set<Resource> resourceSet = new HashSet<>(resourceList);
             List<Resource> 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;
     }

escheduler-dao/src/main/java/cn/escheduler/dao/model/ErrorCommand.java

@@ -102,6 +102,7 @@ public class ErrorCommand {
 
 
     public ErrorCommand(Command command, String message){
+        this.id = command.getId();
         this.commandType = command.getCommandType();
         this.executorId = command.getExecutorId();
         this.processDefinitionId = command.getProcessDefinitionId();

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
       })
     },

escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue

@@ -2,7 +2,7 @@
   <m-list-construction :title="$t('Project Home')">
     <template slot="content">
       <div class="perject-home-content">
-        <div class="time-model" v-show="searchParams.projectId !== 0">
+        <div class="time-model">
           <x-datepicker
                   :panel-num="2"
                   placement="bottom-end"
@@ -153,4 +153,4 @@
       display: block;
     }
   }
-</style>
+</style>

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': '请输入令牌',