diff --git a/src/main/java/cn/mafangui/hotel/controller/UserController.java b/src/main/java/cn/mafangui/hotel/controller/UserController.java
index 64e3187..01922bf 100644
--- a/src/main/java/cn/mafangui/hotel/controller/UserController.java
+++ b/src/main/java/cn/mafangui/hotel/controller/UserController.java
@@ -1,4 +1,73 @@
 package cn.mafangui.hotel.controller;
 
+import cn.mafangui.hotel.entity.User;
+import cn.mafangui.hotel.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/user")
 public class UserController {
+    @Autowired
+    private UserService userService;
+
+    @RequestMapping(method = RequestMethod.POST,value = "/login")
+    public int userLogin(String username,String password){
+        int result = 0;
+        if (userService.selectByUsernameAndPassword(username,password) != null){
+            result = 1;
+        }
+        else result = 0;
+        return result;
+    }
+
+    @RequestMapping(method = RequestMethod.POST,value = "/register")
+    public int userRegister(String username,String password,String name,String gender,String phone,String email,String address,String idcard){
+        User user = new User(username,password,name,gender,phone,email,address,idcard);
+        return userService.insertUser(user);
+    }
+
+    @RequestMapping(method = RequestMethod.POST,value = "/update")
+    public int userUpdate(int userId,String name,String gender,String phone,String email,String address,String idcard){
+        User user = new User();
+        user.setUserId(userId);
+        user.setName(name);
+        user.setGender(gender);
+        user.setPhone(phone);
+        user.setEmail(email);
+        user.setAddress(address);
+        user.setIdcard(idcard);
+        return userService.updateUser(user);
+    }
+
+    @RequestMapping(method = RequestMethod.POST,value = "/updatePassword")
+    public int updatePassword(String username,String oldPassword,String newPassword){
+        User user = userService.selectByUsernameAndPassword(username,oldPassword);
+        if (user == null){
+            return -1;
+        }else {
+            user.setPassword(newPassword);
+            return userService.updateUser(user);
+        }
+    }
+
+    @RequestMapping(value = "/all")
+    public List<User> getAllUser(){
+        return userService.selectAll();
+    }
+
+    @RequestMapping(method = RequestMethod.POST,value = "/isUsernameExist")
+    public int isUsernameExist(String username){
+        int result = 0;
+        if (userService.selectByUsername(username) != null){
+            result = 1;
+        }
+        else result = 0;
+        return result;
+    }
+
 }
diff --git a/src/test/java/cn/mafangui/hotel/controller/UserControllerTest.java b/src/test/java/cn/mafangui/hotel/controller/UserControllerTest.java
new file mode 100644
index 0000000..3c36257
--- /dev/null
+++ b/src/test/java/cn/mafangui/hotel/controller/UserControllerTest.java
@@ -0,0 +1,50 @@
+package cn.mafangui.hotel.controller;
+
+import cn.mafangui.hotel.entity.User;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.*;
+
+@SpringBootTest
+@RunWith(SpringJUnit4ClassRunner.class)
+public class UserControllerTest {
+
+    @Autowired
+    UserController uc;
+
+    @Test
+    public void userLogin() {
+        Assert.assertEquals(1,uc.userLogin("nihao","123456"));
+    }
+
+    @Test
+    public void userRegister() {
+        int res = uc.userRegister("hi","hi","海","男","1123","132","ddd","123");
+        Assert.assertEquals(1,res);
+    }
+
+    @Test
+    public void userUpdate() {
+        Assert.assertEquals(1,uc.userUpdate(3,null,null,null,null,"add",null));
+    }
+
+    @Test
+    public void updatePassword() {
+        Assert.assertEquals(1,uc.updatePassword("hi","hi","123"));
+    }
+
+    @Test
+    public void getAllUser() {
+        Assert.assertEquals(2,uc.getAllUser().size());
+    }
+
+    @Test
+    public void isUsernameExist() {
+        Assert.assertEquals(0,uc.isUsernameExist("addd"));
+    }
+}
\ No newline at end of file