Parcourir la source

20230718(2)-完善资源controller

iaun il y a 3 ans
Parent
commit
19fb212233

+ 1 - 0
src/main/java/cn/iaun/it/controller/ItResourceController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/resource")
 public class ItResourceController {
+    private final Long SYS_ID = 3L;
     private final ItResourceService itResourceService;
 
     public ItResourceController(ItResourceService itResourceService) {

+ 16 - 1
src/main/java/cn/iaun/it/interceptor/TokenInterceptor.java

@@ -9,6 +9,8 @@ import org.springframework.web.servlet.HandlerInterceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public class TokenInterceptor implements HandlerInterceptor {
@@ -25,7 +27,9 @@ public class TokenInterceptor implements HandlerInterceptor {
             throw new WebException(ResultCode.USER_INVALID_TOKEN);
         } else {
             String userId = redisUtil.get("USER_TOKEN_" + token);
-            if (userId == null) { // token无效
+            String roleId = redisUtil.get("USER_ROLE_" + token);
+            List<String> userPerm = redisUtil.lGetAll("USER_PERM_" + token);
+            if (userId == null || roleId == null) { // token无效
                 throw new WebException(ResultCode.USER_INVALID_TOKEN);
             }
 
@@ -34,10 +38,21 @@ public class TokenInterceptor implements HandlerInterceptor {
                 throw new WebException(ResultCode.USER_INVALID_TOKEN);
             }
 
+            List<Long> userPermLong = new ArrayList<>();
+            for (String str : userPerm) {
+                userPermLong.add(Long.valueOf(str));
+            }
+
             // token续期
             redisUtil.set("USER_TOKEN_" + token, userId, 2L, TimeUnit.HOURS);
+            redisUtil.set("USER_ROLE_" + token, roleId, 2L, TimeUnit.HOURS);
 
+            // 存储到属性
+            // TODO: 存在问题 找不到userId
             request.setAttribute("userId", Long.valueOf(userId));
+            request.setAttribute("roleId", Long.valueOf(roleId));
+            request.setAttribute("userPermission", userPermLong);
+
             return true;
         }
     }

+ 20 - 1
src/main/java/cn/iaun/it/service/impl/ItUserServiceImpl.java

@@ -12,6 +12,7 @@ import cn.iaun.it.util.RedisUtil;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -49,14 +50,32 @@ public class ItUserServiceImpl implements ItUserService {
         String tokenInRedis = redisUtil.hGet("user", String.valueOf(itUserLoginInfoVo.getUserId()));
         redisUtil.hSet("user", String.valueOf(itUserLoginInfoVo.getUserId()), token);
 
-        /* 如果存在旧token,则删除 */
+        // 如果存在旧token,则删除
         if (tokenInRedis != null) {
             redisTemplate.delete("USER_TOKEN_" + tokenInRedis);
+            redisTemplate.delete("USER_ROLE_" + tokenInRedis);
+            redisTemplate.delete("USER_PERM_" + tokenInRedis);
         }
 
+
+        // 获取用户信息
+        ItUserInfoVo itUserInfoVo = itUserMapper.selectUserInfo(itUserLoginInfoVo.getUserId());
+        Long roleId = itUserInfoVo.getRoleId();
+        // 获取用户权限
+        List<ItRoleSysPermissionVo> itRoleSysPermissionVos = itRolePermissionMapper.getRolePermissionsByRoleId(roleId);
+        itUserInfoVo.setPermissions(itRoleSysPermissionVos);
+
+        List<ItRoleSysPermissionVo> permissions = itUserInfoVo.getPermissions();
+        List<String> sysIds = new ArrayList<>();
+        for (ItRoleSysPermissionVo itRoleSysPermissionVo : permissions) {
+            String sysId = String.valueOf(itRoleSysPermissionVo.getSysId());
+            sysIds.add(sysId);
+        }
         // 存入token,并设置过期时间(2h)
         // TODO: user哈希中token过期清除
         redisUtil.set("USER_TOKEN_" + token, String.valueOf(itUserLoginInfoVo.getUserId()), 2L, TimeUnit.HOURS);
+        redisUtil.set("USER_ROLE_" + token, String.valueOf(roleId), 2L, TimeUnit.HOURS);
+        redisUtil.lPush("USER_PERM_" + token, sysIds);
 
         return itUserLoginInfoVo;
     }

+ 12 - 0
src/main/java/cn/iaun/it/util/RedisUtil.java

@@ -2,11 +2,13 @@ package cn.iaun.it.util;
 
 
 import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.ListOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -63,4 +65,14 @@ public class RedisUtil { // 常用redis操作
         HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
         return opsHash.keys(hash);
     }
+
+    public void lPush(String list, List<String> val) {
+        ListOperations<String, String> opsList = redisTemplate.opsForList();
+        opsList.rightPushAll(list, val);
+    }
+
+    public List<String> lGetAll(String list) {
+        ListOperations<String, String> opsList = redisTemplate.opsForList();
+        return opsList.range(list, 0, -1);
+    }
 }

+ 17 - 0
src/test/java/cn/iaun/it/RedisTest.java

@@ -1,17 +1,24 @@
 package cn.iaun.it;
 
+import cn.iaun.it.util.RedisUtil;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 @SpringBootTest
 public class RedisTest {
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
+    @Autowired
+    private RedisUtil redisUtil;
+
     @Test
     void set() {
         ValueOperations<String, String> ops = redisTemplate.opsForValue();
@@ -24,4 +31,14 @@ public class RedisTest {
         String data = ops.get("foo");
         System.out.println(data);
     }
+
+    @Test
+    void listTest() {
+        List<String> strs = new ArrayList<>();
+        strs.add("abcd");
+        strs.add("1234");
+        strs.add("qwer");
+        redisUtil.lPush("testlist2", strs);
+        System.out.println(redisUtil.lGetAll("testlist2"));
+    }
 }