diff --git a/src/main/java/com/xydl/cac/controller/UserController.java b/src/main/java/com/xydl/cac/controller/UserController.java
index 4c003df..1a801d0 100644
--- a/src/main/java/com/xydl/cac/controller/UserController.java
+++ b/src/main/java/com/xydl/cac/controller/UserController.java
@@ -60,12 +60,20 @@ public class UserController extends BasicController {
         return Response.success("OK");
     }
 
+    @ApiOperation(value = "旧版登录")
+    @PostMapping(value = "loginold")
+    public Response<Admin> loginold(String username, String password) throws Exception {
+        Admin admin = service.loginold(username, password);
+        admin.setPassword("");
+        return Response.success(admin);
+    }
+
     @ApiOperation(value = "登录")
     @PostMapping(value = "login")
-    public Response<Admin> login(String username, String password) throws Exception {
-        Admin user = service.login(username, password);
-        user.setPassword("");
-        return Response.success(user);
+    public Response<Admin> login(@RequestBody Admin user) throws Exception {
+        Admin admin = service.login(user);
+        admin.setPassword("");
+        return Response.success(admin);
     }
 
     @ApiOperation(value = "退出")
diff --git a/src/main/java/com/xydl/cac/service/AdminService.java b/src/main/java/com/xydl/cac/service/AdminService.java
index 245d0e6..c76a7e8 100644
--- a/src/main/java/com/xydl/cac/service/AdminService.java
+++ b/src/main/java/com/xydl/cac/service/AdminService.java
@@ -14,5 +14,7 @@ public interface AdminService {
 
     void delete(Integer id);
 
-    Admin login(String name, String password) throws Exception;
+    Admin loginold(String name, String password) throws Exception;
+
+    Admin login(Admin user) throws Exception;
 }
diff --git a/src/main/java/com/xydl/cac/service/impl/AdminServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/AdminServiceImpl.java
index 453e770..4d3db2a 100644
--- a/src/main/java/com/xydl/cac/service/impl/AdminServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/AdminServiceImpl.java
@@ -59,14 +59,28 @@ public class AdminServiceImpl implements AdminService {
     }
 
     @Override
-    public Admin login(String name, String password) throws Exception {
+    public Admin loginold(String name, String password) throws Exception {
         List<Admin> list = repository.findByName(name);
         if (CollectionUtils.isEmpty(list)) {
             throw new BusinessException("用户或密码不正确");
         }
         Admin admin = list.get(0);
         String newPwd = RsaUtils.decryptByPrivateKey(bizConfig.getRsakey(), password);
-        String userPassword = DigestUtils.md5DigestAsHex(newPwd.getBytes());
+        String userPassword = DigestUtils.md5DigestAsHex(password.getBytes());
+        if (!admin.getPassword().equals(userPassword)) {
+            throw new BusinessException("用户或密码不正确");
+        }
+        return admin;
+    }
+
+    @Override
+    public Admin login(Admin user) throws Exception {
+        List<Admin> list = repository.findByName(user.getName());
+        if (CollectionUtils.isEmpty(list)) {
+            throw new BusinessException("用户或密码不正确");
+        }
+        Admin admin = list.get(0);
+        String userPassword = DigestUtils.md5DigestAsHex(user.getPassword().getBytes());
         if (!admin.getPassword().equals(userPassword)) {
             throw new BusinessException("用户或密码不正确");
         }