From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java
index f15a2e2..d11ccac 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/UserV1InnerServiceSMOImpl.java
@@ -18,6 +18,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.AuthenticationFactory;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.user.dao.IUserV1ServiceDao;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.dto.user.UserDto;
@@ -29,6 +30,7 @@
import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -114,8 +116,15 @@
@Override
public String getUserIdByQrCode(@RequestBody String qrCode) {
+ qrCode = CommonCache.getValue(qrCode);
+ if(StringUtil.isEmpty(qrCode)){
+ throw new IllegalArgumentException("浜岀淮鐮佸け鏁�");
+ }
qrCode = AuthenticationFactory.AesDecrypt(qrCode, AuthenticationFactory.AES_KEY);
JSONObject qrCodeJson = JSONObject.parseObject(qrCode);
+ if (qrCodeJson == null || !qrCodeJson.containsKey("time")) {
+ throw new IllegalArgumentException("浜岀淮鐮侀潪娉�");
+ }
long time = qrCodeJson.getLongValue("time");
if (DateUtil.getCurrentDate().getTime() - time > 5 * 60 * 1000) {
throw new IllegalArgumentException("浜岀淮鐮佸け鏁�");
@@ -130,7 +139,9 @@
qrCodeJson.put("userId", userId);
qrCodeJson.put("time", DateUtil.getCurrentDate().getTime());
String qrCode = AuthenticationFactory.AesEncrypt(qrCodeJson.toJSONString(), AuthenticationFactory.AES_KEY);
- return qrCode;
+ String key = GenerateCodeFactory.getUUID();
+ CommonCache.setValue(key, qrCode, CommonCache.defaultExpireTime);
+ return key;
}
}
--
Gitblit v1.8.0