From 9b2eedb85d53ca32610c32c6e50b5230ab3b16cf Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 22 Jul 2022 20:16:03 +0800
Subject: [PATCH] V1.1.0 for dock

---
 src/main/java/com/dji/sample/manage/controller/LoginController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dji/sample/manage/controller/LoginController.java b/src/main/java/com/dji/sample/manage/controller/LoginController.java
index b0cacb4..23c84d9 100644
--- a/src/main/java/com/dji/sample/manage/controller/LoginController.java
+++ b/src/main/java/com/dji/sample/manage/controller/LoginController.java
@@ -27,9 +27,10 @@
 
     @PostMapping("/login")
     public ResponseResult login(@RequestBody UserLoginDTO loginDTO) {
+
         String username = loginDTO.getUsername();
         String password = loginDTO.getPassword();
-        return userService.userLogin(username, password);
+        return userService.userLogin(username, password, loginDTO.getFlag());
     }
 
     @PostMapping("/token/refresh")
@@ -42,6 +43,6 @@
             return ResponseResult.error(CommonErrorEnum.NO_TOKEN.getErrorMsg());
         }
 
-        return ResponseResult.success(user);
+        return ResponseResult.success(user.get());
     }
 }

--
Gitblit v1.9.3