From 115da2295af1c02cde311f183d30d1c061c3795e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 14 六月 2025 15:01:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 4b34bfa..e0455a4 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -2,8 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-
-
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
@@ -13,9 +11,8 @@
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.model.*;
-import com.stylefeng.guns.modular.system.util.*;
-import com.stylefeng.guns.modular.system.warpper.ActivityWarpper;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
@@ -27,6 +24,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
@@ -1454,7 +1452,7 @@
public ResultUtil cancellation(HttpServletRequest request){
try {
Integer driverId = driverService.getUserIdFormRedis(request);
- if(null == driverId){
+ if (null == driverId) {
return ResultUtil.tokenErr();
}
Driver driver = driverService.selectById(driverId);
@@ -1462,7 +1460,7 @@
driverService.updateById(driver);
//开始验证当前账号是否在别处登录
String value = redisUtil.getValue("DRIVER_" + driverId);
- if(ToolUtil.isNotEmpty(value)){//将另外设备上的强迫下线
+ if (ToolUtil.isNotEmpty(value)) {//将另外设备上的强迫下线
//开始清除redis中无效的数据
String key = redisUtil.getValue("DRIVER_" + driver.getPhone());
redisUtil.remove(key);//删除个人信息数据
@@ -1470,9 +1468,22 @@
redisUtil.remove("DRIVER_" + driverId);//清除存储的token
}
return ResultUtil.success();
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
+
+
+ @ResponseBody
+ @GetMapping("/base/driver/getDriverInfo")
+ public void getDriverInfo(String lsu, String ssologinid, String ticket, HttpSession session) {
+ try {
+ String onconParam = edu.yale.its.tp.cas.client.Util.getOnconParam(session);
+ onconParam = new String(Base64.getDecoder().decode(onconParam), "UTF-8");
+ System.err.println("lsu: " + lsu + ",ticket: " + ticket + ",ssologinid: " + ssologinid);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.7.1