diff --git a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java index bfb972f..81d730d 100644 --- a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java +++ b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java @@ -10,7 +10,7 @@ public class HelloWorld { @GET public String getHello() { - return "12/22-11:00 ログ出力4"; + return "12/22-14:20 ログ出力5"; } } diff --git a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java index 76d3f2a..c62faf5 100644 --- a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java +++ b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java @@ -61,16 +61,12 @@ session.getBasicRemote().sendText(room.getOwnerName()); session.getBasicRemote().sendText(room.ownerName); - // ここまで、room.ownerができていない。room.owner=nullになってる - // ここまではいけてました if(nickname.equals(room.ownerName)){ //nicknameがownerだった場合 - // setStateが出来ないのか?? - session.getBasicRemote().sendText("1"); room.setState(state); //部屋の情報を変更 - session.getBasicRemote().sendText("2"); String path; + // 下の1行で失敗しておる。 path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; - session.getBasicRemote().sendText("3"); + session.getBasicRemote().sendText("3"); // ここいけてない KeywordManager km = KeywordManager.getInstance(); String[] keywords = km.getKeywords(path); Game game = new Game(room, keywords);