サーバー側のパッケージ名など変更

onozaty · Jan 21, 2018 · 289272d · 289272d
1 parent 3659a59
commit 289272d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 26 deletions.
diff --git a/shared-camera-server/settings.gradle b/shared-camera-server/settings.gradle
@@ -1,19 +1 @@
-/*
- * This settings file was auto generated by the Gradle buildInit task
- * by 'onozato' at '18/01/14 0:04' with Gradle 2.14.1
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at https://docs.gradle.org/2.14.1/userguide/multi_project_builds.html
- */
-
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
-
 rootProject.name = 'shared-camera-server'
diff --git a/...joyxstudy/sharedcamera/BinaryHandler.java → ...dcamera/server/ImageWebSocketHandler.java b/...joyxstudy/sharedcamera/BinaryHandler.java → ...dcamera/server/ImageWebSocketHandler.java
@@ -1,4 +1,4 @@
-package com.enjoyxstudy.sharedcamera;
+package com.enjoyxstudy.sharedcamera.server;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -15,7 +15,7 @@
 
 @Component
 @Slf4j
-public class BinaryHandler extends BinaryWebSocketHandler {
+public class ImageWebSocketHandler extends BinaryWebSocketHandler {
 
     private CopyOnWriteArrayList<WebSocketSession> sessions = new CopyOnWriteArrayList<>();
 

diff --git a/...ra/SpringBootSharedCameraApplication.java → ...er/SpringBootSharedCameraApplication.java b/...ra/SpringBootSharedCameraApplication.java → ...er/SpringBootSharedCameraApplication.java
@@ -1,4 +1,4 @@
-package com.enjoyxstudy.sharedcamera;
+package com.enjoyxstudy.sharedcamera.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...yxstudy/sharedcamera/WebSocketConfig.java → .../sharedcamera/server/WebSocketConfig.java b/...yxstudy/sharedcamera/WebSocketConfig.java → .../sharedcamera/server/WebSocketConfig.java
@@ -1,4 +1,4 @@
-package com.enjoyxstudy.sharedcamera;
+package com.enjoyxstudy.sharedcamera.server;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.config.annotation.EnableWebSocket;
@@ -12,10 +12,10 @@
 @AllArgsConstructor
 public class WebSocketConfig implements WebSocketConfigurer {
 
-    private final BinaryHandler binaryHandler;
+    private final ImageWebSocketHandler imageWebSocketHandler;
 
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
-        registry.addHandler(binaryHandler, "/endpoint");
+        registry.addHandler(imageWebSocketHandler, "/endpoint");
     }
 }
diff --git a/shared-camera-server/src/main/resources/application.properties b/shared-camera-server/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.mvc.favicon.enabled=false
diff --git a/shared-camera-server/src/main/resources/static/index.html b/shared-camera-server/src/main/resources/static/index.html
@@ -28,7 +28,7 @@ <h2>Shared Camera (with WebSocket)</h2>
             Transmission interval(ms)
             <select id="intervalSelect" class="form-control input-sm">
               <option value="50">50</option>
-              <option value="100">100</option>
+              <option value="100" selected>100</option>
               <option value="200">200</option>
               <option value="500">500</option>
               <option value="1000">1,000</option>
@@ -65,7 +65,7 @@ <h2>Shared Camera (with WebSocket)</h2>
   <script>
     $(function() {
       const URL = window.URL || window.webkitURL;
-      const endpoint = 'ws://' + location.host + '/endpoint?' + window.location.hash;
+      const endpoint = 'ws://' + location.host + '/endpoint';
 
       const $status = $('#status').text('Idle');