From 7342170db7dc39326698d39b74e1858502fd574a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 13 八月 2025 15:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 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 8eead38..2578fde 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
@@ -568,10 +568,13 @@
 
             if(ToolUtil.isEmpty(img)) {
                 RestTemplate rest = new RestTemplate();
-                String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
+//                String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
+                String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
                 Map<String, Object> param = new HashMap<>();
-                param.put("path", "pages/home/home?driverId=" + uid);
+                param.put("page", "pages/home/home");
                 param.put("width", 430); //二维码尺寸
+                param.put("scene", "driverId=" + uid); //二维码尺寸
+                param.put("env_version", "trial"); //二维码尺寸
                 HttpRequest post = HttpUtil.createPost(url);
                 post.body(JSON.toJSONString(param));
 
@@ -1810,13 +1813,13 @@
             driver.setAuthState(3);
             driverService.updateById(driver);
             //开始验证当前账号是否在别处登录
-            String value = (String) redisTemplate.opsForValue().get("DRIVER_" + driverId);
+            String value = (String) redisTemplate.opsForValue().get("dache:DRIVER_" + driverId);
             if (ToolUtil.isNotEmpty(value)) {//将另外设备上的强迫下线
                 //开始清除redis中无效的数据
-                String key = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone());
+                String key = (String) redisTemplate.opsForValue().get("dache:DRIVER_" + driver.getPhone());
                 redisTemplate.delete(key);//删除个人信息数据
-                redisTemplate.delete("DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
-                redisTemplate.delete("DRIVER_" + driverId);//清除存储的token
+                redisTemplate.delete("dache:DRIVER_" + driver.getPhone());//删除后台冻结相关缓存
+                redisTemplate.delete("dache:DRIVER_" + driverId);//清除存储的token
             }
             return ResultUtil.success();
         } catch (Exception e) {

--
Gitblit v1.7.1