diff --git a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java index ec86b23..338c57a 100644 --- a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java +++ b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java @@ -12,6 +12,6 @@ public class HelloWorld { @GET public String getHello() { - return "Hello World!!!"; + return "Hello World"; } } diff --git a/src/main/java/com/ntlab/irisserver/resources/StateRest.java b/src/main/java/com/ntlab/irisserver/resources/StateRest.java index f1b9199..59fdf0d 100644 --- a/src/main/java/com/ntlab/irisserver/resources/StateRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/StateRest.java @@ -55,12 +55,12 @@ if(nickname.equals(room.ownerName)){ //nicknameがownerだった場合 room.setState(state); //部屋の情報を変更 if (state == 2) { -// String path; -// path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; -// //path = "C:\\Users\\student\\IdeaProjects\\IrisServer\\src\\main\\java\\com\\ntlab\\irisserver\\tmp\\keywords.txt"; -// KeywordManager km = KeywordManager.getInstance(); -// String[] keywords = km.getKeywords(path); -// Game game = new Game(room, keywords); + String path; + path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; + //path = "C:\\Users\\student\\IdeaProjects\\IrisServer\\src\\main\\java\\com\\ntlab\\irisserver\\tmp\\keywords.txt"; + KeywordManager km = KeywordManager.getInstance(); + String[] keywords = km.getKeywords(path); + Game game = new Game(room, keywords); } } }