Merge pull request #131 from lidongdai/dev-20190415

add monitor by lidong

.gitignore

@@ -35,3 +35,112 @@ config.gypi
 test/coverage
 /docs/zh_CN/介绍
 /docs/zh_CN/贡献代码.md
+/escheduler-common/src/main/resources/zookeeper.properties
+escheduler-alert/logs/
+escheduler-alert/src/main/resources/alert.properties_bak
+escheduler-alert/src/main/resources/logback.xml
+escheduler-server/src/main/resources/logback.xml
+escheduler-ui/dist/css/common.16ac5d9.css
+escheduler-ui/dist/css/home/index.b444b91.css
+escheduler-ui/dist/css/login/index.5866c64.css
+escheduler-ui/dist/js/0.ac94e5d.js
+escheduler-ui/dist/js/0.ac94e5d.js.map
+escheduler-ui/dist/js/1.0b043a3.js
+escheduler-ui/dist/js/1.0b043a3.js.map
+escheduler-ui/dist/js/10.1bce3dc.js
+escheduler-ui/dist/js/10.1bce3dc.js.map
+escheduler-ui/dist/js/11.79f04d8.js
+escheduler-ui/dist/js/11.79f04d8.js.map
+escheduler-ui/dist/js/12.420daa5.js
+escheduler-ui/dist/js/12.420daa5.js.map
+escheduler-ui/dist/js/13.e5bae1c.js
+escheduler-ui/dist/js/13.e5bae1c.js.map
+escheduler-ui/dist/js/14.f2a0dca.js
+escheduler-ui/dist/js/14.f2a0dca.js.map
+escheduler-ui/dist/js/15.45373e8.js
+escheduler-ui/dist/js/15.45373e8.js.map
+escheduler-ui/dist/js/16.fecb0fc.js
+escheduler-ui/dist/js/16.fecb0fc.js.map
+escheduler-ui/dist/js/17.84be279.js
+escheduler-ui/dist/js/17.84be279.js.map
+escheduler-ui/dist/js/18.307ea70.js
+escheduler-ui/dist/js/18.307ea70.js.map
+escheduler-ui/dist/js/19.144db9c.js
+escheduler-ui/dist/js/19.144db9c.js.map
+escheduler-ui/dist/js/2.8b4ef29.js
+escheduler-ui/dist/js/2.8b4ef29.js.map
+escheduler-ui/dist/js/20.4c527e9.js
+escheduler-ui/dist/js/20.4c527e9.js.map
+escheduler-ui/dist/js/21.831b2a2.js
+escheduler-ui/dist/js/21.831b2a2.js.map
+escheduler-ui/dist/js/22.2b4bb2a.js
+escheduler-ui/dist/js/22.2b4bb2a.js.map
+escheduler-ui/dist/js/23.81467ef.js
+escheduler-ui/dist/js/23.81467ef.js.map
+escheduler-ui/dist/js/24.54a00e4.js
+escheduler-ui/dist/js/24.54a00e4.js.map
+escheduler-ui/dist/js/25.8d7bd36.js
+escheduler-ui/dist/js/25.8d7bd36.js.map
+escheduler-ui/dist/js/26.2ec5e78.js
+escheduler-ui/dist/js/26.2ec5e78.js.map
+escheduler-ui/dist/js/27.3ab48c2.js
+escheduler-ui/dist/js/27.3ab48c2.js.map
+escheduler-ui/dist/js/28.363088a.js
+escheduler-ui/dist/js/28.363088a.js.map
+escheduler-ui/dist/js/29.6c5853a.js
+escheduler-ui/dist/js/29.6c5853a.js.map
+escheduler-ui/dist/js/3.a0edb5b.js
+escheduler-ui/dist/js/3.a0edb5b.js.map
+escheduler-ui/dist/js/30.940fdd3.js
+escheduler-ui/dist/js/30.940fdd3.js.map
+escheduler-ui/dist/js/31.168a460.js
+escheduler-ui/dist/js/31.168a460.js.map
+escheduler-ui/dist/js/32.8df6594.js
+escheduler-ui/dist/js/32.8df6594.js.map
+escheduler-ui/dist/js/33.4480bbe.js
+escheduler-ui/dist/js/33.4480bbe.js.map
+escheduler-ui/dist/js/34.b407fe1.js
+escheduler-ui/dist/js/34.b407fe1.js.map
+escheduler-ui/dist/js/35.f340b0a.js
+escheduler-ui/dist/js/35.f340b0a.js.map
+escheduler-ui/dist/js/36.8880c2d.js
+escheduler-ui/dist/js/36.8880c2d.js.map
+escheduler-ui/dist/js/37.ea2a25d.js
+escheduler-ui/dist/js/37.ea2a25d.js.map
+escheduler-ui/dist/js/38.98a59ee.js
+escheduler-ui/dist/js/38.98a59ee.js.map
+escheduler-ui/dist/js/39.a5e958a.js
+escheduler-ui/dist/js/39.a5e958a.js.map
+escheduler-ui/dist/js/4.4ca44db.js
+escheduler-ui/dist/js/4.4ca44db.js.map
+escheduler-ui/dist/js/40.e187b1e.js
+escheduler-ui/dist/js/40.e187b1e.js.map
+escheduler-ui/dist/js/41.0e89182.js
+escheduler-ui/dist/js/41.0e89182.js.map
+escheduler-ui/dist/js/42.341047c.js
+escheduler-ui/dist/js/42.341047c.js.map
+escheduler-ui/dist/js/43.27b8228.js
+escheduler-ui/dist/js/43.27b8228.js.map
+escheduler-ui/dist/js/44.e8869bc.js
+escheduler-ui/dist/js/44.e8869bc.js.map
+escheduler-ui/dist/js/45.8d54901.js
+escheduler-ui/dist/js/45.8d54901.js.map
+escheduler-ui/dist/js/5.e1ed7f3.js
+escheduler-ui/dist/js/5.e1ed7f3.js.map
+escheduler-ui/dist/js/6.241ba07.js
+escheduler-ui/dist/js/6.241ba07.js.map
+escheduler-ui/dist/js/7.ab2e297.js
+escheduler-ui/dist/js/7.ab2e297.js.map
+escheduler-ui/dist/js/8.83ff814.js
+escheduler-ui/dist/js/8.83ff814.js.map
+escheduler-ui/dist/js/9.39cb29f.js
+escheduler-ui/dist/js/9.39cb29f.js.map
+escheduler-ui/dist/js/common.733e342.js
+escheduler-ui/dist/js/common.733e342.js.map
+escheduler-ui/dist/js/home/index.78a5d12.js
+escheduler-ui/dist/js/home/index.78a5d12.js.map
+escheduler-ui/dist/js/login/index.291b8e3.js
+escheduler-ui/dist/js/login/index.291b8e3.js.map
+escheduler-ui/dist/lib/external/
+escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
+/escheduler-dao/src/main/resources/dao/data_source.properties

escheduler-api/src/main/java/cn/escheduler/api/service/MonitorService.java

@@ -42,9 +42,6 @@ public class MonitorService extends BaseService{
    */
   public Map<String,Object> queryDatabaseState(User loginUser) {
     Map<String, Object> result = new HashMap<>(5);
-    if (checkAdmin(loginUser, result)){
-      return result;
-    }
 
     List<MonitorRecord> monitorRecordList = MonitorDBDao.queryDatabaseState();
 
@@ -63,9 +60,6 @@ public class MonitorService extends BaseService{
    */
   public Map<String,Object> queryZookeeperState(User loginUser) {
     Map<String, Object> result = new HashMap<>(5);
-    if (checkAdmin(loginUser, result)){
-      return result;
-    }
 
     List<ZookeeperRecord> zookeeperRecordList = ZookeeperMonitorUtils.zookeeperInfoList();
 

escheduler-api/src/main/java/cn/escheduler/api/service/ServerService.java

@@ -52,9 +52,6 @@ public class ServerService extends BaseService{
     public Map<String,Object> queryMaster(User loginUser) {
 
         Map<String, Object> result = new HashMap<>(5);
-        if (checkAdmin(loginUser, result)){
-            return result;
-        }
 
         List<MasterServer> masterList = masterServerMapper.queryAllMaster();
         result.put(Constants.DATA_LIST, masterList);
@@ -71,9 +68,6 @@ public class ServerService extends BaseService{
      */
     public Map<String,Object> queryWorker(User loginUser) {
         Map<String, Object> result = new HashMap<>();
-        if (checkAdmin(loginUser, result)){
-            return result;
-        }
 
         List<WorkerServer> workerList = workerServerMapper.queryAllWorker();
         result.put(Constants.DATA_LIST, workerList);