diff --git a/src/main/java/com/ntlab/irisserver/models/KeywordManager.java b/src/main/java/com/ntlab/irisserver/models/KeywordManager.java index 2103fd6..c53ae5f 100644 --- a/src/main/java/com/ntlab/irisserver/models/KeywordManager.java +++ b/src/main/java/com/ntlab/irisserver/models/KeywordManager.java @@ -68,6 +68,7 @@ } else { keywords = FileRead(path).toArray(new String[FileRead(path).size()]); } + return keywords; } } diff --git a/src/main/java/com/ntlab/irisserver/resources/KeywordsRest.java b/src/main/java/com/ntlab/irisserver/resources/KeywordsRest.java index cc9cec8..174039d 100644 --- a/src/main/java/com/ntlab/irisserver/resources/KeywordsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/KeywordsRest.java @@ -29,9 +29,9 @@ public String[] getKeywords() throws IOException { String path; - path = applicationContext.getResource("file:").getFile().getAbsolutePath() - +"/apache-tomcat-9.0.10/webapps/iris/WEB-INF/classes/com/ntlab/irisserver/models/keywords.txt"; - + //ntlabサーバのパス + path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/irisdata/keywords.txt"; + //ローカルパス //path = "C:\\Users\\student\\Desktop\\IrisServer\\src\\main\\java\\com\\ntlab\\irisserver\\models\\keywords.txt"; KeywordManager km = KeywordManager.getInstance(); String[] keywords = km.getKeywords(path);