From d6efc56e08b128ee4623ee3436104567c09866e3 Mon Sep 17 00:00:00 2001 From: John Wu <524306184@qq.com> Date: Mon, 8 Jun 2020 21:26:18 +0800 Subject: [PATCH 1/5] fix: ssh result alert --- src/assets/languages/en-US.json | 3 ++- src/assets/languages/zh-CN.json | 1 + src/views/GameBox.vue | 19 ++++++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/assets/languages/en-US.json b/src/assets/languages/en-US.json index 7c87994..59d3f7d 100644 --- a/src/assets/languages/en-US.json +++ b/src/assets/languages/en-US.json @@ -98,7 +98,8 @@ "ssh_user": "Flag SSH User Name", "ssh_password": "Flag SSH Password", "test_ssh": "Test SSH Connection", - "test_ssh_success": "SSH Connect Successfully！" + "test_ssh_success": "SSH Connect Successfully！", + "test_ssh_fail": "Fail to Connect the SSH." }, "login": { "account": "Account", diff --git a/src/assets/languages/zh-CN.json b/src/assets/languages/zh-CN.json index dde13a3..cbf1108 100644 --- a/src/assets/languages/zh-CN.json +++ b/src/assets/languages/zh-CN.json @@ -98,6 +98,7 @@ "ssh_user": "Flag SSH 用户名", "ssh_password": "Flag SSH 密码", "test_ssh": "测试 SSH 连接", + "test_ssh_fail": "SSH 连接失败", "test_ssh_success": "SSH 连接全部成功！" }, "login": { diff --git a/src/views/GameBox.vue b/src/views/GameBox.vue index b7bf105..7802f1b 100644 --- a/src/views/GameBox.vue +++ b/src/views/GameBox.vue @@ -181,6 +181,14 @@ {{$t('gamebox.edit')}} + + +
+
+ {{$t('general.apply')}} +
+ + @@ -191,6 +199,7 @@ newGameBoxDialogVisible: false, editGameBoxDialogVisible: false, mutliGameBoxDialogVisible: false, + sshFailDialogVisible: false, sshTesting: false, gameBoxList: null, @@ -210,6 +219,7 @@ }, mutliGameBoxJSON: '', + sshFailContent: '', page: 1, per: 10, @@ -333,13 +343,12 @@ if (res === null) { return this.$message.success(this.$i18n.t("gamebox.test_ssh_success")) } - let content = '' + + this.sshFailContent = '' res.forEach(item => { - content += `

TeamID：${item.TeamID}
ChallengeID：${item.ChallengeID}
GameBoxID：${item.GameBoxID}
Error：${item.Error}

` + this.sshFailContent += `TeamID：${item.TeamID}
ChallengeID：${item.ChallengeID}
GameBoxID：${item.GameBoxID}
Error：${item.Error}
` }) - this.$alert(content, '测试失败', { - dangerouslyUseHTMLString: true - }); + this.sshFailDialogVisible = true }) } } From a2acce88ea40e06c5547911cc6e4e17346529aa0 Mon Sep 17 00:00:00 2001 From: John Wu <524306184@qq.com> Date: Mon, 8 Jun 2020 21:37:24 +0800 Subject: [PATCH 2/5] update: flag command shell instruction --- src/assets/languages/en-US.json | 2 +- src/assets/languages/zh-CN.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/languages/en-US.json b/src/assets/languages/en-US.json index 59d3f7d..fdb923a 100644 --- a/src/assets/languages/en-US.json +++ b/src/assets/languages/en-US.json @@ -41,7 +41,7 @@ "new": "New Challenge", "edit": "Edit Challenge", "auto_refresh_flag": "Update Flag Automatically", - "command": "Update Flag Command", + "command": "Update Flag Shell Command", "flag_placeholder": "Flag Placeholder " }, "panel": { diff --git a/src/assets/languages/zh-CN.json b/src/assets/languages/zh-CN.json index cbf1108..eb9f659 100644 --- a/src/assets/languages/zh-CN.json +++ b/src/assets/languages/zh-CN.json @@ -41,7 +41,7 @@ "new": "添加 Challenge", "edit": "编辑题目", "auto_refresh_flag": "自动更新 Flag", - "command": "更新 Flag 命令", + "command": "更新 Flag Shell 命令", "flag_placeholder": "Flag 占位符 " }, "panel": { From bcab1fbd6b4f5bee5cb63bcbb6d274bc8e481db0 Mon Sep 17 00:00:00 2001 From: John Wu <524306184@qq.com> Date: Mon, 8 Jun 2020 21:54:41 +0800 Subject: [PATCH 3/5] feat: test ssh connection --- src/assets/languages/en-US.json | 7 +++++-- src/assets/languages/zh-CN.json | 7 +++++-- src/views/GameBox.vue | 24 ++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/assets/languages/en-US.json b/src/assets/languages/en-US.json index fdb923a..b2dcc6d 100644 --- a/src/assets/languages/en-US.json +++ b/src/assets/languages/en-US.json @@ -8,7 +8,9 @@ "operate": "Options", "edit": "Edit", "delete": "Delete", - "export": "Export" + "export": "Export", + "success": "Success", + "fail": "Fail" }, "header": { "panel": "Dashboard", @@ -99,7 +101,8 @@ "ssh_password": "Flag SSH Password", "test_ssh": "Test SSH Connection", "test_ssh_success": "SSH Connect Successfully！", - "test_ssh_fail": "Fail to Connect the SSH." + "test_ssh_fail": "Fail to Connect the SSH.", + "input_shell_command": "Please input the shell command to test" }, "login": { "account": "Account", diff --git a/src/assets/languages/zh-CN.json b/src/assets/languages/zh-CN.json index eb9f659..b31fcd7 100644 --- a/src/assets/languages/zh-CN.json +++ b/src/assets/languages/zh-CN.json @@ -8,7 +8,9 @@ "operate": "操作", "edit": "编辑", "delete": "删除", - "export": "导出" + "export": "导出", + "success": "成功", + "fail": "失败" }, "header": { "panel": "数据大屏", @@ -99,7 +101,8 @@ "ssh_password": "Flag SSH 密码", "test_ssh": "测试 SSH 连接", "test_ssh_fail": "SSH 连接失败", - "test_ssh_success": "SSH 连接全部成功！" + "test_ssh_success": "SSH 连接全部成功！", + "input_shell_command": "请输入需要测试的 Shell 命令" }, "login": { "account": "账号", diff --git a/src/views/GameBox.vue b/src/views/GameBox.vue index 7802f1b..772644e 100644 --- a/src/views/GameBox.vue +++ b/src/views/GameBox.vue @@ -1,7 +1,7 @@