Merge branch 'master' of http://192.168.1.220:10080/esb/esb

hos-broker/src/main/java/com/yihu/hos/broker/common/shell/SSHLinuxTool.java

@@ -24,7 +24,7 @@ public class SSHLinuxTool {
    @Value("${hos.jcraft.host}")
    private String host;
    @Value("${hos.jcraft.port}")
    private Integer port;
    private String port;
    @Value("${hos.jcraft.user}")
    private String user;
    @Value("${hos.jcraft.password}")
@@ -41,7 +41,7 @@ public class SSHLinuxTool {
     */
    public Session getsessionConn() throws JSchException {
        JSch jsch = new JSch();
        Session session = jsch.getSession(user, host, port);
        Session session = jsch.getSession(user, host, Integer.parseInt(port));
        session.setConfig("StrictHostKeyChecking", "no");
        //    java.util.Properties config = new java.util.Properties();
        //   config.put("StrictHostKeyChecking", "no");

hos-broker/src/main/java/com/yihu/hos/broker/services/MycatConfigService.java

@@ -235,9 +235,4 @@ public class MycatConfigService {
        return doc;
    }
    public static void main(String[] args) throws Exception {
        MycatConfigService service = new MycatConfigService();
        service.mycatRestart("e://mycat");
    }
}

src/main/webapp/WEB-INF/ehr/jsp/monitor/server/sEnvManageJs.jsp

@@ -83,6 +83,7 @@
        //初始化树
        $.ajax({
            type: "GET",
            dataType : "json",
            url: "${contextRoot}/monitor/server/trees",
            async: false,
            success: function (msg) {