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 3b1470d..4450341 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -1,55 +1,75 @@
 package com.example.cosmos_serversb.models;
 
+import java.util.UUID;
+import javax.inject.Singleton;
+
 import com.example.cosmos_serversb.entities.*;
 
+@Singleton
 public class Users {
+    private static Users theInstance = null;
 
-    public User createUser(String name, String pw, String iconImage) {
+    private Users() {
+    }
+
+    public static Users getInstance() {
+        if (theInstance == null) {
+            theInstance = new Users();
+        }
+        return theInstance;
+    }
+
+    public static User createUser(String name, String pw, String iconImage) {
         User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
-        testUser.token.add("123456789");
-        testUser.token.add("987654321");
+        testUser.token.add(getInstance().createToken(testUser.uId));
+        testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
     }
 
-    public User setUser(String uId, String name, String pw, String iconImage){
+    public static String createToken(String uId) {
+        //Tokenを作成しuIdと関連付けしDBに保存し作成したTokenを返す
+        String token = UUID.randomUUID().toString();
+        return token;
+    }
+
+    public static User setUser(String uId, String name, String pw, String iconImage) {
         User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
-        testUser.token.add("123456789");
-        testUser.token.add("987654321");
+        testUser.token.add(getInstance().createToken(testUser.uId));
+        testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
     }
 
-    public User getUserById(String uId) {
+    public static User getUserById(String uId) {
         User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
-        testUser.token.add("123456789");
-        testUser.token.add("987654321");
+        testUser.token.add(getInstance().createToken(testUser.uId));
+        testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
     }
 
-    public User getUserByToken(String token) {
+    public static User getUserByToken(String token) {
         User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com");
-        testUser.token.add("123456789");
-        testUser.token.add("987654321");
+        testUser.token.add(getInstance().createToken(testUser.uId));
+        testUser.token.add(getInstance().createToken(testUser.uId));
         return testUser;
     }
 
-    public DeleteResult deleteUser(String uId) {
+    public static DeleteResult deleteUser(String uId) {
         return DeleteResult.SUCCESS;
     }
 
-    public String login(String uId) {
-
-        return "123456789";//testToken
+    public static String login(String uId) {
+        return getInstance().createToken(uId);//testToken
     }
 
-    public DeleteResult logout(String token) {
+    public static DeleteResult logout(String token) {
         return DeleteResult.SUCCESS;
     }
 
-    public boolean checkToken(String uId, String token) {
+    public static boolean checkToken(String uId, String token) {
         return true;
     }
 
-    public boolean checkPassword(String uId, String pw) {
+    public static boolean checkPassword(String uId, String pw) {
         return true;
     }
 }