From 96749ca6b8cc301c6a727000acb1437936e000a2 Mon Sep 17 00:00:00 2001 From: tsukasa2 Date: Fri, 28 Aug 2020 16:53:53 +0900 Subject: [PATCH 1/2] author/nakamura_part --- docker/pg/1-createTable.sql | 4 +++- .../java/com/example/demo/controller/ImageController.java | 4 +++- src/main/java/com/example/demo/controller/ViewController.java | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/pg/1-createTable.sql b/docker/pg/1-createTable.sql index e54e1e4..4a39039 100644 --- a/docker/pg/1-createTable.sql +++ b/docker/pg/1-createTable.sql @@ -45,7 +45,7 @@ create table requestfriend ( create_at timestamp ); - +/* BEGIN:nakamura */ insert into users(name, mail, filterlevel) values ('ichigo.chocomint', 'ichigo@hoge.com', 1), ('banana.chocomint', 'banana@hoge.com', 2), @@ -97,3 +97,5 @@ insert into users(name, mail, filterlevel) values ('pinapple.chocomint', 'hogehogehoge@hoge.com', 3) ; +/* END:nakamura */ + diff --git a/src/main/java/com/example/demo/controller/ImageController.java b/src/main/java/com/example/demo/controller/ImageController.java index df44f96..a2d7d85 100644 --- a/src/main/java/com/example/demo/controller/ImageController.java +++ b/src/main/java/com/example/demo/controller/ImageController.java @@ -1,3 +1,4 @@ +//BEGIN:nakamura package com.example.demo.controller; import java.io.FileNotFoundException; @@ -54,4 +55,5 @@ public String test( return c.getXClass(); } -} \ No newline at end of file +} +//END:nakamura \ No newline at end of file diff --git a/src/main/java/com/example/demo/controller/ViewController.java b/src/main/java/com/example/demo/controller/ViewController.java index 8e09f85..e985418 100644 --- a/src/main/java/com/example/demo/controller/ViewController.java +++ b/src/main/java/com/example/demo/controller/ViewController.java @@ -167,6 +167,7 @@ private static String ImageProcessing(String url) throws FileNotFoundException { } + //BEGIN:nakamura //emoji-javaを使ってキーワードから絵文字に変換 @RequestMapping(path = "/convert/{keyword}", method = RequestMethod.GET) public String convert( @@ -196,6 +197,7 @@ public List insertEmolog( // return emologService.insert(user, friend, emoji); return emologService.insert(123, 456, "U+1F600"); } + //END:nakamura //関数もおいちゃえ public static List get_NLU_keywords(String username, long tweet_id) throws TwitterException { From 14372229072efe64a93d18bcd4eeeebaf6a36c58 Mon Sep 17 00:00:00 2001 From: tsukasa2 Date: Fri, 28 Aug 2020 16:54:47 +0900 Subject: [PATCH 2/2] author/nakamura_part --- src/main/java/com/example/demo/service/EmologService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/example/demo/service/EmologService.java b/src/main/java/com/example/demo/service/EmologService.java index b07dc98..ff60759 100644 --- a/src/main/java/com/example/demo/service/EmologService.java +++ b/src/main/java/com/example/demo/service/EmologService.java @@ -42,6 +42,7 @@ public List selectAll(int user, int friend){ return emologRepository.selectAll(user, friend); } + //BEGIN:nakamura public List insert(int user, int friend, String contents) throws ParseException { Emolog e = new Emolog(); e.setId((int)Calendar.getInstance().getTimeInMillis()); @@ -53,6 +54,7 @@ public List insert(int user, int friend, String contents) throws ParseEx emologRepository.insert(e); return emologRepository.selectAll(user, friend); } + //END:nakamura public void createEmolog() throws Exception { List friends = friendRepository.selectAllRecord();