From 31d69134d1bcaac9c50b6a57784aeb436d5bd75c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 08 Apr 2021 19:21:10 +0800
Subject: [PATCH] 扫码登录
---
zq-erp/src/main/resources/templates/views/common/login.html | 6 +++---
zq-erp/src/main/java/com/matrix/system/common/authority/strategy/ScanQrCodeLogin.java | 8 ++++----
zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java | 2 +-
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
index 45bc96a..18eb754 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java
@@ -112,7 +112,7 @@
LoginStrategy apLogin = new AccountPasswordLogin(user, sysUsersService);
user = authorityManager.login(apLogin);
}else {
- ScanQrCodeLogin apLogin = new ScanQrCodeLogin( sysUsersService,webLoginDto.getWebClientId());
+ ScanQrCodeLogin apLogin = new ScanQrCodeLogin( sysUsersService,webLoginDto.getLoginQrCodeKey());
user = authorityManager.login(apLogin);
}
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);
diff --git a/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java b/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java
index dd123ff..73561e3 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/dto/WebLoginDto.java
@@ -27,6 +27,6 @@
/**
* 终端标识
*/
- private String webClientId;
+ private String loginQrCodeKey;
}
diff --git a/zq-erp/src/main/resources/templates/views/common/login.html b/zq-erp/src/main/resources/templates/views/common/login.html
index 2d33168..987ecb3 100644
--- a/zq-erp/src/main/resources/templates/views/common/login.html
+++ b/zq-erp/src/main/resources/templates/views/common/login.html
@@ -300,7 +300,7 @@
//soket用户标识
let webClientId = "webClientId_" + MTools.randomStr();
-
+ let loginQrCodeKey="";
markQrcode();
@@ -310,7 +310,7 @@
width: 200,
height: 200
});
- let loginQrCodeKey="loginQrCodeKey_" + MTools.randomStr();
+ loginQrCodeKey="loginQrCodeKey_" + MTools.randomStr();
let qrInfo={webClientId:webClientId,loginQrCodeKey:loginQrCodeKey}
console.log(qrInfo);
qrcode.makeCode(JSON.stringify(qrInfo));
@@ -416,7 +416,7 @@
if(serverMsg.loginOperation==1){
$.AjaxProxy({
p: {
- webClientId: webClientId,
+ loginQrCodeKey: loginQrCodeKey,
loginType: 2
}
}).invoke("/common/dologin", function (loj) {
--
Gitblit v1.9.1