From 8ce3bb68bdc2250cc4a8a3d29085443fac64615a Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 23 Sep 2022 18:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/main' into v1.2.0
---
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