iaun 3 лет назад
Родитель
Сommit
c85fc688cf

+ 10 - 0
pom.xml

@@ -54,6 +54,16 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.5.3.1</version>
         </dependency>
+
+        <dependency><!-- md5 -->
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
     </dependencies>
 
     <build>

+ 18 - 0
src/main/java/cn/iaun/it/config/GlobalExceptionConfig.java

@@ -0,0 +1,18 @@
+package cn.iaun.it.config;
+
+import cn.iaun.it.util.ResultCode;
+import cn.iaun.it.util.WebException;
+import cn.iaun.it.util.Result;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice
+public class GlobalExceptionConfig {
+    @ResponseBody
+    @ExceptionHandler(WebException.class)
+    public Result<WebException> handle(WebException e) {
+        ResultCode resultCode = e.getResultCode();
+        return new Result<>(resultCode, null);
+    }
+}

+ 11 - 2
src/main/java/cn/iaun/it/config/InterceptorConfig.java

@@ -3,11 +3,20 @@ package cn.iaun.it.config;
 import cn.iaun.it.interceptor.TokenInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 // Web拦截器,用于认证
 @Configuration
-public class InterceptorConfig extends WebMvcConfigurationSupport {
+public class InterceptorConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(getTokenInterceptor())
+                .addPathPatterns("/**")
+                .excludePathPatterns("/user/login");
+    }
+
     @Bean
     public TokenInterceptor getTokenInterceptor() {
         return new TokenInterceptor();

+ 2 - 2
src/main/java/cn/iaun/it/config/RedisConfig.java

@@ -10,8 +10,8 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 @Configuration
 public class RedisConfig {
     @Bean
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
-        RedisTemplate<Object, Object> template = new RedisTemplate<>();
+    public RedisTemplate<String, ?> redisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<String, ?> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);
         template.setKeySerializer(new StringRedisSerializer());
         template.setValueSerializer(new StringRedisSerializer());

+ 7 - 7
src/main/java/cn/iaun/it/controller/ItUserController.java

@@ -5,13 +5,9 @@ import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 import cn.iaun.it.service.ItUserService;
 import cn.iaun.it.util.Result;
 import cn.iaun.it.util.ResultCode;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.logging.Logger;
 
 @RestController
 @RequestMapping("/user")
@@ -27,10 +23,14 @@ public class ItUserController {
         return new Result<>(ResultCode.SUCCESS, itUserService.getAll());
     }
 
+
     @PostMapping(value = "/login")
     public Result<ItUserLoginInfoVo> login(@RequestBody LoginRequest request) {
-        itUserService.loginByUserAndPassword(request.user, request.password);
-        return new Result<>(ResultCode.SUCCESS, null);
+        ItUserLoginInfoVo itUserLoginInfoVo = itUserService.loginByUserAndPassword(request.user, request.password);
+        if (itUserLoginInfoVo == null) {
+            return new Result<>(ResultCode.USER_WRONG_USER_OR_PASSWORD, null);
+        }
+        return new Result<>(ResultCode.SUCCESS, itUserLoginInfoVo);
     }
 }
 

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

@@ -1,4 +1,44 @@
 package cn.iaun.it.interceptor;
 
-public class TokenInterceptor {
+import cn.iaun.it.util.RedisUtil;
+import cn.iaun.it.util.WebException;
+import cn.iaun.it.util.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.concurrent.TimeUnit;
+
+public class TokenInterceptor implements HandlerInterceptor {
+    @Autowired
+    private RedisUtil redisUtil;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        if (!(handler instanceof HandlerMethod)) {
+            return HandlerInterceptor.super.preHandle(request, response, handler);
+        }
+        String token = request.getHeader("token");
+        if (token == null) {
+            throw new WebException(ResultCode.USER_INVALID_TOKEN);
+        } else {
+            String userId = redisUtil.get("USER_TOKEN_" + token);
+            if (userId == null) { // token无效
+                throw new WebException(ResultCode.USER_INVALID_TOKEN);
+            }
+
+            String tokenInHash = redisUtil.hGet("user", userId);
+            if (!tokenInHash.equals(token)) {
+                throw new WebException(ResultCode.USER_INVALID_TOKEN);
+            }
+
+            // token续期
+            redisUtil.set("USER_TOKEN_" + token, userId, 2L, TimeUnit.HOURS);
+
+            request.setAttribute("userId", Long.valueOf(userId));
+            return true;
+        }
+    }
 }

+ 9 - 4
src/main/java/cn/iaun/it/mapper/ItUserMapper.java

@@ -8,11 +8,16 @@ import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface ItUserMapper extends BaseMapper<ItUser> {
+    //    @Select(
+    //            "select u.user_id as user_id, u.user as user, u.display_name as display_name, u.phone_number as phone_number, u.role_id as role_id, " +
+    //                    "r.name as role_name " +
+    //                    "from it_user u left join it_role r on u.role_id = r.role_id " +
+    //                    "where u.user = #{user} and u.password = #{password} limit 1"
+    //    )
     @Select(
-            "select u.user as user, u.display_name as display_name, u.phone_number as phone_number, u.role_id as role_id, " +
-                    "r.name as role_name " +
-                    "from it_user u left join it_role r on u.role_id = r.role_id " +
-                    "where u.user = #{user} and u.password = #{password}"
+            "select u.user_id as user_id " +
+                    "from it_user u " +
+                    "where u.user = #{user} and u.password = #{password} limit 1"
     )
     ItUserLoginInfoVo selectItUserLoginInfo(String user, String password);
 }

+ 80 - 0
src/main/java/cn/iaun/it/model/vo/user/ItUserInfoVo.java

@@ -0,0 +1,80 @@
+package cn.iaun.it.model.vo.user;
+
+public class ItUserInfoVo {
+    private Long userId;
+    private String user;
+    private String displayName;
+    private String phoneNumber;
+    private Long roleId;
+    private String roleName;
+    private String token;
+
+    @Override
+    public String toString() {
+        return "ItUserLoginInfoVo{" +
+                "userId='" + userId + '\'' +
+                ", user='" + user + '\'' +
+                ", displayName='" + displayName + '\'' +
+                ", phoneNumber='" + phoneNumber + '\'' +
+                ", roleId=" + roleId +
+                ", roleName='" + roleName + '\'' +
+                ", token='" + token + '\'' +
+                '}';
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+}

+ 10 - 50
src/main/java/cn/iaun/it/model/vo/user/ItUserLoginInfoVo.java

@@ -1,70 +1,30 @@
 package cn.iaun.it.model.vo.user;
 
 public class ItUserLoginInfoVo {
-    private String user;
-    private String displayName;
-    private String phoneNumber;
-    private Long roleId;
-    private String roleName;
+    private Long userId;
     private String token;
 
     @Override
     public String toString() {
         return "ItUserLoginInfoVo{" +
-                "user='" + user + '\'' +
-                ", displayName='" + displayName + '\'' +
-                ", phoneNumber='" + phoneNumber + '\'' +
-                ", roleId=" + roleId +
-                ", roleName='" + roleName + '\'' +
+                "userId='" + userId + '\'' +
                 ", token='" + token + '\'' +
                 '}';
     }
 
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getUser() {
-        return user;
-    }
-
-    public void setUser(String user) {
-        this.user = user;
-    }
-
-    public String getDisplayName() {
-        return displayName;
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public Long getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId) {
-        this.roleId = roleId;
-    }
-
-    public String getRoleName() {
-        return roleName;
+    public String getToken() {
+        return token;
     }
 
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
+    public void setToken(String token) {
+        this.token = token;
     }
 }

+ 30 - 2
src/main/java/cn/iaun/it/service/impl/ItUserServiceImpl.java

@@ -4,16 +4,24 @@ import cn.iaun.it.mapper.ItUserMapper;
 import cn.iaun.it.model.ItUser;
 import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 import cn.iaun.it.service.ItUserService;
+import cn.iaun.it.util.MD5Util;
+import cn.iaun.it.util.RedisUtil;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 @Service
 public class ItUserServiceImpl implements ItUserService {
     private final ItUserMapper itUserMapper;
+    private final RedisTemplate<String, String> redisTemplate;
+    private final RedisUtil redisUtil;
 
-    public ItUserServiceImpl(ItUserMapper itUserMapper) {
+    public ItUserServiceImpl(ItUserMapper itUserMapper, RedisTemplate<String, String> redisTemplate, RedisUtil redisUtil) {
         this.itUserMapper = itUserMapper;
+        this.redisTemplate = redisTemplate;
+        this.redisUtil = redisUtil;
     }
 
     @Override
@@ -24,7 +32,27 @@ public class ItUserServiceImpl implements ItUserService {
     @Override
     public ItUserLoginInfoVo loginByUserAndPassword(String user, String password) {
         ItUserLoginInfoVo itUserLoginInfoVo = itUserMapper.selectItUserLoginInfo(user, password);
-        System.out.println(itUserLoginInfoVo);
+        if (itUserLoginInfoVo == null) { // 找不到用户或账号密码错误
+            return null;
+        }
+        /* 登录成功生成token */
+        String token = MD5Util.md5Token(user);
+        itUserLoginInfoVo.setToken(token);
+
+        /* token存入redis */
+        // 存入hash:user-userId-token
+        String tokenInRedis = redisUtil.hGet("user", String.valueOf(itUserLoginInfoVo.getUserId()));
+        redisUtil.hSet("user", String.valueOf(itUserLoginInfoVo.getUserId()), token);
+
+        /* 如果存在旧token,则删除 */
+        if (tokenInRedis != null) {
+            redisTemplate.delete("USER_TOKEN_" + tokenInRedis);
+        }
+
+        // 存入token,并设置过期时间(2h)
+        // TODO: user哈希中token过期清除
+        redisUtil.set("USER_TOKEN_" + token, String.valueOf(itUserLoginInfoVo.getUserId()), 2L, TimeUnit.HOURS);
+
         return itUserLoginInfoVo;
     }
 }

+ 21 - 0
src/main/java/cn/iaun/it/util/MD5Util.java

@@ -0,0 +1,21 @@
+package cn.iaun.it.util;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.Random;
+
+@Component
+public class MD5Util {
+    public static String md5(String txt) {
+        return DigestUtils.md5Hex(txt);
+    }
+
+    // 生成token用的md5
+    public static String md5Token(String txt) {
+        String ts = String.valueOf(new Date().getTime());
+        String ran = String.valueOf(new Random().nextDouble());
+        return md5(txt + ts + ran);
+    }
+}

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

@@ -0,0 +1,66 @@
+package cn.iaun.it.util;
+
+
+import org.springframework.data.redis.core.HashOperations;
+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.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class RedisUtil { // 常用redis操作
+    private final RedisTemplate<String, String> redisTemplate;
+
+    public RedisUtil(RedisTemplate<String, String> redisTemplate) {
+        this.redisTemplate = redisTemplate;
+    }
+
+    protected ValueOperations<String, String> _set(String key, String val) {
+        ValueOperations<String, String> ops = redisTemplate.opsForValue();
+        ops.set(key, val);
+        return ops;
+    }
+
+    public void set(String key, String val) {
+        _set(key, val);
+    }
+
+    public void set(String key, String val, Duration expire) {
+        ValueOperations<String, String> ops = _set(key, val);
+        ops.getAndExpire(key, expire);
+    }
+
+    public void set(String key, String val, Long time, TimeUnit timeUnit) {
+        ValueOperations<String, String> ops = _set(key, val);
+        ops.getAndExpire(key, time, timeUnit);
+    }
+
+    public String get(String key) {
+        ValueOperations<String, String> ops = redisTemplate.opsForValue();
+        return ops.get(key);
+    }
+
+    public void hSet(String hash, String hashKey, String hashVal) {
+        HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
+        opsHash.put(hash, hashKey, hashVal);
+    }
+
+    public void hSet(String hash, Map<String, String> map) {
+        HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
+        opsHash.putAll(hash, map);
+    }
+
+    public String hGet(String hash, String hashKey) {
+        HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
+        return opsHash.get(hash, hashKey);
+    }
+
+    public Set<String> hKeys(String hash) {
+        HashOperations<String, String, String> opsHash = redisTemplate.opsForHash();
+        return opsHash.keys(hash);
+    }
+}

+ 2 - 1
src/main/java/cn/iaun/it/util/ResultCode.java

@@ -5,7 +5,8 @@ public enum ResultCode {
     FAILED(-1, "失败"),
 
     /* 用户模块 1001XXX */
-    USER_WRONG_USER_OR_PASSWORD(1001001, "用户名或密码错误");
+    USER_WRONG_USER_OR_PASSWORD(1001001, "用户名或密码错误"),
+    USER_INVALID_TOKEN(1001002, "您尚未登录或登录已失效,请重新登录");
 
     private final Integer code;
     private final String message;

+ 17 - 0
src/main/java/cn/iaun/it/util/WebException.java

@@ -0,0 +1,17 @@
+package cn.iaun.it.util;
+
+public class WebException extends RuntimeException {
+    ResultCode resultCode;
+
+    public ResultCode getResultCode() {
+        return resultCode;
+    }
+
+    public void setResultCode(ResultCode resultCode) {
+        this.resultCode = resultCode;
+    }
+
+    public WebException(ResultCode resultCode) {
+        this.resultCode = resultCode;
+    }
+}

+ 20 - 0
src/test/java/cn/iaun/it/MD5Test.java

@@ -0,0 +1,20 @@
+package cn.iaun.it;
+
+import cn.iaun.it.util.MD5Util;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class MD5Test {
+
+    @Test
+    public void md5() {
+        String val = MD5Util.md5("123456");
+        Assertions.assertEquals(val, "e10adc3949ba59abbe56e057f20f883e");
+        System.out.println(MD5Util.md5Token("123456"));
+        System.out.println(MD5Util.md5Token("123456"));
+    }
+
+
+}

+ 2 - 2
src/test/java/cn/iaun/it/RedisTest.java

@@ -1,15 +1,15 @@
 package cn.iaun.it;
 
 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 javax.annotation.Resource;
 
 @SpringBootTest
 public class RedisTest {
-    @Resource
+    @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
     @Test