diff --git a/src/main/java/com/example/cosmos_serversb/entities/GetUser.java b/src/main/java/com/example/cosmos_serversb/entities/GetUser.java
new file mode 100644
index 0000000..4aabae0
--- /dev/null
+++ b/src/main/java/com/example/cosmos_serversb/entities/GetUser.java
@@ -0,0 +1,29 @@
+package com.example.cosmos_serversb.entities;
+
+public class GetUser {
+    public String name,iconUri;
+    public GetUser(){
+
+    }
+
+    public GetUser(String name, String iconUri){
+        setname(name);
+        seticonUri(iconUri);
+    }
+
+    public void seticonUri(String iconUri) {
+        this.iconUri = iconUri;
+    }
+
+    public String geticonUri() {
+        return iconUri;
+    }
+
+    public void setname(String name) {
+        this.name = name;
+    }
+
+    public String getame() {
+        return name;
+    }
+}
diff --git a/src/main/java/com/example/cosmos_serversb/entities/PutUser.java b/src/main/java/com/example/cosmos_serversb/entities/PutUser.java
new file mode 100644
index 0000000..a492abf
--- /dev/null
+++ b/src/main/java/com/example/cosmos_serversb/entities/PutUser.java
@@ -0,0 +1,27 @@
+package com.example.cosmos_serversb.entities;
+
+public class PutUser {
+    public String uri,uId;
+    public PutUser(){
+
+    }
+
+    public PutUser(String uri, String uId){
+        setUri(uri);
+        setuId(uId);
+    }
+
+    public void setuId(String uId) {
+        this.uId = uId;
+    }
+
+    public String getuId() {
+        return uId;
+    }
+
+    public void setUri(String uri) { this.uri = uri; }
+
+    public String getUri() {
+        return uri;
+    }
+}
diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java
index 356cb06..02e9dd8 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -65,7 +65,6 @@
     }
 
     public static User createUser(String name, String pw, String iconImage) {
-
         Session session = sessionFactory.openSession();
         session.beginTransaction();
         //名前、uId、ユーザーuri、パスワード、アイコンイメージを保存
@@ -83,12 +82,11 @@
         return testUser;
     }
 
-    public static User setUser(String uId, String name, String pw, String iconImage) {
-
+    public static PutUser setUser(String uId, String name, String pw, String iconImage) {
         Session session = sessionFactory.openSession();
         session.beginTransaction();
-        List usertList = session.createQuery( "from User" ).list();
-        for ( User user : (List<User>) usertList ) {
+        List usersList = session.createQuery( "from setUser" ).list();
+        for ( User user : (List<User>) usersList ) {
             if(user.getuId() == uId){
                 user.setName(name);
                 if(iconImage != null) {
@@ -98,22 +96,31 @@
                 break;
             }
         }
+        //ここの2行でUser.javaからUriとuIdを参照
+        User findUser = (User) session.load(User.class, uId);
+        PutUser putUser = new PutUser(findUser.getUri(),findUser.getuId());
         session.getTransaction().commit();
         session.close();
 //        testUser.token.add(getInstance().createToken(testUser.uId));
 //        testUser.token.add(getInstance().createToken(testUser.uId));
-        return null;
+        //表示するのはUriとuIdのみ
+        return putUser;
     }
 
-    public static User getUserById(String uId) {
+    public static GetUser getUserById(String uId) {
         //与えられたuIdのUser情報を返す
-
         Session session = sessionFactory.openSession();
         session.beginTransaction();
-        List usertList = session.createQuery( "from getUser" ).list();
-        for ( User user : (List<User>) usertList ) {
+        List usersList = session.createQuery( "from getUser" ).list();
+        //uIdを比較し、一致した場合はNameとiconUriを返す。一致しない場合はbreak
+        for ( User user : (List<User>) usersList ) {
             if (user.getuId() == uId) {
-                System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri());
+                //ここの2行でUser.javaからNameとIconUriを参照
+                User findUser = (User) session.load(User.class, uId);
+                GetUser getUser = new GetUser(findUser.getName(),findUser.getIconUri());
+                return getUser;
+//                System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri());]
+            }else{
                 break;
             }
         }
@@ -121,6 +128,7 @@
         session.close();
 //        testUser.token.add(getInstance().createToken(testUser.uId));
 //        testUser.token.add(getInstance().createToken(testUser.uId));
+        //一致しない場合は返す必要がないのでnull
         return null;
     }
 
@@ -133,7 +141,6 @@
     }
 
     public static DeleteResult deleteUser(String uId) {
-
         Session session = sessionFactory.openSession();
         session = sessionFactory.openSession();
         session.beginTransaction();
@@ -144,7 +151,6 @@
         }
         session.getTransaction().commit();
         session.close();
-
         return DeleteResult.SUCCESS;
     }