整理依赖

common/pom.xml

@@ -16,7 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-spring-boot-starter</artifactId>
+            <artifactId>easypoi-base</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

common/src/main/java/com/koobietech/eas/common/pojo/JwtUserDto.java

@@ -2,6 +2,9 @@ package com.koobietech.eas.common.pojo;
 
 import lombok.Data;
 
+/**
+ * @author lc
+ */
 @Data
 public class JwtUserDto {
     String username;

controller/pom.xml

@@ -20,11 +20,12 @@
         </dependency>
         <dependency>
             <groupId>com.anji-plus</groupId>
-            <artifactId>spring-boot-starter-captcha</artifactId>
+            <artifactId>captcha</artifactId>
         </dependency>
         <dependency>
             <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-spring-boot-starter</artifactId>
+            <artifactId>easypoi-base</artifactId>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>

controller/src/main/java/com/koobietech/eas/config/CaptchaConfig.java

@@ -0,0 +1,84 @@
+package com.koobietech.eas.config;
+
+import com.anji.captcha.model.common.Const;
+import com.anji.captcha.service.CaptchaCacheService;
+import com.anji.captcha.service.CaptchaService;
+import com.anji.captcha.service.impl.CaptchaServiceFactory;
+import com.anji.captcha.util.ImageUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.util.Base64Utils;
+import org.springframework.util.FileCopyUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * @author lc
+ */
+@Configuration
+public class CaptchaConfig {
+
+    @Bean(name = "AjCaptchaCacheService")
+    public CaptchaCacheService captchaCacheService() {
+        return CaptchaServiceFactory.getCache("local");
+    }
+
+    @Bean
+    @DependsOn("AjCaptchaCacheService")
+    public CaptchaService captchaService() {
+        Properties config = new Properties();
+        config.put(Const.CAPTCHA_CACHETYPE, "local");
+        config.put(Const.CAPTCHA_WATER_MARK, "爱扣钉");
+        config.put(Const.CAPTCHA_FONT_TYPE, "宋体");
+        config.put(Const.CAPTCHA_TYPE, "default");
+        config.put(Const.CAPTCHA_INTERFERENCE_OPTIONS, "0");
+        config.put(Const.ORIGINAL_PATH_JIGSAW, "classpath:images/jigsaw");
+        config.put(Const.ORIGINAL_PATH_PIC_CLICK, "classpath:images/pic-click");
+        config.put(Const.CAPTCHA_SLIP_OFFSET, "5");
+        config.put(Const.CAPTCHA_AES_STATUS, "true");
+        config.put(Const.CAPTCHA_WATER_FONT, "宋体");
+        config.put(Const.CAPTCHA_CACAHE_MAX_NUMBER, "1000");
+        config.put(Const.CAPTCHA_TIMING_CLEAR_SECOND, "180");
+        if ((StringUtils.isNotBlank(config.getProperty(Const.ORIGINAL_PATH_JIGSAW))
+                && config.getProperty(Const.ORIGINAL_PATH_JIGSAW).startsWith("classpath:"))
+                || (StringUtils.isNotBlank(config.getProperty(Const.ORIGINAL_PATH_PIC_CLICK))
+                && config.getProperty(Const.ORIGINAL_PATH_PIC_CLICK).startsWith("classpath:"))) {
+            config.put(Const.CAPTCHA_INIT_ORIGINAL, "true");
+            initializeBaseMap(config.getProperty(Const.ORIGINAL_PATH_JIGSAW),
+                    config.getProperty(Const.ORIGINAL_PATH_PIC_CLICK));
+        }
+        CaptchaService s = CaptchaServiceFactory.getInstance(config);
+        return s;
+    }
+
+    private static void initializeBaseMap(String jigsaw, String picClick) {
+        ImageUtils.cacheBootImage(getResourcesImagesFile(jigsaw + "/original/*.png"),
+                getResourcesImagesFile(jigsaw + "/slidingBlock/*.png"),
+                getResourcesImagesFile(picClick + "/*.png"));
+    }
+
+    public static Map<String, String> getResourcesImagesFile(String path) {
+        Map<String, String> imgMap = new HashMap<>();
+        ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+        try {
+            Resource[] resources = resolver.getResources(path);
+            for (Resource resource : resources) {
+                byte[] bytes = FileCopyUtils.copyToByteArray(resource.getInputStream());
+                String string = Base64Utils.encodeToString(bytes);
+                String filename = resource.getFilename();
+                imgMap.put(filename, string);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return imgMap;
+    }
+
+}

controller/src/main/java/com/koobietech/eas/controller/LoginController.java

@@ -1,6 +0,0 @@
-package com.koobietech.eas.controller;
-
-public class LoginController {
-
-
-}

controller/src/main/java/com/koobietech/eas/controller/StudentLoginController.java

@@ -5,9 +5,8 @@ import com.anji.captcha.model.vo.CaptchaVO;
 import com.anji.captcha.service.CaptchaService;
 import com.koobietech.eas.common.exception.EasException;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.dao.Pojo.AdminPojo;
-import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
 import com.koobietech.eas.dao.dto.LoginToken;
+import com.koobietech.eas.dao.pojo.AdminPojo;
 import com.koobietech.eas.service.StudentLoginService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

controller/src/main/resources/application.yaml

@@ -34,22 +34,5 @@ eas:
   jwt-secret-key: 123456
   jwt-expires-date: 2
   password-sign-key: eas-key-password
-aj:
-  captcha:
-    cache-type: local
-    type: default
-    water-mark: "\u7231\u6263\u9489"
-    slip-offset: 5
-    aes-status: true
-    interference-options: 2
-    font-style: 1
-    font-size: 25
-    history-data-clear-enable: false
-    req-frequency-limit-enable: false
-    req-get-lock-limit: 5
-    req-get-lock-seconds: 360
-    req-get-minute-limit: 30
-    req-check-minute-limit: 60
-    req-verify-minute-limit: 60
 project:
   path: ${user.home}/archivesFiles

dao/pom.xml

@@ -10,7 +10,7 @@
     <dependencies>
         <dependency>
             <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-wps</artifactId>
+            <artifactId>easypoi-annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>

dao/src/main/java/com/koobietech/eas/dao/pojo/AdminPojo.java

@@ -2,6 +2,9 @@ package com.koobietech.eas.dao.pojo;
 
 import lombok.Data;
 
+/**
+ * @author lc
+ */
 @Data
 public class AdminPojo {
     private String username;

dao/src/main/resources/com/koobietech/eas/dao/mapper/AdminLoginMapper.xml

@@ -33,7 +33,7 @@
         <result column="email" property="email"/>
     </resultMap>
 
-    <resultMap id="permissionResult" type="com.koobietech.eas.dao.adminLoginPojo.Permission">
+    <resultMap id="permissionResult" type="com.koobietech.eas.dao.login.pojo.Permission">
         <!-- 映射查询结果到实体类属性 -->
         <id column="id" property="id"/>
         <result column="name" property="name"/>
@@ -44,7 +44,7 @@
         <result column="description" property="description"/>
     </resultMap>
 
-    <resultMap id="departmentResult" type="com.koobietech.eas.dao.adminLoginPojo.Department">
+    <resultMap id="departmentResult" type="com.koobietech.eas.dao.login.pojo.Department">
         <!-- 映射查询结果到实体类属性 -->
         <id column="id" property="id"/>
         <result column="depname" property="depname"/>
@@ -57,7 +57,7 @@
         <result column="create_uid" property="createUid"/>
     </resultMap>
 
-    <resultMap id="studentDetailResult" type="com.koobietech.eas.dao.adminLoginPojo.UserDetail">
+    <resultMap id="studentDetailResult" type="com.koobietech.eas.dao.login.pojo.UserDetail">
         <!-- 映射查询结果到实体类属性 -->
         <result column="id" property="id"/>
         <result column="student_name" property="username"/>
@@ -65,31 +65,6 @@
         <result column="email" property="email"/>
     </resultMap>
 
-
-
-<!--    <resultMap id="userDetailResultMap" type="UserDetail">-->
-<!--        &lt;!&ndash; 映射查询结果到实体类属性 &ndash;&gt;-->
-<!--        <result column="id" property="id" />-->
-<!--        <result column="username" property="username" />-->
-<!--        <result column="phone" property="phone" />-->
-<!--        <result column="email" property="email" />-->
-<!--        <collection property="departments" ofType="Department">-->
-<!--            <id column="dep_id" property="id" />-->
-<!--            <result column="depname" property="depname" />-->
-<!--            &lt;!&ndash; 其他部门属性的映射 &ndash;&gt;-->
-<!--        </collection>-->
-<!--        <collection property="permissions" ofType="Permission">-->
-<!--            <id column="per_id" property="id" />-->
-<!--            <result column="name" property="name" />-->
-<!--            &lt;!&ndash; 其他权限属性的映射 &ndash;&gt;-->
-<!--        </collection>-->
-<!--    </resultMap>-->
-
-
-
-
-
-
     <select id="getUserPermissionsById" resultMap="permissionResultMap">
         SELECT p.id, p.name, p.is_active, p.create_time, p.modify_time, p.create_uid, p.description
         FROM eas_sys_userinfo u

pom.xml

@@ -35,6 +35,7 @@
         <knife4j.version>4.1.0</knife4j.version>
         <easypoi.version>4.4.0</easypoi.version>
         <pagehelper.starter.version>1.3.1</pagehelper.starter.version>
+        <pagehelper.version>5.2.1</pagehelper.version>
         <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
         <captcha.version>1.3.0</captcha.version>
         <xerces.version>2.9.1</xerces.version>
@@ -52,19 +53,19 @@
                 <artifactId>xercesImpl</artifactId>
                 <version>${xerces.version}</version>
             </dependency>
-            <dependency>
-                <groupId>cn.afterturn</groupId>
-                <artifactId>easypoi-wps</artifactId>
-                <version>${easypoi.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.anji-plus</groupId>
-                <artifactId>spring-boot-starter-captcha</artifactId>
+                <artifactId>captcha</artifactId>
                 <version>${captcha.version}</version>
             </dependency>
             <dependency>
                 <groupId>cn.afterturn</groupId>
-                <artifactId>easypoi-spring-boot-starter</artifactId>
+                <artifactId>easypoi-base</artifactId>
+                <version>${easypoi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.afterturn</groupId>
+                <artifactId>easypoi-annotation</artifactId>
                 <version>${easypoi.version}</version>
             </dependency>
             <dependency>
@@ -74,8 +75,8 @@
             </dependency>
             <dependency>
                 <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.starter.version}</version>
+                <artifactId>pagehelper</artifactId>
+                <version>${pagehelper.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>

security/src/main/java/com/koobietech/eas/security/filter/EasStudentFilter.java

@@ -1,82 +0,0 @@
-package com.koobietech.eas.security.filter;
-
-import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.pojo.JwtUserDto;
-import com.koobietech.eas.common.utils.JwtManager;
-import com.koobietech.eas.dao.adminLoginPojo.Permission;
-import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
-import com.koobietech.eas.service.StudentLoginRedisService;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import javax.annotation.Resource;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Component
-public class EasStudentFilter extends OncePerRequestFilter {
-
-    @Resource
-    private StudentLoginRedisService studentLoginRedisService;
-
-    @Resource
-    JwtManager jwtManager;
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-
-        //从请求里面拿到token
-        String token = request.getHeader("Authorization");
-        //判断token是否存在
-        if (StringUtils.hasText(token)) {
-            //解析token成JwtUserDto
-            JwtUserDto jwtUserDto = null;
-            try {
-                //过滤器 允许 Token 不正确, 后面Security 会拦截处理
-                jwtUserDto = jwtManager.decodeJwt(token);
-            } catch ( EasException e) {}
-            if ( Objects.nonNull(jwtUserDto) ) {
-                //判断token是否有效
-                UserDetail userDetail = studentLoginRedisService.checkToken(jwtUserDto);
-
-                // 获取当前的 SecurityContext 对象，用于保存当前用户的安全上下文信息
-                SecurityContext context = SecurityContextHolder.getContext();
-
-                // 如果获取到了有效的用户对象
-                if (Objects.nonNull(userDetail)) {
-
-                    // 获取用户的权限列表
-                    List<Permission> permissions = userDetail.getPermissions();
-                    // 创建一个 ArrayList 集合，用于存储用户权限对应的 SimpleGrantedAuthority 权限对象
-                    ArrayList<SimpleGrantedAuthority> objects = new ArrayList<>();
-
-                    // 遍历学生的权限
-                    for (Permission studentPermission : permissions) {
-                        // 创建一个 SimpleGrantedAuthority 权限对象，并添加到集合中
-                        SimpleGrantedAuthority authority = new SimpleGrantedAuthority(studentPermission.getDescription());
-                        objects.add(authority);
-                    }
-
-                    // 使用用户的用户名、空凭证参数和权限对象集合创建一个 UsernamePasswordAuthenticationToken 身份验证令牌
-                    UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(userDetail.getUsername(), null, objects);
-
-                    // 将身份验证令牌设置到当前的 SecurityContext 中
-                    context.setAuthentication(authenticationToken);
-                }
-            }
-        }
-        filterChain.doFilter(request, response);
-    }
-
-}

service/pom.xml

@@ -14,11 +14,12 @@
         </dependency>
         <dependency>
             <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-spring-boot-starter</artifactId>
+            <artifactId>easypoi-base</artifactId>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <artifactId>pagehelper</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

service/src/main/java/com/koobietech/eas/service/StudentLoginRedisService.java

@@ -1,19 +0,0 @@
-package com.koobietech.eas.service;
-
-import com.koobietech.eas.common.pojo.JwtUserDto;
-import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
-
-public interface StudentLoginRedisService {
-
-    String createJwtTokenKey(JwtUserDto jwtUserDto);
-
-    String createJwtRefreshTokenKey(JwtUserDto jwtUserDto);
-
-    void loginSavaCache(String redisTokenKey, UserDetail userDetail, Integer token_expires);
-
-    UserDetail loginGetCache(String newRedisTokenKey);
-
-    UserDetail checkToken(JwtUserDto jwtUserDto);
-
-    Boolean loginDeleteCache(String newRedisRefreshTokenKey);
-}

service/src/main/java/com/koobietech/eas/service/StudentLoginService.java

@@ -2,9 +2,8 @@ package com.koobietech.eas.service;
 
 import com.anji.captcha.model.common.ResponseModel;
 import com.koobietech.eas.common.result.JsonResult;
-import com.koobietech.eas.dao.Pojo.AdminPojo;
-import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
 import com.koobietech.eas.dao.dto.LoginToken;
+import com.koobietech.eas.dao.pojo.AdminPojo;
 
 
 /**

service/src/main/java/com/koobietech/eas/service/impl/AdminLoginServiceImpl.java

@@ -7,7 +7,6 @@ import com.koobietech.eas.common.pojo.JwtUserDto;
 import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.utils.JwtManager;
 import com.koobietech.eas.common.utils.PasswordManager;
-import com.koobietech.eas.dao.pojo.AdminPojo;
 import com.koobietech.eas.dao.login.pojo.UserDetail;
 import com.koobietech.eas.dao.dto.LoginToken;
 import com.koobietech.eas.dao.mapper.AdminLoginMapper;
@@ -16,6 +15,7 @@ import com.koobietech.eas.mbg.model.EasSysUserinfo;
 import com.koobietech.eas.mbg.model.EasSysUserinfoExample;
 import com.koobietech.eas.service.AdminLoginService;
 import com.koobietech.eas.service.LoginRedisService;
+import com.koobietech.eas.dao.pojo.AdminPojo;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 

service/src/main/java/com/koobietech/eas/service/impl/LoginRedisServiceImpl.java

@@ -9,6 +9,9 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
+/**
+ * @author lc
+ */
 @Service
 public class LoginRedisServiceImpl implements LoginRedisService {
 

service/src/main/java/com/koobietech/eas/service/impl/StudentLoginRedisServiceImpl.java

@@ -1,57 +0,0 @@
-package com.koobietech.eas.service.impl;
-
-import com.koobietech.eas.common.exception.EasException;
-import com.koobietech.eas.common.pojo.JwtUserDto;
-import com.koobietech.eas.common.service.RedisService;
-import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
-import com.koobietech.eas.service.StudentLoginRedisService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-@Service
-public class StudentLoginRedisServiceImpl implements StudentLoginRedisService {
-
-    @Resource
-    RedisService redisService;
-
-
-    @Override
-    public UserDetail checkToken(JwtUserDto jwtUserDto) {
-        String jwtKey = createJwtTokenKey(jwtUserDto);
-        //判断redis里面是否有这个key
-        if (!redisService.hasKey(jwtKey)) {
-            throw new EasException("token已过期");
-        }
-        return (UserDetail) redisService.get(jwtKey);
-    }
-
-    @Override
-    public Boolean loginDeleteCache(String newRedisRefreshTokenKey) {
-        return redisService.del(newRedisRefreshTokenKey);
-    }
-
-    public String createJwtTokenKey(JwtUserDto jwtUserDto) {
-        //根据jwtUserDto 生成jwtKey，格式为：eas_token_{id}_{username}_{type}
-        return "eas_token" + "_" + jwtUserDto.getId() + "_" + jwtUserDto.getUsername() + "_" + jwtUserDto.getType();
-    }
-
-    public String createJwtRefreshTokenKey(JwtUserDto jwtUserDto) {
-        //根据jwtUserDto 生成jwtKey，格式为：eas_refresh_{id}_{username}_{type}
-        return "eas_refresh" + "_" + jwtUserDto.getId() + "_" + jwtUserDto.getUsername() + "_" + jwtUserDto.getType();
-    }
-
-    public void loginSavaCache(String redisTokenKey, UserDetail userDetail, Integer token_expires) {
-        redisService.set(redisTokenKey, userDetail, token_expires);
-    }
-
-    public UserDetail loginGetCache(String newRedisTokenKey) {
-        //看看redis里面有没有这个key
-        if (redisService.hasKey(newRedisTokenKey)) {
-            //有的话，就从redis里面取出来
-            return (UserDetail) redisService.get(newRedisTokenKey);
-        }
-        return null;
-    }
-
-}

service/src/main/java/com/koobietech/eas/service/impl/StudentLoginServiceImpl.java

@@ -1,20 +1,18 @@
 package com.koobietech.eas.service.impl;
 
-import com.anji.captcha.model.common.ResponseModel;
-import com.koobietech.eas.common.constant.UserType;
 import com.koobietech.eas.common.exception.EasException;
 import com.koobietech.eas.common.pojo.JwtUserDto;
-import com.koobietech.eas.common.result.JsonResult;
 import com.koobietech.eas.common.utils.JwtManager;
 import com.koobietech.eas.common.utils.PasswordManager;
-import com.koobietech.eas.dao.Pojo.AdminPojo;
-import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
+import com.koobietech.eas.dao.constant.UserType;
 import com.koobietech.eas.dao.dto.LoginToken;
+import com.koobietech.eas.dao.login.pojo.UserDetail;
 import com.koobietech.eas.dao.mapper.AdminLoginMapper;
+import com.koobietech.eas.dao.pojo.AdminPojo;
 import com.koobietech.eas.mbg.mapper.EasSysStudentMapper;
 import com.koobietech.eas.mbg.model.EasSysStudent;
 import com.koobietech.eas.mbg.model.EasSysStudentExample;
-import com.koobietech.eas.service.StudentLoginRedisService;
+import com.koobietech.eas.service.LoginRedisService;
 import com.koobietech.eas.service.StudentLoginService;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -40,15 +38,15 @@ public class StudentLoginServiceImpl implements StudentLoginService {
     AdminLoginMapper adminLoginMapper;
 
     @Resource
-    StudentLoginRedisService studentLoginRedisService;
+    LoginRedisService studentLoginRedisService;
 
     @Resource
     JwtManager jwtManager;
 
     // token过期时间 单位：s
-    private final Integer token_expires = 60 * 3;
+    private final Integer token_expires = 24 * 60 * 60;
 
-    private final Integer refreshToken_expires = 60 * 7;
+    private final Integer refreshToken_expires = 48 * 60 * 60;
 
     @Override
     public LoginToken studentLogin(AdminPojo adminPojo) {
@@ -65,9 +63,9 @@ public class StudentLoginServiceImpl implements StudentLoginService {
         userDetail.setDepartments(adminLoginMapper.getStudentDepartmentsById(adminId));
         userDetail.setPermissions(adminLoginMapper.getStudentPermissionsById(adminId));
 
-        UserType student = UserType.MEMBER;
+        userDetail.setUserType(UserType.MEMBER);
         // 生成token
-        JwtUserDto jwtUserDto = new JwtUserDto(userDetail.getUsername(), userDetail.getId(), student);
+        JwtUserDto jwtUserDto = new JwtUserDto(userDetail.getUsername(), userDetail.getId(), UserType.MEMBER);
 
         String token = jwtManager.createJwt(jwtUserDto, token_expires);
 
@@ -79,9 +77,9 @@ public class StudentLoginServiceImpl implements StudentLoginService {
         String jwtRefreshTokenKey = studentLoginRedisService.createJwtRefreshTokenKey(jwtUserDto);
 
         // 将token存入redis
-        studentLoginRedisService.loginSavaCache(jwtTokenKey, userDetail, token_expires);
+        studentLoginRedisService.loginSaveCache(jwtTokenKey, userDetail, token_expires);
 
-        studentLoginRedisService.loginSavaCache(jwtRefreshTokenKey, userDetail, refreshToken_expires);
+        studentLoginRedisService.loginSaveCache(jwtRefreshTokenKey, userDetail, refreshToken_expires);
 
         // 登录成功
         return new LoginToken(token, refreshToken);