From e46f1ae9150028b794a9519dda7d66bf77a486c2 Mon Sep 17 00:00:00 2001
From: xu-bin-bin <34916924+xu-bin-bin@users.noreply.github.com>
Date: 星期四, 31 八月 2023 16:51:06 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java
old mode 100644
new mode 100755
index aeba9ed..30d9c13
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java
@@ -7,8 +7,7 @@
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
+import org.springframework.util.DigestUtils;
import java.util.List;
@@ -61,11 +60,22 @@
@Override
public boolean checkPushAuthority(String callId, String sign) {
- if (ObjectUtils.isEmpty(callId)) {
- return userMapper.checkPushAuthorityByCallId(sign).size() > 0;
- }else {
- return userMapper.checkPushAuthorityByCallIdAndSign(callId, sign).size() > 0;
+
+ List<User> users = userMapper.getUsers();
+ if (users.size() == 0) {
+ return false;
}
+ for (User user : users) {
+ if (user.getPushKey() == null) {
+ continue;
+ }
+ String checkStr = callId == null? user.getPushKey():(callId + "_" + user.getPushKey()) ;
+ String checkSign = DigestUtils.md5DigestAsHex(checkStr.getBytes());
+ if (checkSign.equals(sign)) {
+ return true;
+ }
+ }
+ return false;
}
@Override
--
Gitblit v1.8.0