1

src/main/java/top/suyiiyii/sims/controller/RecordController.java

@@ -8,6 +8,7 @@ import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import top.suyiiyii.sims.common.AuthAccess;
+import top.suyiiyii.sims.common.JwtInterceptor;
 import top.suyiiyii.sims.common.Result;
 import top.suyiiyii.sims.dto.CommonResponse;
 import top.suyiiyii.sims.dto.RecordDto;

src/main/java/top/suyiiyii/sims/dto/UserDto.java

@@ -15,6 +15,7 @@ import java.util.List;
 @Data
 public class UserDto {
     private Integer userId;
+    private Integer studentId;
     private String username;
     private String grade;
     private String userGroup;

src/main/java/top/suyiiyii/sims/service/UserService.java

@@ -45,14 +45,6 @@ public class UserService {
     @Autowired
     private ModelMapper modelMapper;
 
-    public void addUser(User user) {
-        userMapper.addUser(user);
-    }
-
-    public void updateUser(User user) {
-        userMapper.updateUser(user);
-    }
-
     public void deleteUser(int id) {
         userMapper.deleteUser(id);
     }
@@ -82,19 +74,11 @@ public class UserService {
             throw new ServiceException("账号已经存在");
         }
         User user = modelMapper.map(req, User.class);
-
         mpUserMapper.insert(user);
         user = mpUserMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getUsername, req.getUsername()));
         rbacService.addRoleWithUserId(user.getId(), "user");
     }
 
-    public User selectByUsername(String username) {
-        return userMapper.selectByUserName(username);
-    }
-
-    public void updatePassword(User user) {
-        userMapper.updatePassword(user);
-    }
 
     public List<UserDto> findAllUsers() {
         List<User> users = userMapper.selectAll();
@@ -115,24 +99,27 @@ public class UserService {
 
     public UserDto findUser(Integer id) {
 
-        UserDto UserDto = new UserDto();
+        UserDto userDto = new UserDto();
         User user = userMapper.selectById(id);
         if (user == null) {
             throw new ServiceException("用户不存在");
         }
-        UserDto.setUserId(user.getId());
-        UserDto.setUsername(user.getUsername());
-        UserDto.setGrade(user.getGrade());
-        UserDto.setUserGroup(user.getUserGroup());
-        UserDto.setRoles(new ArrayList<>());
+        userDto.setUserId(user.getId());
+        userDto.setUsername(user.getUsername());
+        userDto.setGrade(user.getGrade());
+        userDto.setUserGroup(user.getUserGroup());
+        userDto.setStudentId(user.getStudentId());
+        userDto.setRoles(new ArrayList<>());
         //TODO: 获取用户角色
-        return UserDto;
+        return userDto;
     }
 
     public User selectByUserId(Integer studentId) {
         return userMapper.selectByUserId(studentId);
     }
 
+
+
     public List<Role> selectRolesById(Integer studentId) {
         return roleMapper.selectRolesById(studentId);
     }

src/main/java/top/suyiiyii/sims/utils/JwtUtils.java

@@ -42,7 +42,7 @@ public class JwtUtils {
     public static String createToken(String userId, String sign) {
         return JWT.create()
                 .withAudience(userId)
-                .withExpiresAt(DateUtil.offsetHour(new Date(), 2))
+                .withExpiresAt(DateUtil.offsetWeek(new Date(), 2))
                 .sign(Algorithm.HMAC256(sign));
         // 设置令牌过期时间为2小时
     }