From aa8e640be0714396dacf890efa764d9a5af388de Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 6 Jul 2021 15:29:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devops/sql/duckula.sql | 2 +- .../controller/service/deploy/DeployHost.java | 8 ++++++-- .../tams/duckula/ops/pages/runing/DumpManager.tml | 12 ++++++++---- .../tams/duckula/ops/pages/runing/TaskManager.tml | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/devops/sql/duckula.sql b/devops/sql/duckula.sql index c158a19..8c82bf0 100644 --- a/devops/sql/duckula.sql +++ b/devops/sql/duckula.sql @@ -132,7 +132,7 @@ INSERT INTO `common_dump` VALUES (1345047408696401921, 'localhost_56_es', 'test` -- ---------------------------- DROP TABLE IF EXISTS `common_instance`; CREATE TABLE `common_instance` ( - `id` bigint(20) UNSIGNED NOT NULL, + `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '数据库实例名', `host` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL, `port` int(255) NULL DEFAULT 3306 COMMENT '端口', diff --git a/src/main/java/net/wicp/tams/app/duckula/controller/service/deploy/DeployHost.java b/src/main/java/net/wicp/tams/app/duckula/controller/service/deploy/DeployHost.java index 7b7c783..b588d61 100644 --- a/src/main/java/net/wicp/tams/app/duckula/controller/service/deploy/DeployHost.java +++ b/src/main/java/net/wicp/tams/app/duckula/controller/service/deploy/DeployHost.java @@ -90,10 +90,14 @@ public class DeployHost implements IDeploy { try { conn = SSHAssit.getConn(commonDeploy.getHost(), commonDeploy.getPort(), "duckula", commonDeploy.getPwdDuckula(), 0); - Result result = SSHAssit.callCommand(conn, CommandCentOs.ls, configName + ".properties", - "/data/duckula-data/conf"); + //这是查看这个文件有没有 +// Result result = SSHAssit.callCommand(conn, CommandCentOs.ls, configName + ".properties", +// "/data/duckula-data/conf"); // message示例: -rwxr--r--. 1 duckula duckula 1595 2020-11-15 22:14:25 // ct-rjzjh-jdbc.properties + //查看内容 + Result result = SSHAssit.callCommand(conn, CommandCentOs.cat,"",String.format("%s/%s.properties", "/data/duckula-data/conf",configName)); + // 考虑中英文的问题 if ("没有异常".equals(result.getMessage()) || "No Exception".equals(result.getMessage()) || StringUtil.isNull(result.getMessage())) { diff --git a/src/main/resources/net/wicp/tams/duckula/ops/pages/runing/DumpManager.tml b/src/main/resources/net/wicp/tams/duckula/ops/pages/runing/DumpManager.tml index 08dafe5..2d7b9c3 100644 --- a/src/main/resources/net/wicp/tams/duckula/ops/pages/runing/DumpManager.tml +++ b/src/main/resources/net/wicp/tams/duckula/ops/pages/runing/DumpManager.tml @@ -8,7 +8,7 @@ + dialogStyle="width:1200px;height:560px;" initAddHandle="initAdd" initSaveHandle="initUpdate" queryButs="[{'id':'viewLogBut','iconCls':'icon-attach','text':'查看日志'},{'id':'viewConfigBut','iconCls':'icon-attach','text':'查看配置'},{'id':'taskdownBut','iconCls':'icon-attach','text':'任务离线下载'}]" saveCheckHandle="saveCheck" pagination="true"/> @@ -64,7 +64,7 @@
- @@ -202,9 +202,10 @@ //把权限退到“保存”按钮，这样就可以查看任务了 var reg = RegExp(/未布署/); var opt=!reg.test(row.taskStatus); - if(opt){ + if(opt){ $('#q_saveDoBut').linkbutton('disable').unbind('click'); }else{ + $('#q_saveDoBut').unbind('click'); $('#q_saveDoBut').linkbutton('enable').click(function(){ _doSaveRecode(); }); @@ -498,20 +499,23 @@ onAfterEdit: updateRuleInput }); - $('#viewLogBut').linkbutton('disable'); + $('#viewLogBut').linkbutton('disable'); $('#viewConfigBut').linkbutton('disable'); $('#q_grid').datagrid({ onSelect: function(rowIndex, row){ var reg = RegExp(/未布署/); var opt=!reg.test(row.taskStatus); if(opt){ + $('#viewLogBut').unbind('click'); $('#viewLogBut').linkbutton('enable').bind('click', viewLog); }else{ $('#viewLogBut').linkbutton('disable').unbind('click',viewLog,false); } + $('#viewConfigBut').unbind('click'); $('#viewConfigBut').linkbutton('enable').bind('click', viewConfig); } }); + $('#taskdownBut').unbind('click'); $('#taskdownBut').bind('click', taskdown); $('#dgFilter').edatagrid({ data: [ diff --git a/src/main/resources/net/wicp/tams/duckula/ops/pages/runing/TaskManager.tml b/src/main/resources/net/wicp/tams/duckula/ops/pages/runing/TaskManager.tml index 164f327..aeb9103 100644 --- a/src/main/resources/net/wicp/tams/duckula/ops/pages/runing/TaskManager.tml +++ b/src/main/resources/net/wicp/tams/duckula/ops/pages/runing/TaskManager.tml @@ -75,7 +75,7 @@
- -- GitLab