Skip to content

duckula-ops
duckula-ops

duckula / duckula-ops

通知 6
Star 1
Fork 0
duckula-ops
duckula-ops

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 aa8e640b 编写于 作者: 偏锋书生's avatar 偏锋书生
浏览文件
操作

修复一些问题

上级 c176ab62
显示空白变更内容
内联 并排
Showing with 16 addition and 8 deletion
devops/sql/duckula.sql
浏览文件 @ aa8e640b
...@@ -132,7 +132,7 @@ INSERT INTO `common_dump` VALUES (1345047408696401921, 'localhost_56_es', 'test` ...@@ -132,7 +132,7 @@ INSERT INTO `common_dump` VALUES (1345047408696401921, 'localhost_56_es', 'test`
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `common_instance`; DROP TABLE IF EXISTS `common_instance`;
CREATE TABLE `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 '数据库实例名', `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, `host` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
`port` int(255) NULL DEFAULT 3306 COMMENT '端口', `port` int(255) NULL DEFAULT 3306 COMMENT '端口',
......
src/main/java/net/wicp/tams/app/duckula/controller/service/deploy/DeployHost.java
浏览文件 @ aa8e640b
...@@ -90,10 +90,14 @@ public class DeployHost implements IDeploy { ...@@ -90,10 +90,14 @@ public class DeployHost implements IDeploy {
try { try {
conn = SSHAssit.getConn(commonDeploy.getHost(), commonDeploy.getPort(), "duckula", conn = SSHAssit.getConn(commonDeploy.getHost(), commonDeploy.getPort(), "duckula",
commonDeploy.getPwdDuckula(), 0); 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 // message示例: -rwxr--r--. 1 duckula duckula 1595 2020-11-15 22:14:25
// ct-rjzjh-jdbc.properties // 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()) if ("没有异常".equals(result.getMessage()) || "No Exception".equals(result.getMessage())
|| StringUtil.isNull(result.getMessage())) { || StringUtil.isNull(result.getMessage())) {
......
src/main/resources/net/wicp/tams/duckula/ops/pages/runing/DumpManager.tml
浏览文件 @ aa8e640b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<body> <body>
<r:query id="q" qBlock="query" queryUrl="/runing/DumpManager:query" uBlock="save" saveUrl="/runing/DumpManager:save" deleteUrl="/runing/DumpManager:del" opFormatter="showopt" <r:query id="q" qBlock="query" queryUrl="/runing/DumpManager:query" uBlock="save" saveUrl="/runing/DumpManager:save" deleteUrl="/runing/DumpManager:del" opFormatter="showopt"
columns="[[{field:'name',width:200,title:'全量任务名'},{field:'version1',width:100,title:'版本'},{field:'deployId1',width:150,title:'布署环境'},{field:'middlewareId1',width:150,title:'目的中间件'},{field:'instanceId1',width:350,title:'监听实例'},{field:'taskStatus',width:150,title:'运行状态'},{field:'op',width:360,title:'操作'}]]" columns="[[{field:'name',width:200,title:'全量任务名'},{field:'version1',width:100,title:'版本'},{field:'deployId1',width:150,title:'布署环境'},{field:'middlewareId1',width:150,title:'目的中间件'},{field:'instanceId1',width:350,title:'监听实例'},{field:'taskStatus',width:150,title:'运行状态'},{field:'op',width:360,title:'操作'}]]"
dialogStyle="width:900px;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"/> 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"/>
<t:block id="query"> <t:block id="query">
<table class="frame_table_list_4"> <table class="frame_table_list_4">
<tr> <tr>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</tr> </tr>
<tr name="showmodel"> <tr name="showmodel">
<td colspan="4"> <td colspan="4">
<table id="dg" title="规则编辑" style="width:98%;height:200px" <table id="dg" title="规则编辑" style="width:98%;height:220px"
toolbar="#toolbar" pagination="false" idField="id" toolbar="#toolbar" pagination="false" idField="id"
rownumbers="false" fitColumns="true" singleSelect="true"> rownumbers="false" fitColumns="true" singleSelect="true">
<thead> <thead>
...@@ -205,6 +205,7 @@ ...@@ -205,6 +205,7 @@
if(opt){ if(opt){
$('#q_saveDoBut').linkbutton('disable').unbind('click'); $('#q_saveDoBut').linkbutton('disable').unbind('click');
}else{ }else{
$('#q_saveDoBut').unbind('click');
$('#q_saveDoBut').linkbutton('enable').click(function(){ $('#q_saveDoBut').linkbutton('enable').click(function(){
_doSaveRecode(); _doSaveRecode();
}); });
...@@ -505,13 +506,16 @@ ...@@ -505,13 +506,16 @@
var reg = RegExp(/未布署/); var reg = RegExp(/未布署/);
var opt=!reg.test(row.taskStatus); var opt=!reg.test(row.taskStatus);
if(opt){ if(opt){
$('#viewLogBut').unbind('click');
$('#viewLogBut').linkbutton('enable').bind('click', viewLog); $('#viewLogBut').linkbutton('enable').bind('click', viewLog);
}else{ }else{
$('#viewLogBut').linkbutton('disable').unbind('click',viewLog,false); $('#viewLogBut').linkbutton('disable').unbind('click',viewLog,false);
} }
$('#viewConfigBut').unbind('click');
$('#viewConfigBut').linkbutton('enable').bind('click', viewConfig); $('#viewConfigBut').linkbutton('enable').bind('click', viewConfig);
} }
}); });
$('#taskdownBut').unbind('click');
$('#taskdownBut').bind('click', taskdown); $('#taskdownBut').bind('click', taskdown);
$('#dgFilter').edatagrid({ $('#dgFilter').edatagrid({
data: [ data: [
......
src/main/resources/net/wicp/tams/duckula/ops/pages/runing/TaskManager.tml
浏览文件 @ aa8e640b
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</tr> </tr>
<tr name="showmodel"> <tr name="showmodel">
<td colspan="4"> <td colspan="4">
<table id="dg" title="规则编辑" style="width:98%;height:180px" <table id="dg" title="规则编辑" style="width:98%;height:210px"
toolbar="#toolbar" pagination="false" idField="id" toolbar="#toolbar" pagination="false" idField="id"
rownumbers="false" fitColumns="true" singleSelect="true"> rownumbers="false" fitColumns="true" singleSelect="true">
<thead> <thead>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或