Browse Source

bug fixed and support for properies file type editing (#680)

* make the edit button of the properties file clickable

* bug fixed - Service Management only shows one device status

* bug fixed, the master server cannot be validated at startup because parameters 'masterZNode' are not initialized
pull/2/head
Cheko.R 5 years ago committed by dailidong
parent
commit
58879c7dcf
  1. 3
      escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java
  2. 2
      escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
  3. 3
      escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js

3
escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java

@ -344,9 +344,12 @@ public abstract class AbstractZKClient {
String parentPath = getZNodeParentPath(zkNodeType); String parentPath = getZNodeParentPath(zkNodeType);
List<MasterServer> masterServers = new ArrayList<>(); List<MasterServer> masterServers = new ArrayList<>();
int i = 0;
for(String path : masterMap.keySet()){ for(String path : masterMap.keySet()){
MasterServer masterServer = ResInfo.parseHeartbeatForZKInfo(masterMap.get(path)); MasterServer masterServer = ResInfo.parseHeartbeatForZKInfo(masterMap.get(path));
masterServer.setZkDirectory( parentPath + "/"+ path); masterServer.setZkDirectory( parentPath + "/"+ path);
masterServer.setId(i);
i ++;
masterServers.add(masterServer); masterServers.add(masterServer);
} }
return masterServers; return masterServers;

2
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js

@ -18,6 +18,6 @@
/** /**
* Create file type * Create file type
*/ */
let filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql'] let filtTypeArr = ['txt', 'log', 'sh', 'conf', 'cfg', 'py', 'java', 'sql', 'xml', 'hql', 'properties']
export { filtTypeArr } export { filtTypeArr }

3
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js

@ -28,7 +28,8 @@ const handlerSuffix = {
'.java': 'textile', '.java': 'textile',
'.sql': 'sql', '.sql': 'sql',
'.hql': 'sql', '.hql': 'sql',
'.xml': 'xml' '.xml': 'xml',
'.properties': 'textile'
} }

Loading…
Cancel
Save