diff --git a/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java b/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java index 37d86d0..bd2f448 100644 --- a/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java +++ b/src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java @@ -434,13 +434,17 @@ if(root.endsWith("bin")){ root = root.getParent(); } + //今まではnitta-labが起動ディレクトリだったので、その場合にtomcatディレクトリに移動する + else if(root.endsWith("nitta-lab")){ + root = root.resolve("apache-tomcat-9.0.10"); + } File webappsFolder = new File(root.toFile(),"webapps"); File dataFolder = new File(webappsFolder,"tampopo-data"); pathDirectory = dataFolder.getAbsolutePath(); System.out.println(pathDirectory); //pathDirectory = applicationContext.getResource("file:").getFile().getAbsolutePath() + "/apache-tomcat-9.0.10/webapps/tampopo-data"; iconPath = Base64Decode.saveIcon(userId, pathDirectory, newIcon); - user.setIcon(iconPath); + user.setIcon("http://nitta-lab-www.is.konan-u.ac.jp/tampopo-data/" + iconPath); } catch (IOException e){ e.printStackTrace(); throw new WebApplicationException(500);