diff --git a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java index 5707ef5..0276096 100644 --- a/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java +++ b/src/main/java/org/ntlab/acanthus_server/resources/gallery/StrokesRest.java @@ -120,28 +120,15 @@ @Produces(MediaType.APPLICATION_JSON) public String addImage(@PathParam("aid") Integer aid, @PathParam("pid") Integer pid, @FormParam("image") String image) { - - String vid = "a" + aid.toString() + pid.toString(); -// String url = "http://nitta-lab-www.is.konan-u.ac.jp/nitta-lab-www/webapps/"; - String path1 = ""; try { -// path1 = applicationContext.getResource("http:").getFile().getAbsolutePath() + "/apache-tomcat-9.0.10/webapps"; - path1 = applicationContext.getResource("file:").getFile().getAbsolutePath() + "/apache-tomcat-9.0.10/webapps"; -// String url = "http://nitta-lab-www.is.konan-u.ac.jp" + path1; + path1 = applicationContext.getResource("file:").getFile().getAbsolutePath() + "/webapps"; Base64Decode.saveAsFile(aid, pid, path1, image); } catch (IOException e) { e.printStackTrace(); throw new WebApplicationException(500); } - - - -/* ArrayList categories = (ArrayList) category; - ScreenImage v = screenimage.createScreenImage(aid, pid, vid, url, categories); - return v;*/ - return path1; } diff --git a/src/main/java/org/ntlab/acanthus_server/utils/Base64Decode.java b/src/main/java/org/ntlab/acanthus_server/utils/Base64Decode.java index 193895c..86a05a8 100644 --- a/src/main/java/org/ntlab/acanthus_server/utils/Base64Decode.java +++ b/src/main/java/org/ntlab/acanthus_server/utils/Base64Decode.java @@ -7,32 +7,34 @@ import java.util.Base64; public class Base64Decode { - public static String saveAsFile(Integer aid ,Integer pid ,String path1 ,String enimage) throws IOException { - + public static void saveAsFile(Integer aid ,Integer pid ,String path1 ,String enimage) throws IOException { //デコードを行う byte[] dedata = Base64.getDecoder().decode(enimage); //ファイルがないときは作成する String fileName = "a" + aid.toString() + "p" + pid.toString() + ".png"; - String path2 = "/gallery/"+ aid.toString() + pid.toString(); + String path2 = "/gallery/"+ aid.toString() + "/"+ pid.toString(); String path = path1 + path2 + "/" + fileName; System.out.println(path.toString()); File file = new File(path); + System.out.println("1" + path.toString()); file.getParentFile().mkdirs(); + System.out.println("2"+ path.toString()); file.createNewFile(); + System.out.println("3" + path.toString()); //ファイルに画像データを書き込む - FileOutputStream file1 = new FileOutputStream(file, false); - BufferedOutputStream bf = new BufferedOutputStream(file1); - bf.write(dedata, 0, dedata.length); +// FileOutputStream file1 = new FileOutputStream(file, false); +// BufferedOutputStream bf = new BufferedOutputStream(file1); +// bf.write(dedata, 0, dedata.length); //ファイルを閉じる - bf.close(); +// bf.close(); - //セーブしたファイルの相対パスを文字列として返す - return path2; +// //セーブしたファイルの相対パスを文字列として返す +// return path2; } }