From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/service/impl/UserServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 9 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 e10fc79..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
@@ -3,18 +3,20 @@
import com.genersoft.iot.vmp.service.IUserService;
import com.genersoft.iot.vmp.storager.dao.UserMapper;
import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
import java.util.List;
@Service
public class UserServiceImpl implements IUserService {
-
+
@Autowired
private UserMapper userMapper;
-
-
+
@Override
public User getUser(String username, String password) {
return userMapper.select(username, password);
@@ -33,12 +35,16 @@
}
@Override
- public void addUser(User user) {
- userMapper.add(user);
+ public int addUser(User user) {
+ User userByUsername = userMapper.getUserByUsername(user.getUsername());
+ if (userByUsername != null) {
+ return 0;
+ }
+ return userMapper.add(user);
}
@Override
- public void deleteUser(int id) {
- userMapper.delete(id);
+ public int deleteUser(int id) {
+ return userMapper.delete(id);
}
@Override
@@ -47,9 +53,40 @@
}
@Override
- public void updateUsers(User user) {
- userMapper.update(user);
+ public int updateUsers(User user) {
+ return userMapper.update(user);
}
+ @Override
+ public boolean checkPushAuthority(String callId, String sign) {
+
+ 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
+ public PageInfo<User> getUsers(int page, int count) {
+ PageHelper.startPage(page, count);
+ List<User> users = userMapper.getUsers();
+ return new PageInfo<>(users);
+ }
+
+ @Override
+ public int changePushKey(int id, String pushKey) {
+ return userMapper.changePushKey(id,pushKey);
+ }
}
--
Gitblit v1.8.0