From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java b/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java
index 3e379ae..b9cd2ac 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java
@@ -25,18 +25,18 @@
private SysUsersService sysUsersService;
- private String webClientId;
+ private String loginQrCodeKey;
- public ScanQrCodeLogin(SysUsersService sysUsersService, String webClientId) {
+ public ScanQrCodeLogin(SysUsersService sysUsersService, String loginQrCodeKey) {
this.sysUsersService = sysUsersService;
- this.webClientId = webClientId;
+ this.loginQrCodeKey = loginQrCodeKey;
}
@Override
public Object login() {
- Long loginUserId = WebSoketScanQrCodeLoginObserver.getScanCashValue(webClientId);
+ Long loginUserId = WebSoketScanQrCodeLoginObserver.getScanCashValue(loginQrCodeKey);
if (loginUserId != null) {
SysUsers loginUser = sysUsersService.findById(loginUserId);
--
Gitblit v1.9.1