Merge branch 'master' into lzy1

# Conflicts:
#	src/main/java/com/zhentao/groups/controller/groupsController.java

src/main/java/com/zhentao/groups/controller/groupsController.java

@@ -1,12 +1,13 @@
 package com.zhentao.groups.controller;
 
-import com.zhentao.groups.MongoDB.pojo.GroupMessage;
-import com.zhentao.groups.pojo.Groups;
+import com.zhentao.groups.dto.AddGroupMembers;
+import com.zhentao.groups.dto.AddGroupsDto;
+import com.zhentao.groups.dto.DelGroupMembers;
 import com.zhentao.groups.service.GroupsService;
+import com.zhentao.tool.TokenUtils;
 import com.zhentao.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("/group")
 @RestController
@@ -17,12 +18,31 @@ public class groupsController {
     private GroupsService groupsService;
 
 
+//  创建群聊
+    @PostMapping("/addGroup")
+    public Result addGroup(@RequestBody AddGroupsDto addGroupsDto, @RequestHeader("token") String token){
+        Long userIdFromToken = Long.valueOf(TokenUtils.getUserIdFromToken(token));
+        addGroupsDto.setCreatorId(userIdFromToken);
+        return groupsService.addGroup(addGroupsDto);
+    }
+
 
+//    添加好友
+    @PostMapping("/AddGroupMembers")
+    public Result AddGroupMembers(@RequestBody AddGroupMembers addGroupMembers){
+        return groupsService.AddGroupMembers(addGroupMembers);
+    }
 
-    @RequestMapping("/addGroup")
-    public Result addGroup(Groups groups){
-            return null;
+//    提出群聊
+    @PostMapping("/DelGroupMembers")
+    public Result DelGroupMembers(@RequestBody DelGroupMembers delGroupMembers,@RequestHeader("token") String token){
+        Long userIdFromToken = Long.valueOf(TokenUtils.getUserIdFromToken(token));
+        delGroupMembers.setUId(userIdFromToken);
+        return groupsService.DelGroupMembers(delGroupMembers);
     }
 
 
+
+
+
 }

src/main/java/com/zhentao/groups/dto/AddGroupMembers.java

@@ -0,0 +1,24 @@
+package com.zhentao.groups.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zhentao.groups.pojo.GroupMembers;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AddGroupMembers  implements Serializable {
+
+//  群id
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long groupId;
+
+    private List<Long> userId;
+
+
+}

src/main/java/com/zhentao/groups/dto/AddGroupsDto.java

@@ -0,0 +1,41 @@
+package com.zhentao.groups.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AddGroupsDto {
+    /**
+     * 群名称
+     */
+    private String name;
+
+    /**
+     * 创建者ID
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long creatorId;
+
+    /**
+     * 群头像
+     */
+    private String avatar;
+
+    /**
+     * 群公告
+     */
+    private String announcement;
+
+    /**
+     * 群描述
+     */
+    private String description;
+
+}

src/main/java/com/zhentao/groups/dto/DelGroupMembers.java

@@ -0,0 +1,23 @@
+package com.zhentao.groups.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DelGroupMembers {
+//  组id
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    Long groupssId;
+//  踢出的用户
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    Long userId;
+//  当前登录的用户id
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    Long  uId;
+
+}

src/main/java/com/zhentao/groups/mapper/GroupMembersMapper.java

@@ -2,6 +2,7 @@ package com.zhentao.groups.mapper;
 
 import com.zhentao.groups.pojo.GroupMembers;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
 * @author lzy
@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-06-04 16:00:48
 * @Entity com.zhentao.groups.pojo.GroupMembers
 */
+@Mapper
 public interface GroupMembersMapper extends BaseMapper<GroupMembers> {
 
 }

src/main/java/com/zhentao/groups/mapper/GroupsMapper.java

@@ -1,7 +1,8 @@
 package com.zhentao.groups.mapper;
 
-import com.zhentao.groups.pojo.Groups;
+import com.zhentao.groups.pojo.Groupss;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
 * @author lzy
@@ -9,7 +10,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-06-04 16:00:48
 * @Entity com.zhentao.groups.pojo.Groups
 */
-public interface GroupsMapper extends BaseMapper<Groups> {
+@Mapper
+public interface GroupsMapper extends BaseMapper<Groupss> {
 
 }
 

src/main/java/com/zhentao/groups/pojo/GroupMembers.java

@@ -1,11 +1,14 @@
 package com.zhentao.groups.pojo;
 
+import com.alibaba.fastjson.annotation.JSONField;
 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 java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -18,17 +21,20 @@ public class GroupMembers implements Serializable {
     /**
      * 
      */
-    @TableId(type = IdType.AUTO)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @TableId
     private Long id;
 
     /**
      * 群ID
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long groupId;
 
     /**
      * 用户ID
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long userId;
 
     /**
@@ -49,6 +55,7 @@ public class GroupMembers implements Serializable {
     /**
      * 最后确认的消息ID
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long lastAckMsgId;
 
     @TableField(exist = false)

src/main/java/com/zhentao/groups/pojo/Groups.java → src/main/java/com/zhentao/groups/pojo/Groupss.java

@@ -1,25 +1,27 @@
 package com.zhentao.groups.pojo;
 
-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 java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
  * 群组表
  * @TableName groups
  */
-@TableName(value ="groups")
+@TableName(value ="groupss")
 @Data
-public class Groups implements Serializable {
+public class Groupss implements Serializable {
     /**
      * id
 
      */
-    @TableId(type = IdType.AUTO)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    @TableId
     private Long groupId;
 
     /**
@@ -30,6 +32,7 @@ public class Groups implements Serializable {
     /**
      * 创建者ID
      */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long creatorId;
 
     /**
@@ -81,7 +84,7 @@ public class Groups implements Serializable {
         if (getClass() != that.getClass()) {
             return false;
         }
-        Groups other = (Groups) that;
+        Groupss other = (Groupss) that;
         return (this.getGroupId() == null ? other.getGroupId() == null : this.getGroupId().equals(other.getGroupId()))
             && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
             && (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId()))

src/main/java/com/zhentao/groups/service/GroupsService.java

@@ -1,13 +1,27 @@
 package com.zhentao.groups.service;
 
-import com.zhentao.groups.pojo.Groups;
+import com.zhentao.groups.dto.AddGroupMembers;
+import com.zhentao.groups.dto.AddGroupsDto;
+import com.zhentao.groups.dto.DelGroupMembers;
+import com.zhentao.groups.pojo.Groupss;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhentao.vo.Result;
 
 /**
 * @author lzy
 * @description 针对表【groups(群组表)】的数据库操作Service
 * @createDate 2025-06-04 16:00:48
 */
-public interface GroupsService extends IService<Groups> {
+public interface GroupsService extends IService<Groupss> {
+
+//    创建群聊
+    Result addGroup(AddGroupsDto addGroupsDto);
+
+
+//        添加人数
+    Result AddGroupMembers(AddGroupMembers addGroupMembers);
+
+//    删除人数
+    Result DelGroupMembers(DelGroupMembers delGroupMembers);
 
 }

src/main/java/com/zhentao/groups/service/impl/GroupsServiceImpl.java

@@ -1,10 +1,30 @@
 package com.zhentao.groups.service.impl;
 
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.zhentao.groups.pojo.Groups;
+import com.zhentao.groups.dto.AddGroupMembers;
+import com.zhentao.groups.dto.AddGroupsDto;
+import com.zhentao.groups.dto.DelGroupMembers;
+import com.zhentao.groups.mapper.GroupMembersMapper;
+import com.zhentao.groups.pojo.GroupMembers;
+import com.zhentao.groups.pojo.Groupss;
+import com.zhentao.groups.service.GroupMembersService;
 import com.zhentao.groups.service.GroupsService;
 import com.zhentao.groups.mapper.GroupsMapper;
+import com.zhentao.user.domain.UserShouye;
+import com.zhentao.user.mapper.UserShouyeMapper;
+import com.zhentao.user.service.UserShouyeService;
+import com.zhentao.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
 * @author lzy
@@ -12,11 +32,184 @@ import org.springframework.stereotype.Service;
 * @createDate 2025-06-04 16:00:48
 */
 @Service
-public class GroupsServiceImpl extends ServiceImpl<GroupsMapper, Groups>
+public class GroupsServiceImpl extends ServiceImpl<GroupsMapper, Groupss>
     implements GroupsService{
 
+    @Autowired
+    private GroupMembersMapper groupMembersMapper;
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
+
+    @Autowired
+    private UserShouyeMapper userShouyeMapper;
+
+//  创建群
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, timeout = 30)
+    public Result addGroup(AddGroupsDto addGroupsDto) {
+        Groupss groups=new Groupss();
+        groups.setGroupId(IdUtil.getSnowflake().nextId());
+        groups.setName(addGroupsDto.getName());
+        groups.setCreatorId(addGroupsDto.getCreatorId());
+        groups.setAvatar(addGroupsDto.getAvatar());
+        groups.setAnnouncement(addGroupsDto.getAnnouncement());
+        groups.setDescription(addGroupsDto.getDescription());
+        groups.setMaxMembers(200);
+        groups.setStatus(1);
+        groups.setCreatedAt(new Date());
+        groups.setUpdatedAt(new Date());
+        int insert1 = this.baseMapper.insert(groups);
+
+        GroupMembers groupMembers=new GroupMembers();
+        groupMembers.setId(IdUtil.getSnowflake().nextId());
+        groupMembers.setGroupId(groups.getGroupId());
+        groupMembers.setUserId(groups.getCreatorId());
+        groupMembers.setNickname(groups.getName());
+        groupMembers.setRole(2);
+        groupMembers.setJoinTime(new Date());
+        int insert = groupMembersMapper.insert(groupMembers);
+
+        UserShouye userShouye=new UserShouye();
+        userShouye.setId(IdUtil.getSnowflake().nextId());
+        userShouye.setUid1(addGroupsDto.getCreatorId());
+        userShouye.setUid2(null);
+        userShouye.setGid(groups.getGroupId());
+        userShouye.setStatus(0);
+        userShouye.setSort(null);
+        int insert2 = userShouyeMapper.insert(userShouye);
+
+        if (insert1!=0 && insert!=0 && insert2!=0){
+            return Result.OK(null,"创建成功");
+        }
+        return Result.ERR(null,"创建失败");
+    }
+
+
+    @Autowired
+    private GroupMembersService groupMembersService;
+    @Autowired
+    private UserShouyeService userShouyeService;
+    @Autowired
+    private GroupsMapper groupsMapper;
+//    添加人数
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, timeout = 30)
+    public Result AddGroupMembers(AddGroupMembers addGroupMembers) {
+
+        List<GroupMembers> data = new ArrayList<>();
+        Groupss groupss = groupsMapper.selectById(addGroupMembers.getGroupId());
+        System.err.println(groupss);
+        List<UserShouye> userShouyes =new ArrayList<>();
+        List<GroupMembers> list = groupMembersMapper.selectList(new LambdaQueryWrapper<GroupMembers>().eq(GroupMembers::getGroupId, addGroupMembers.getGroupId()));
+        if (list.size()!=0){
+            if (groupss.getMaxMembers()>list.size()){
+                System.err.println(addGroupMembers.getUserId());
+                for (Long groupMembers:addGroupMembers.getUserId()){
+                    GroupMembers groupMembers1=new GroupMembers();
+                    groupMembers1.setId(IdUtil.getSnowflake().nextId());
+                    groupMembers1.setGroupId(groupss.getGroupId());
+                    groupMembers1.setUserId(groupMembers);
+                    groupMembers1.setNickname(groupss.getName());
+                    groupMembers1.setRole(0);
+                    groupMembers1.setJoinTime(new Date());
+                    data.add(groupMembers1);
+
+                    UserShouye userShouye=new UserShouye();
+                    userShouye.setId(IdUtil.getSnowflake().nextId());
+                    userShouye.setUid1(groupMembers);
+                    userShouye.setUid2(null);
+                    userShouye.setGid(groupss.getGroupId());
+                    userShouye.setStatus(0);
+                    userShouye.setSort(null);
+                    userShouyes.add(userShouye);
+                }
+                boolean b1 = groupMembersService.saveBatch(data);
+                boolean b = userShouyeService.saveBatch(userShouyes);
+                if (b1!=false && b!=false){
+                    return Result.OK(null,"添加成功");
+                }
+            }else {
+                return Result.ERR(null,"群已满");
+            }
+        }else {
+            return Result.ERR(null,"群已不存在");
+        }
+
+        return Result.ERR(null,"添加失败");
+    }
+
+
+
+//     踢人
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, timeout = 30)
+    public Result DelGroupMembers(DelGroupMembers delGroupMembers) {
+        System.err.println(delGroupMembers);
+//       用户
+        GroupMembers groupMembers = groupMembersMapper.selectOne(new LambdaQueryWrapper<GroupMembers>().eq(GroupMembers::getGroupId, delGroupMembers.getGroupssId()).eq(GroupMembers::getUserId, delGroupMembers.getUId()));
+//       被踢掉的人
+        GroupMembers groupMembers2 = groupMembersMapper.selectOne(new LambdaQueryWrapper<GroupMembers>().eq(GroupMembers::getUserId, delGroupMembers.getUserId()).eq(GroupMembers::getGroupId, delGroupMembers.getGroupssId()));
+        System.err.println(groupMembers2);
+        UserShouye userShouye = userShouyeMapper.selectOne(new LambdaQueryWrapper<UserShouye>().eq(UserShouye::getUid1, delGroupMembers.getUserId()).eq(UserShouye::getGid, delGroupMembers.getGroupssId()));
+        System.err.println(userShouye);
+        if (groupMembers2!=null && groupMembers!=null){
+            //        首页展示userShouye表中数据
+            if (groupMembers.getRole()==2){
+                if (groupMembers2.getRole()==2){
+                    return Result.ERR(null,"群主不能踢自己");
+                }
+                groupMembersMapper.deleteById(groupMembers2);
+                userShouyeMapper.deleteById(userShouye);
+                return Result.OK(null,"删除成功");
+            }else if (groupMembers.getRole()==1){
+                if (groupMembers2.getRole()==0){
+                    groupMembersMapper.deleteById(groupMembers2);
+                    userShouyeMapper.deleteById(userShouye);
+                    return Result.OK(null,"删除成功");
+                }else {
+                    return Result.ERR(null,"权限不足");
+                }
+            }else {
+                return Result.ERR(null,"权限不足");
+            }
+        }else {
+            return Result.ERR(null,"该用户已经不存在");
+        }
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
 
 
 
+

src/main/java/com/zhentao/intercepoter/Userinterceptor.java

@@ -18,9 +18,9 @@ public class Userinterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String requestURI = request.getRequestURI();
-//        if (requestURI.startsWith("/user/login")||requestURI.startsWith("/user/register")){
-//            return true;
-//        }
+        if (requestURI.startsWith("/user/login")||requestURI.startsWith("/user/register")){
+            return true;
+        }
         String token = request.getHeader("token");
         HandlerMethod handlerMethod = (HandlerMethod) handler;
         NullLogin annotation = handlerMethod.getMethod().getAnnotation(NullLogin.class);
@@ -35,7 +35,8 @@ public class Userinterceptor implements HandlerInterceptor {
         String userIdFromToken = TokenUtils.getUserIdFromToken(token);
         System.err.println("解析后的ID："+userIdFromToken);
         String s = redisTemplate.opsForValue().get(userIdFromToken);
-        if (s!=null){
+
+        if (s!=null && s.equals(token)){
             return true;
         }else {
             System.err.println("Token错误");

src/main/java/com/zhentao/user/controller/UserController.java

@@ -46,6 +46,7 @@ public class UserController {
     @PostMapping("/UserPassLogin")
     @NullLogin
     public Result UserPassLogin(@RequestBody @Valid UserPassDto userPassDto) {
+
         return userLoginService.UserPassLogin(userPassDto);
     }
 

src/main/java/com/zhentao/user/domain/UserLogin.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -19,6 +21,7 @@ public class UserLogin implements Serializable {
      * 用户ID
      */
     @TableId
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
     /**

src/main/java/com/zhentao/user/domain/UserShouye.java

@@ -0,0 +1,106 @@
+package com.zhentao.user.domain;
+
+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 java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 用户首页表
+ * @TableName user_shouye
+ */
+@TableName(value ="user_shouye")
+@Data
+public class UserShouye implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    /**
+     * 用户1
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long uid1;
+
+    /**
+     * 用户2
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long uid2;
+
+    /**
+     * 群id
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long gid;
+
+    /**
+     * 状态0 1
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        UserShouye other = (UserShouye) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getUid1() == null ? other.getUid1() == null : this.getUid1().equals(other.getUid1()))
+            && (this.getUid2() == null ? other.getUid2() == null : this.getUid2().equals(other.getUid2()))
+            && (this.getGid() == null ? other.getGid() == null : this.getGid().equals(other.getGid()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getSort() == null ? other.getSort() == null : this.getSort().equals(other.getSort()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getUid1() == null) ? 0 : getUid1().hashCode());
+        result = prime * result + ((getUid2() == null) ? 0 : getUid2().hashCode());
+        result = prime * result + ((getGid() == null) ? 0 : getGid().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getSort() == null) ? 0 : getSort().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", uid1=").append(uid1);
+        sb.append(", uid2=").append(uid2);
+        sb.append(", gid=").append(gid);
+        sb.append(", status=").append(status);
+        sb.append(", sort=").append(sort);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/zhentao/user/mapper/UserLoginMapper.java

@@ -2,6 +2,7 @@ package com.zhentao.user.mapper;
 
 import com.zhentao.user.domain.UserLogin;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
 * @author 86183
@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2025-06-03 18:38:51
 * @Entity com.zhentao.user.domain.UserLogin
 */
+@Mapper
 public interface UserLoginMapper extends BaseMapper<UserLogin> {
 
 }

src/main/java/com/zhentao/user/mapper/UserShouyeMapper.java

@@ -0,0 +1,20 @@
+package com.zhentao.user.mapper;
+
+import com.zhentao.user.domain.UserShouye;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author lzy
+* @description 针对表【user_shouye(用户首页表)】的数据库操作Mapper
+* @createDate 2025-06-05 19:11:47
+* @Entity com.zhentao.user.domain.UserShouye
+*/
+@Mapper
+public interface UserShouyeMapper extends BaseMapper<UserShouye> {
+
+}
+
+
+
+

src/main/java/com/zhentao/user/service/UserShouyeService.java

@@ -0,0 +1,13 @@
+package com.zhentao.user.service;
+
+import com.zhentao.user.domain.UserShouye;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author lzy
+* @description 针对表【user_shouye(用户首页表)】的数据库操作Service
+* @createDate 2025-06-05 19:11:47
+*/
+public interface UserShouyeService extends IService<UserShouye> {
+
+}

src/main/java/com/zhentao/user/service/impl/UserLoginServiceImpl.java

@@ -209,6 +209,9 @@ public class UserLoginServiceImpl extends ServiceImpl<UserLoginMapper, UserLogin
                 }
                 // 生成JWT令牌
                 String jwtToken = TokenUtils.generateToken(one.getId()+"");
+                stringRedisTemplate.opsForValue().set(one.getId().toString(),jwtToken);
+                System.err.println(jwtToken);
+                System.err.println(stringRedisTemplate.opsForValue().get(one.getId().toString()));
                 // 返回登录成功结果和JWT令牌
                 return Result.OK("登录成功",jwtToken);
             }else {

src/main/java/com/zhentao/user/service/impl/UserShouyeServiceImpl.java

@@ -0,0 +1,22 @@
+package com.zhentao.user.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhentao.user.domain.UserShouye;
+import com.zhentao.user.service.UserShouyeService;
+import com.zhentao.user.mapper.UserShouyeMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author lzy
+* @description 针对表【user_shouye(用户首页表)】的数据库操作Service实现
+* @createDate 2025-06-05 19:11:47
+*/
+@Service
+public class UserShouyeServiceImpl extends ServiceImpl<UserShouyeMapper, UserShouye>
+    implements UserShouyeService{
+
+}
+
+
+
+

src/main/resources/mapper/GroupsMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhentao.groups.mapper.GroupsMapper">
 
-    <resultMap id="BaseResultMap" type="com.zhentao.groups.pojo.Groups">
+    <resultMap id="BaseResultMap" type="com.zhentao.groups.pojo.Groupss">
             <id property="groupId" column="group_id" jdbcType="BIGINT"/>
             <result property="name" column="name" jdbcType="VARCHAR"/>
             <result property="creatorId" column="creator_id" jdbcType="BIGINT"/>

src/main/resources/mapper/UserShouyeMapper.xml

@@ -0,0 +1,20 @@
+<?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.zhentao.user.mapper.UserShouyeMapper">
+
+    <resultMap id="BaseResultMap" type="com.zhentao.user.domain.UserShouye">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="uid1" column="uid1" jdbcType="BIGINT"/>
+            <result property="uid2" column="uid2" jdbcType="BIGINT"/>
+            <result property="gid" column="gid" jdbcType="BIGINT"/>
+            <result property="status" column="status" jdbcType="INTEGER"/>
+            <result property="sort" column="sort" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,uid1,uid2,
+        gid,status,sort
+    </sql>
+</mapper>