Merge branch 'zongzibinbin:main' into main

mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/RoleDao.java

@@ -0,0 +1,19 @@
+package com.abin.mallchat.common.user.dao;
+
+import com.abin.mallchat.common.user.domain.entity.Role;
+import com.abin.mallchat.common.user.mapper.RoleMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 角色表 服务实现类
+ * </p>
+ *
+ * @author <a href="https://github.com/zongzibinbin">abin</a>
+ * @since 2023-06-04
+ */
+@Service
+public class RoleDao extends ServiceImpl<RoleMapper, Role> {
+
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/dao/UserRoleDao.java

@@ -0,0 +1,26 @@
+package com.abin.mallchat.common.user.dao;
+
+import com.abin.mallchat.common.user.domain.entity.UserRole;
+import com.abin.mallchat.common.user.mapper.UserRoleMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 用户角色关系表 服务实现类
+ * </p>
+ *
+ * @author <a href="https://github.com/zongzibinbin">abin</a>
+ * @since 2023-06-04
+ */
+@Service
+public class UserRoleDao extends ServiceImpl<UserRoleMapper, UserRole> {
+    public List<UserRole> listByUid(Long uid) {
+        return lambdaQuery()
+                .eq(UserRole::getUid, Objects.requireNonNull(uid))
+                .list();
+    }
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/Role.java

@@ -0,0 +1,53 @@
+package com.abin.mallchat.common.user.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 角色表
+ * </p>
+ *
+ * @author <a href="https://github.com/zongzibinbin">abin</a>
+ * @since 2023-06-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("role")
+public class Role implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 角色名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/entity/UserRole.java

@@ -0,0 +1,59 @@
+package com.abin.mallchat.common.user.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户角色关系表
+ * </p>
+ *
+ * @author <a href="https://github.com/zongzibinbin">abin</a>
+ * @since 2023-06-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("user_role")
+public class UserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * uid
+     */
+    @TableField("uid")
+    private Long uid;
+
+    /**
+     * 角色id
+     */
+    @TableField("role_id")
+    private Long roleId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/domain/enums/RoleEnum.java

@@ -0,0 +1,35 @@
+package com.abin.mallchat.common.user.domain.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Description: 角色枚举
+ * Author: <a href="https://github.com/zongzibinbin">abin</a>
+ * Date: 2023-03-19
+ */
+@AllArgsConstructor
+@Getter
+public enum RoleEnum {
+    ADMIN(1L, "超级管理员"),
+    CHAT_MANAGER(2L, "抹茶群聊管理"),
+    ;
+
+    private final Long id;
+    private final String desc;
+
+    private static Map<Long, RoleEnum> cache;
+
+    static {
+        cache = Arrays.stream(RoleEnum.values()).collect(Collectors.toMap(RoleEnum::getId, Function.identity()));
+    }
+
+    public static RoleEnum of(Integer type) {
+        return cache.get(type);
+    }
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/RoleMapper.java

@@ -0,0 +1,16 @@
+package com.abin.mallchat.common.user.mapper;
+
+import com.abin.mallchat.common.user.domain.entity.Role;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 角色表 Mapper 接口
+ * </p>
+ *
+ * @author <a href="https://github.com/zongzibinbin">abin</a>
+ * @since 2023-06-04
+ */
+public interface RoleMapper extends BaseMapper<Role> {
+
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/UserRoleMapper.java

@@ -0,0 +1,16 @@
+package com.abin.mallchat.common.user.mapper;
+
+import com.abin.mallchat.common.user.domain.entity.UserRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户角色关系表 Mapper 接口
+ * </p>
+ *
+ * @author <a href="https://github.com/zongzibinbin">abin</a>
+ * @since 2023-06-04
+ */
+public interface UserRoleMapper extends BaseMapper<UserRole> {
+
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/mapper/xml/BlackMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.abin.mallchat.common.user.mapper.BlackMapper">
-
-</mapper>

mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IRoleService.java

@@ -0,0 +1,22 @@
+package com.abin.mallchat.common.user.service;
+
+import com.abin.mallchat.common.user.domain.enums.RoleEnum;
+
+/**
+ * <p>
+ * 角色表 服务类
+ * </p>
+ *
+ * @author <a href="https://github.com/zongzibinbin">abin</a>
+ * @since 2023-06-04
+ */
+public interface IRoleService {
+
+    /**
+     * 是否有某个权限，临时做法
+     *
+     * @return
+     */
+    boolean hasPower(Long uid, RoleEnum roleEnum);
+
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/service/IUserRoleService.java

@@ -0,0 +1,16 @@
+package com.abin.mallchat.common.user.service;
+
+import com.abin.mallchat.common.user.domain.entity.UserRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 用户角色关系表 服务类
+ * </p>
+ *
+ * @author <a href="https://github.com/zongzibinbin">abin</a>
+ * @since 2023-06-04
+ */
+public interface IUserRoleService extends IService<UserRole> {
+
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/service/cache/UserCache.java

@@ -8,9 +8,12 @@ import com.abin.mallchat.common.common.domain.vo.response.CursorPageBaseResp;
 import com.abin.mallchat.common.common.utils.CursorUtils;
 import com.abin.mallchat.common.common.utils.RedisUtils;
 import com.abin.mallchat.common.user.dao.BlackDao;
+import com.abin.mallchat.common.user.dao.RoleDao;
 import com.abin.mallchat.common.user.dao.UserDao;
+import com.abin.mallchat.common.user.dao.UserRoleDao;
 import com.abin.mallchat.common.user.domain.entity.Black;
 import com.abin.mallchat.common.user.domain.entity.User;
+import com.abin.mallchat.common.user.domain.entity.UserRole;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -34,6 +37,10 @@ public class UserCache {
     private UserDao userDao;
     @Autowired
     private BlackDao blackDao;
+    @Autowired
+    private RoleDao roleDao;
+    @Autowired
+    private UserRoleDao userRoleDao;
 
     public Long getOnlineNum() {
         String onlineKey = RedisKey.getKey(RedisKey.ONLINE_UID_ZET);
@@ -45,6 +52,16 @@ public class UserCache {
         return RedisUtils.zCard(offlineKey);
     }
 
+    //移除用户
+    public void remove(Long uid) {
+        String onlineKey = RedisKey.getKey(RedisKey.ONLINE_UID_ZET);
+        String offlineKey = RedisKey.getKey(RedisKey.OFFLINE_UID_ZET);
+        //移除离线表
+        RedisUtils.zRemove(offlineKey, uid);
+        //移除上线表
+        RedisUtils.zRemove(onlineKey, uid);
+    }
+
     //用户上线
     public void online(Long uid, Date optTime) {
         String onlineKey = RedisKey.getKey(RedisKey.ONLINE_UID_ZET);
@@ -80,9 +97,6 @@ public class UserCache {
 
     /**
      * 获取用户信息，盘路缓存模式
-     *
-     * @param uid
-     * @return
      */
     public User getUserInfo(Long uid) {//todo 后期做二级缓存
         return getUserInfoBatch(Collections.singleton(uid)).get(uid);
@@ -90,9 +104,6 @@ public class UserCache {
 
     /**
      * 获取用户信息，盘路缓存模式
-     *
-     * @param uids
-     * @return
      */
     public Map<Long, User> getUserInfoBatch(Set<Long> uids) {
         List<String> keys = uids.stream().map(a -> RedisKey.getKey(RedisKey.USER_INFO_STRING, a)).collect(Collectors.toList());
@@ -128,4 +139,12 @@ public class UserCache {
     public Map<Integer, Set<String>> evictBlackMap() {
         return null;
     }
+
+    @Cacheable(cacheNames = "user", key = "'roles'+#uid")
+    public Set<Long> getRoleSet(Long uid) {
+        List<UserRole> userRoles = userRoleDao.listByUid(uid);
+        return userRoles.stream()
+                .map(UserRole::getRoleId)
+                .collect(Collectors.toSet());
+    }
 }

mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/RoleServiceImpl.java

@@ -0,0 +1,31 @@
+package com.abin.mallchat.common.user.service.impl;
+
+import com.abin.mallchat.common.user.domain.enums.RoleEnum;
+import com.abin.mallchat.common.user.service.IRoleService;
+import com.abin.mallchat.common.user.service.cache.UserCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * Description: 角色管理
+ * Author: <a href="https://github.com/zongzibinbin">abin</a>
+ * Date: 2023-06-04
+ */
+@Service
+public class RoleServiceImpl implements IRoleService {
+    @Autowired
+    private UserCache userCache;
+
+    @Override
+    public boolean hasPower(Long uid, RoleEnum roleEnum) {//超级管理员无敌的好吧，后期做成权限=》资源模式
+        Set<Long> roleSet = userCache.getRoleSet(uid);
+        return isAdmin(roleSet) || roleSet.contains(roleEnum.getId());
+    }
+
+    private boolean isAdmin(Set<Long> roleSet) {
+        return Objects.requireNonNull(roleSet).contains(RoleEnum.ADMIN.getId());
+    }
+}

mallchat-common/src/main/java/com/abin/mallchat/common/user/service/impl/UserBackpackServiceImpl.java

@@ -4,7 +4,6 @@ import com.abin.mallchat.common.common.annotation.RedissonLock;
 import com.abin.mallchat.common.common.domain.enums.IdempotentEnum;
 import com.abin.mallchat.common.common.domain.enums.YesOrNoEnum;
 import com.abin.mallchat.common.common.event.ItemReceiveEvent;
-import com.abin.mallchat.common.user.dao.ItemConfigDao;
 import com.abin.mallchat.common.user.dao.UserBackpackDao;
 import com.abin.mallchat.common.user.domain.entity.ItemConfig;
 import com.abin.mallchat.common.user.domain.entity.UserBackpack;
@@ -13,6 +12,7 @@ import com.abin.mallchat.common.user.service.IUserBackpackService;
 import com.abin.mallchat.common.user.service.cache.ItemCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;
@@ -30,12 +30,11 @@ public class UserBackpackServiceImpl implements IUserBackpackService {
     @Autowired
     private UserBackpackDao userBackpackDao;
     @Autowired
-    private ItemConfigDao itemConfigDao;
-    @Autowired
     private ItemCache itemCache;
     @Autowired
     private ApplicationEventPublisher applicationEventPublisher;
     @Autowired
+    @Lazy
     private UserBackpackServiceImpl userBackpackService;
 
     @Override