From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 2582519..5b51032 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1734,13 +1734,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<String> getFleetEngineAuth(HttpServletRequest request){
+ public ResultUtil<Map<String, Object>> getFleetEngineAuth(HttpServletRequest request){
try {
Integer uid = driverService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
- String s = fleetEngineUtil.fleetEngineAuth(2, uid);
+ Map<String, Object> s = fleetEngineUtil.fleetEngineAuth(2, uid);
return ResultUtil.success(s);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1