From 12f0b6f9b738ef76c0c28f0e321a0d609ec16237 Mon Sep 17 00:00:00 2001 From: weishao Date: Fri, 10 Mar 2023 12:06:34 +0800 Subject: [PATCH] w --- .drone.yml | 2 +- pom.xml | 2 +- .../java/com/educoder/bridge/controller/MainController.java | 2 +- src/main/java/com/educoder/bridge/handler/WebsshHandler.java | 2 +- src/main/java/com/educoder/bridge/model/SSHInfo.java | 2 +- src/main/java/com/educoder/bridge/model/SSHSession.java | 2 +- .../java/com/educoder/bridge/service/CalculatorService.java | 2 +- src/main/java/com/educoder/bridge/service/JchService.java | 2 +- src/main/java/com/educoder/bridge/utils/Base64Util.java | 2 +- src/main/resources/applicationContext.xml | 2 +- src/main/webapp/WEB-INF/web.xml | 2 +- src/main/webapp/static/css/reset.css | 3 +-- src/main/webapp/static/css/style.css | 5 +---- src/main/webapp/static/css/supersized.css | 3 +-- src/main/webapp/static/css/tooltip.css | 3 +-- src/main/webapp/static/js/formvalid.js | 2 +- src/main/webapp/static/js/main.js | 2 +- src/main/webapp/static/js/supersized-init.js | 2 +- src/main/webapp/static/js/ws.js | 2 +- src/test/java/com/educoder/bridge/CalculatorServiceTest.java | 2 +- src/test/java/com/educoder/bridge/MainTest.java | 2 +- 21 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.drone.yml b/.drone.yml index 26c31aa..fd14308 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,4 +43,4 @@ trigger: - master event: - push - - pull_request + - pull_request \ No newline at end of file diff --git a/pom.xml b/pom.xml index 24cb7ab..c610ea0 100644 --- a/pom.xml +++ b/pom.xml @@ -254,4 +254,4 @@ webssh - + \ No newline at end of file diff --git a/src/main/java/com/educoder/bridge/controller/MainController.java b/src/main/java/com/educoder/bridge/controller/MainController.java index f232380..b076b44 100644 --- a/src/main/java/com/educoder/bridge/controller/MainController.java +++ b/src/main/java/com/educoder/bridge/controller/MainController.java @@ -46,4 +46,4 @@ public class MainController extends BaseController { return mv; } -} +} \ No newline at end of file diff --git a/src/main/java/com/educoder/bridge/handler/WebsshHandler.java b/src/main/java/com/educoder/bridge/handler/WebsshHandler.java index 34665bc..deb4b12 100644 --- a/src/main/java/com/educoder/bridge/handler/WebsshHandler.java +++ b/src/main/java/com/educoder/bridge/handler/WebsshHandler.java @@ -35,4 +35,4 @@ public class WebsshHandler extends TextWebSocketHandler { super.afterConnectionClosed(wsSession, status); jchService.closeByWebSocket(wsSession); } -} +} \ No newline at end of file diff --git a/src/main/java/com/educoder/bridge/model/SSHInfo.java b/src/main/java/com/educoder/bridge/model/SSHInfo.java index 4881f63..4e12350 100644 --- a/src/main/java/com/educoder/bridge/model/SSHInfo.java +++ b/src/main/java/com/educoder/bridge/model/SSHInfo.java @@ -38,4 +38,4 @@ public class SSHInfo { return password; } -} +} \ No newline at end of file diff --git a/src/main/java/com/educoder/bridge/model/SSHSession.java b/src/main/java/com/educoder/bridge/model/SSHSession.java index e9db868..732e8e6 100644 --- a/src/main/java/com/educoder/bridge/model/SSHSession.java +++ b/src/main/java/com/educoder/bridge/model/SSHSession.java @@ -42,4 +42,4 @@ public class SSHSession { public void setOutputStream(OutputStream outputStream) { this.outputStream = outputStream; } -} +} \ No newline at end of file diff --git a/src/main/java/com/educoder/bridge/service/CalculatorService.java b/src/main/java/com/educoder/bridge/service/CalculatorService.java index 3c89704..433f1f4 100644 --- a/src/main/java/com/educoder/bridge/service/CalculatorService.java +++ b/src/main/java/com/educoder/bridge/service/CalculatorService.java @@ -33,4 +33,4 @@ public class CalculatorService { return Math.sqrt(a); } -} +} \ No newline at end of file diff --git a/src/main/java/com/educoder/bridge/service/JchService.java b/src/main/java/com/educoder/bridge/service/JchService.java index 8657d1d..d096ab3 100644 --- a/src/main/java/com/educoder/bridge/service/JchService.java +++ b/src/main/java/com/educoder/bridge/service/JchService.java @@ -258,4 +258,4 @@ public class JchService { public void closeByWebSocket(WebSocketSession webSocketSession) { close(findByWebSocketSession(webSocketSession)); } -} +} \ No newline at end of file diff --git a/src/main/java/com/educoder/bridge/utils/Base64Util.java b/src/main/java/com/educoder/bridge/utils/Base64Util.java index 3ef71ed..fc0d65e 100644 --- a/src/main/java/com/educoder/bridge/utils/Base64Util.java +++ b/src/main/java/com/educoder/bridge/utils/Base64Util.java @@ -49,4 +49,4 @@ public class Base64Util { return encode(str); } -} +} \ No newline at end of file diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml index 620ed30..c910707 100644 --- a/src/main/resources/applicationContext.xml +++ b/src/main/resources/applicationContext.xml @@ -39,4 +39,4 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index e71e27e..d746104 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -60,4 +60,4 @@ - + \ No newline at end of file diff --git a/src/main/webapp/static/css/reset.css b/src/main/webapp/static/css/reset.css index 248aacf..8751bdb 100644 --- a/src/main/webapp/static/css/reset.css +++ b/src/main/webapp/static/css/reset.css @@ -40,5 +40,4 @@ blockquote:before, blockquote:after, q:before, q:after { table { border-collapse: collapse; border-spacing: 0; -} - +} \ No newline at end of file diff --git a/src/main/webapp/static/css/style.css b/src/main/webapp/static/css/style.css index e2073ba..2979cb9 100644 --- a/src/main/webapp/static/css/style.css +++ b/src/main/webapp/static/css/style.css @@ -181,7 +181,4 @@ button:active { .connect a.facebook { background: url(../image/facebook.png) center center no-repeat; } .connect a.twitter { background: url(../image/twitter.png) center center no-repeat; } -.connect a:hover { background-position: center bottom; } - - - +.connect a:hover { background-position: center bottom; } \ No newline at end of file diff --git a/src/main/webapp/static/css/supersized.css b/src/main/webapp/static/css/supersized.css index a507e4d..30d6c1e 100644 --- a/src/main/webapp/static/css/supersized.css +++ b/src/main/webapp/static/css/supersized.css @@ -30,5 +30,4 @@ body { background:#111; height:100%; } #supersized li.prevslide img, #supersized li.activeslide img{ display:inline; } -#supersized img { max-width: none !important } - +#supersized img { max-width: none !important } \ No newline at end of file diff --git a/src/main/webapp/static/css/tooltip.css b/src/main/webapp/static/css/tooltip.css index 978506f..9498363 100644 --- a/src/main/webapp/static/css/tooltip.css +++ b/src/main/webapp/static/css/tooltip.css @@ -21,5 +21,4 @@ border: 5px solid transparent; border-right: 7px #000; border-left-width: 7px; -} - +} \ No newline at end of file diff --git a/src/main/webapp/static/js/formvalid.js b/src/main/webapp/static/js/formvalid.js index 4106442..92808af 100644 --- a/src/main/webapp/static/js/formvalid.js +++ b/src/main/webapp/static/js/formvalid.js @@ -231,4 +231,4 @@ var errorMsg = {}; }); -})(jQuery); +})(jQuery); \ No newline at end of file diff --git a/src/main/webapp/static/js/main.js b/src/main/webapp/static/js/main.js index ffca14c..6e08697 100644 --- a/src/main/webapp/static/js/main.js +++ b/src/main/webapp/static/js/main.js @@ -121,4 +121,4 @@ function connect() { } } } -} +} \ No newline at end of file diff --git a/src/main/webapp/static/js/supersized-init.js b/src/main/webapp/static/js/supersized-init.js index 1ddf94f..9c128db 100644 --- a/src/main/webapp/static/js/supersized-init.js +++ b/src/main/webapp/static/js/supersized-init.js @@ -27,4 +27,4 @@ jQuery(function($){ }); -}); +}); \ No newline at end of file diff --git a/src/main/webapp/static/js/ws.js b/src/main/webapp/static/js/ws.js index b7e1cca..ab623c1 100644 --- a/src/main/webapp/static/js/ws.js +++ b/src/main/webapp/static/js/ws.js @@ -64,4 +64,4 @@ WSSHClient.prototype.sendClientData = function (data) { console.log("发送客户端数据：" + data) } -var client = new WSSHClient(); +var client = new WSSHClient(); \ No newline at end of file diff --git a/src/test/java/com/educoder/bridge/CalculatorServiceTest.java b/src/test/java/com/educoder/bridge/CalculatorServiceTest.java index e2e9d4f..3199d54 100644 --- a/src/test/java/com/educoder/bridge/CalculatorServiceTest.java +++ b/src/test/java/com/educoder/bridge/CalculatorServiceTest.java @@ -62,4 +62,4 @@ public class CalculatorServiceTest { } } -} +} \ No newline at end of file diff --git a/src/test/java/com/educoder/bridge/MainTest.java b/src/test/java/com/educoder/bridge/MainTest.java index 9a07b17..8d9baa9 100644 --- a/src/test/java/com/educoder/bridge/MainTest.java +++ b/src/test/java/com/educoder/bridge/MainTest.java @@ -23,4 +23,4 @@ public class MainTest { assert i > 10 : String.format("变量i=%s,需要大于10", i); } -} +} \ No newline at end of file