weishao 1 year ago
parent
commit
12f0b6f9b7
21 changed files with 21 additions and 27 deletions
  1. +1
    -1
      .drone.yml
  2. +1
    -1
      pom.xml
  3. +1
    -1
      src/main/java/com/educoder/bridge/controller/MainController.java
  4. +1
    -1
      src/main/java/com/educoder/bridge/handler/WebsshHandler.java
  5. +1
    -1
      src/main/java/com/educoder/bridge/model/SSHInfo.java
  6. +1
    -1
      src/main/java/com/educoder/bridge/model/SSHSession.java
  7. +1
    -1
      src/main/java/com/educoder/bridge/service/CalculatorService.java
  8. +1
    -1
      src/main/java/com/educoder/bridge/service/JchService.java
  9. +1
    -1
      src/main/java/com/educoder/bridge/utils/Base64Util.java
  10. +1
    -1
      src/main/resources/applicationContext.xml
  11. +1
    -1
      src/main/webapp/WEB-INF/web.xml
  12. +1
    -2
      src/main/webapp/static/css/reset.css
  13. +1
    -4
      src/main/webapp/static/css/style.css
  14. +1
    -2
      src/main/webapp/static/css/supersized.css
  15. +1
    -2
      src/main/webapp/static/css/tooltip.css
  16. +1
    -1
      src/main/webapp/static/js/formvalid.js
  17. +1
    -1
      src/main/webapp/static/js/main.js
  18. +1
    -1
      src/main/webapp/static/js/supersized-init.js
  19. +1
    -1
      src/main/webapp/static/js/ws.js
  20. +1
    -1
      src/test/java/com/educoder/bridge/CalculatorServiceTest.java
  21. +1
    -1
      src/test/java/com/educoder/bridge/MainTest.java

+ 1
- 1
.drone.yml View File

@@ -43,4 +43,4 @@ trigger:
- master - master
event: event:
- push - push
- pull_request
- pull_request

+ 1
- 1
pom.xml View File

@@ -254,4 +254,4 @@


<finalName>webssh</finalName> <finalName>webssh</finalName>
</build> </build>
</project>
</project>

+ 1
- 1
src/main/java/com/educoder/bridge/controller/MainController.java View File

@@ -46,4 +46,4 @@ public class MainController extends BaseController {
return mv; return mv;
} }


}
}

+ 1
- 1
src/main/java/com/educoder/bridge/handler/WebsshHandler.java View File

@@ -35,4 +35,4 @@ public class WebsshHandler extends TextWebSocketHandler {
super.afterConnectionClosed(wsSession, status); super.afterConnectionClosed(wsSession, status);
jchService.closeByWebSocket(wsSession); jchService.closeByWebSocket(wsSession);
} }
}
}

+ 1
- 1
src/main/java/com/educoder/bridge/model/SSHInfo.java View File

@@ -38,4 +38,4 @@ public class SSHInfo {
return password; return password;
} }


}
}

+ 1
- 1
src/main/java/com/educoder/bridge/model/SSHSession.java View File

@@ -42,4 +42,4 @@ public class SSHSession {
public void setOutputStream(OutputStream outputStream) { public void setOutputStream(OutputStream outputStream) {
this.outputStream = outputStream; this.outputStream = outputStream;
} }
}
}

+ 1
- 1
src/main/java/com/educoder/bridge/service/CalculatorService.java View File

@@ -33,4 +33,4 @@ public class CalculatorService {
return Math.sqrt(a); return Math.sqrt(a);
} }


}
}

+ 1
- 1
src/main/java/com/educoder/bridge/service/JchService.java View File

@@ -258,4 +258,4 @@ public class JchService {
public void closeByWebSocket(WebSocketSession webSocketSession) { public void closeByWebSocket(WebSocketSession webSocketSession) {
close(findByWebSocketSession(webSocketSession)); close(findByWebSocketSession(webSocketSession));
} }
}
}

+ 1
- 1
src/main/java/com/educoder/bridge/utils/Base64Util.java View File

@@ -49,4 +49,4 @@ public class Base64Util {
return encode(str); return encode(str);
} }


}
}

+ 1
- 1
src/main/resources/applicationContext.xml View File

@@ -39,4 +39,4 @@


<bean id="websshHandler" class="com.educoder.bridge.handler.WebsshHandler"/> <bean id="websshHandler" class="com.educoder.bridge.handler.WebsshHandler"/>


</beans>
</beans>

+ 1
- 1
src/main/webapp/WEB-INF/web.xml View File

@@ -60,4 +60,4 @@
<welcome-file></welcome-file> <welcome-file></welcome-file>
</welcome-file-list> </welcome-file-list>


</web-app>
</web-app>

+ 1
- 2
src/main/webapp/static/css/reset.css View File

@@ -40,5 +40,4 @@ blockquote:before, blockquote:after, q:before, q:after {
table { table {
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
}

}

+ 1
- 4
src/main/webapp/static/css/style.css View File

@@ -181,7 +181,4 @@ button:active {
.connect a.facebook { background: url(../image/facebook.png) center center no-repeat; } .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.twitter { background: url(../image/twitter.png) center center no-repeat; }


.connect a:hover { background-position: center bottom; }



.connect a:hover { background-position: center bottom; }

+ 1
- 2
src/main/webapp/static/css/supersized.css View File

@@ -30,5 +30,4 @@ body { background:#111; height:100%; }
#supersized li.prevslide img, #supersized li.activeslide img{ display:inline; } #supersized li.prevslide img, #supersized li.activeslide img{ display:inline; }




#supersized img { max-width: none !important }

#supersized img { max-width: none !important }

+ 1
- 2
src/main/webapp/static/css/tooltip.css View File

@@ -21,5 +21,4 @@
border: 5px solid transparent; border: 5px solid transparent;
border-right: 7px #000; border-right: 7px #000;
border-left-width: 7px; border-left-width: 7px;
}

}

+ 1
- 1
src/main/webapp/static/js/formvalid.js View File

@@ -231,4 +231,4 @@ var errorMsg = {};


}); });


})(jQuery);
})(jQuery);

+ 1
- 1
src/main/webapp/static/js/main.js View File

@@ -121,4 +121,4 @@ function connect() {
} }
} }
} }
}
}

+ 1
- 1
src/main/webapp/static/js/supersized-init.js View File

@@ -27,4 +27,4 @@ jQuery(function($){


}); });


});
});

+ 1
- 1
src/main/webapp/static/js/ws.js View File

@@ -64,4 +64,4 @@ WSSHClient.prototype.sendClientData = function (data) {
console.log("发送客户端数据:" + data) console.log("发送客户端数据:" + data)
} }


var client = new WSSHClient();
var client = new WSSHClient();

+ 1
- 1
src/test/java/com/educoder/bridge/CalculatorServiceTest.java View File

@@ -62,4 +62,4 @@ public class CalculatorServiceTest {
} }
} }


}
}

+ 1
- 1
src/test/java/com/educoder/bridge/MainTest.java View File

@@ -23,4 +23,4 @@ public class MainTest {
assert i > 10 : String.format("变量i=%s,需要大于10", i); assert i > 10 : String.format("变量i=%s,需要大于10", i);
} }


}
}

Loading…
Cancel
Save