From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密

---
 src/main/java/com/dji/sample/manage/controller/LoginController.java |    7 +++++--
 1 files changed, 5 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..eb1a061 100644
--- a/src/main/java/com/dji/sample/manage/controller/LoginController.java
+++ b/src/main/java/com/dji/sample/manage/controller/LoginController.java
@@ -2,6 +2,7 @@
 
 import com.dji.sample.common.error.CommonErrorEnum;
 import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.log.aspect.SysLogAnnotation;
 import com.dji.sample.manage.model.dto.UserDTO;
 import com.dji.sample.manage.model.dto.UserLoginDTO;
 import com.dji.sample.manage.service.IUserService;
@@ -26,10 +27,12 @@
     private IUserService userService;
 
     @PostMapping("/login")
+    @SysLogAnnotation(operModul = "账户管理", operType = "登录", operDesc = "用户登录")
     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 +45,6 @@
             return ResponseResult.error(CommonErrorEnum.NO_TOKEN.getErrorMsg());
         }
 
-        return ResponseResult.success(user);
+        return ResponseResult.success(user.get());
     }
 }

--
Gitblit v1.9.3