diff --git a/README.md b/README.md index bb7aa0f805fb766b2024340a6c12b74771a101c1..4c0b3707646bf2a0d0ac3fb866139685a8ec6d99 100644 --- a/README.md +++ b/README.md @@ -43,17 +43,17 @@ java -jar meteor-console-0.0.1-SNAPSHOT & ``` -3. 运行meteor-plugin中的meteor-proxy.jar,启动了 7777端口 和 8080端口 +3. 运行meteor-plugin中的arthas-tunnel-server-xxx.jar,启动了 7777端口 和 8080端口 ``` -java -jar meteor-proxy.jar & +java -jar arthas-tunnel-server-xxx.jar & ``` 如果不想使用8080端口,可以进行修改,如:9999 ``` -java -jar -Dserver.port=9999 meteor-proxy.jar & +java -jar -Dserver.port=9999 arthas-tunnel-server-xxx.jar & ``` #### 使用说明 diff --git a/meteor-console/src/main/resources/agent/meteor.tar.gz b/meteor-console/src/main/resources/agent/meteor.tar.gz index 815f2c6ae0a17b036aab51f3e38025c0ca96fc94..3fa0e6dadeacf56cf09e1cbfd36ae3f0b95947f4 100644 Binary files a/meteor-console/src/main/resources/agent/meteor.tar.gz and b/meteor-console/src/main/resources/agent/meteor.tar.gz differ diff --git a/meteor-console/src/main/resources/templates/backstage/backstage-notice.ftl b/meteor-console/src/main/resources/templates/backstage/backstage-notice.ftl index 52bfaa0f8458b38d074d6787d51c11e6213106dc..c43ab5d416d925e59a5beb8b7d4ee75210d65cc9 100644 --- a/meteor-console/src/main/resources/templates/backstage/backstage-notice.ftl +++ b/meteor-console/src/main/resources/templates/backstage/backstage-notice.ftl @@ -15,7 +15,7 @@
  • 点击【启动/关闭】,关闭服务器整断权限
  • 点击【初始化】对服务器进行初始化
  • 在弹出框中先点击【开启Agent】按钮,等待agent服务器中开启
  • -
  • 然后在【选择应用】 中填入要启动的应用编号,点击【确定应用】,确定要整段的应用
  • +
  • 然后在【选择应用】 中填入要启动的应用编号,点击【确定应用】,确定要诊断的应用
  • 第二步:【Meteor】-【服务器列表】选择服务器

    diff --git a/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-agent.ftl b/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-agent.ftl index f44033e1f10d68d9a1f4054b856ae44828adf3e6..b2e86b0f493bd797a763c8bdf3e68ec998a3394f 100644 --- a/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-agent.ftl +++ b/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-agent.ftl @@ -59,7 +59,7 @@ if (null != data && data.indexOf("[arthas@") >= 0) { var id = '${machine.id}'; var url = "${base}/meteor/machineinfo/modifyServerStatus/" + id + "/2"; - if (data.indexOf("going to shutdown")>=0) { + if (data.indexOf("going to shut")>=0) { url = "${base}/meteor/machineinfo/modifyServerStatus/" + id + "/4"; } $.ajax({ diff --git a/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-input.ftl b/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-input.ftl index 7f60f22f844d9faa8512ae8d317ccd05ed1bad36..980bf7dec7f174f9415a07497ddaa0ead2414c95 100644 --- a/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-input.ftl +++ b/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-input.ftl @@ -38,11 +38,11 @@ value="<#if (machineinfo.port)?? && machineinfo.port!=''>${machineinfo.port}<#else>22" check-type="number"> - <@formgroup title='agentIP/proxyIP'> + <@formgroup title='agent/proxyIP'> - <@formgroup title='agent端口'> + <@formgroup title='agent/proxyPort'> diff --git a/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-list.ftl b/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-list.ftl index 9f6c4a1470fd18d6af412fb5ffb9809ee5d86bc7..958e5739b208e162ef517531aa15eb860eb66199 100644 --- a/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-list.ftl +++ b/meteor-console/src/main/resources/templates/meteor/machineinfo/machineinfo-list.ftl @@ -20,8 +20,8 @@ RSA_ID 登陆账号 SSH端口号 - agentIP - agent端口 + Agent/proxyIP + Agent/ProxyPORT agentId 模块名称 状态 diff --git a/meteor-plugin/meteor-agent.tar.gz b/meteor-plugin/arthas-3.1.7-bin.zip similarity index 56% rename from meteor-plugin/meteor-agent.tar.gz rename to meteor-plugin/arthas-3.1.7-bin.zip index 815f2c6ae0a17b036aab51f3e38025c0ca96fc94..f8748df2781824f4f2250a725b39feb97171c4cd 100644 Binary files a/meteor-plugin/meteor-agent.tar.gz and b/meteor-plugin/arthas-3.1.7-bin.zip differ diff --git a/meteor-plugin/meteor-proxy.jar b/meteor-plugin/arthas-tunnel-server-3.1.7.jar similarity index 99% rename from meteor-plugin/meteor-proxy.jar rename to meteor-plugin/arthas-tunnel-server-3.1.7.jar index e09ec46b0b201c3f8e3b6b6057e934d0f6464b09..49a34075ec1b5fa9eaee1e5cf9ba9d59149c6b5d 100644 Binary files a/meteor-plugin/meteor-proxy.jar and b/meteor-plugin/arthas-tunnel-server-3.1.7.jar differ