🇨🇳 1.3.0.RELEASE shiro+jwt

Author: springboot-plus

src/main/java/io/geekidea/springbootplus/common/aop/LogAop.java

@@ -20,6 +20,7 @@
 import com.alibaba.fastjson.JSONObject;
 import io.geekidea.springbootplus.common.api.ApiCode;
 import io.geekidea.springbootplus.common.api.ApiResult;
+import io.geekidea.springbootplus.shiro.util.JwtTokenUtil;
 import io.geekidea.springbootplus.util.AnsiUtil;
 import io.geekidea.springbootplus.util.DateUtil;
 import io.geekidea.springbootplus.util.IpUtil;
@@ -131,7 +132,7 @@ public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
             map.put("time", DateUtil.getYYYYMMDDHHMMSS(new Date()));
 
             // 获取请求头token
-            map.put("x-auth-token",request.getHeader("x-auth-token"));
+            map.put("token",request.getHeader(JwtTokenUtil.getTokenName()));
 
             String requestInfo = null;
             try {

src/main/java/io/geekidea/springbootplus/common/constant/CommonConstant.java

@@ -41,14 +41,13 @@ public interface CommonConstant {
     /**
      * 登陆token
      */
-    String JWT_TOKEN_NAME = "token";
+    String JWT_DEFAULT_TOKEN_NAME = "token";
 
     /**
      * JWT用户名
      */
     String JWT_USERNAME = "username";
 
-
     /**
      * JWT刷新新token响应状态码
      */
@@ -60,6 +59,15 @@ public interface CommonConstant {
      */
     int JWT_INVALID_TOKEN_CODE = 461;
 
+    /**
+     * JWT Token默认密钥
+     */
+    String JWT_DEFAULT_SECRET = "666666";
+
+    /**
+     * JWT 默认过期时间，3600L，单位秒
+     */
+    Long JWT_DEFAULT_EXPIRE_SECOND = 3600L;
 
     /**
      * 初始密码

src/main/java/io/geekidea/springbootplus/common/web/filter/CrossDomainFilter.java

@@ -46,7 +46,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
         httpServletResponse.setHeader("Access-Control-Allow-Methods", "*");
         httpServletResponse.setHeader("Access-Control-Allow-Headers", "*");
         httpServletResponse.setHeader("Access-Control-Request-Headers","*");
-        httpServletResponse.setHeader("Access-Control-Allow-Headers", "content-type,x-auth-token");
+        httpServletResponse.setHeader("Access-Control-Allow-Headers", "content-type,token");
         httpServletResponse.setHeader("Access-Control-Expose-Headers", "*");
 
         HttpServletRequest request = (HttpServletRequest) servletRequest;

src/main/java/io/geekidea/springbootplus/config/Swagger2Config.java

@@ -16,6 +16,7 @@
 
 package io.geekidea.springbootplus.config;
 
+import io.geekidea.springbootplus.shiro.util.JwtTokenUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -113,10 +114,17 @@ private ApiInfo apiInfo() {
     private List<Parameter> setHeaderToken() {
         List<Parameter> pars = new ArrayList<>();
 
-        // TODO  测试token值,上线关闭
+        // token请求头
         String testTokenValue = "";
         ParameterBuilder tokenPar = new ParameterBuilder();
-        Parameter tokenParameter = tokenPar.name("token").description("token").modelRef(new ModelRef("string")).parameterType("header").required(false).defaultValue(testTokenValue).build();
+        Parameter tokenParameter = tokenPar
+                .name(JwtTokenUtil.getTokenName())
+                .description("Token Request Header")
+                .modelRef(new ModelRef("string"))
+                .parameterType("header")
+                .required(false)
+                .defaultValue(testTokenValue)
+                .build();
         pars.add(tokenParameter);
         return pars;
     }

src/main/java/io/geekidea/springbootplus/core/SpringBootPlusProperties.java

@@ -51,11 +51,6 @@ public class SpringBootPlusProperties {
      */
     private boolean responseLogFormat;
 
-    /**
-     * 登录token失效时间，单位分钟，默认60分钟失效
-     */
-    private Integer tokenValidTime = 60;
-
     /**
      * 拦截器配置
      */

src/main/java/io/geekidea/springbootplus/shiro/cache/LoginRedisService.java

@@ -56,9 +56,10 @@ public interface LoginRedisService {
     /**
      * 删除对应用户的Redis缓存
      *
-     * @param jwtToken
+     * @param token
+     * @param username
      */
-    void deleteLoginInfo(JwtToken jwtToken);
+    void deleteLoginInfo(String token, String username);
 
     /**
      * 判断token在redis中是否存在

src/main/java/io/geekidea/springbootplus/shiro/cache/impl/LoginRedisServiceImpl.java

@@ -32,6 +32,8 @@
 import java.time.Duration;
 
 /**
+ * 登陆信息Redis缓存服务类
+ *
  * @author geekidea
  * @date 2019-09-30
  * @since 1.3.0.RELEASE
@@ -88,10 +90,6 @@ public void cacheLoginInfo(JwtToken jwtToken, LoginSysUserVo loginSysUserVo, boo
         redisTemplate.opsForValue().set(String.format(CommonRedisKey.LOGIN_USER, username), loginSysUserRedisVo, expireDuration);
         // 3. salt hash,方便获取盐值鉴权
         redisTemplate.opsForValue().set(String.format(CommonRedisKey.LOGIN_SALT, username), salt, expireDuration);
-        if (generate) {
-            // 4. username hash,统计用户登陆次数
-            redisTemplate.opsForHash().increment(CommonRedisKey.LOGIN_USER_HASH, username, 1);
-        }
 
     }
 
@@ -122,21 +120,20 @@ public String getSalt(String username) {
     }
 
     @Override
-    public void deleteLoginInfo(JwtToken jwtToken) {
-        if (jwtToken == null) {
-            throw new IllegalArgumentException("jwtToken不能为空");
+    public void deleteLoginInfo(String token, String username) {
+        if (token == null) {
+            throw new IllegalArgumentException("token不能为空");
+        }
+        if (username == null) {
+            throw new IllegalArgumentException("username不能为空");
         }
-        String username = jwtToken.getUsername();
-        String token = jwtToken.getToken();
         String tokenMd5 = DigestUtils.md5Hex(token);
         // 1. delete tokenMd5
         redisTemplate.delete(String.format(CommonRedisKey.LOGIN_TOKEN, tokenMd5));
         // 2. delete username
         redisTemplate.delete(String.format(CommonRedisKey.LOGIN_USER, username));
         // 3. delete salt
         redisTemplate.delete(String.format(CommonRedisKey.LOGIN_SALT, username));
-        // 4. delete username hash
-        redisTemplate.opsForHash().increment(CommonRedisKey.LOGIN_USER_HASH, username, -1);
     }
 
     @Override

src/main/java/io/geekidea/springbootplus/shiro/controller/LoginController.java

@@ -14,22 +14,20 @@
 package io.geekidea.springbootplus.shiro.controller;
 
 import io.geekidea.springbootplus.common.api.ApiResult;
-import io.geekidea.springbootplus.shiro.jwt.JwtProperties;
-import io.geekidea.springbootplus.shiro.jwt.JwtToken;
 import io.geekidea.springbootplus.shiro.cache.LoginRedisService;
+import io.geekidea.springbootplus.shiro.jwt.JwtProperties;
 import io.geekidea.springbootplus.shiro.param.LoginParam;
 import io.geekidea.springbootplus.shiro.service.LoginService;
 import io.geekidea.springbootplus.system.web.vo.SysUserQueryVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
@@ -61,14 +59,8 @@ public ApiResult login(@Valid @RequestBody LoginParam loginParam, HttpServletRes
     }
 
     @PostMapping("/logout")
-    public ApiResult logout() {
-        Subject subject = SecurityUtils.getSubject();
-        //注销
-        subject.logout();
-        // 删除Redis缓存信息
-        JwtToken jwtToken = (JwtToken) subject.getPrincipal();
-        System.out.println("jwtToken = " + jwtToken);
-        loginRedisService.deleteLoginInfo(jwtToken);
+    public ApiResult logout(HttpServletRequest request) {
+        loginService.logout(request);
         return ApiResult.ok("退出成功");
     }
 }

src/main/java/io/geekidea/springbootplus/shiro/convert/ShiroMapstructConvert.java

@@ -21,6 +21,8 @@
 import org.mapstruct.factory.Mappers;
 
 /**
+ * Shiro包下使用mapstruct对象属性复制转换器
+ *
  * @author geekidea
  * @date 2019-09-30
  * @since 1.3.0.RELEASE
@@ -30,7 +32,20 @@ public interface ShiroMapstructConvert {
 
     ShiroMapstructConvert INSTANCE = Mappers.getMapper(ShiroMapstructConvert.class);
 
+    /**
+     * LoginSysUserVo对象转换成LoginSysUserRedisVo
+     *
+     * @param loginSysUserVo
+     * @return
+     */
     LoginSysUserRedisVo loginSysUserVoToLoginSysUserRedisVo(LoginSysUserVo loginSysUserVo);
 
+    /**
+     * JwtToken对象转换成JwtTokenRedisVo
+     *
+     * @param jwtToken
+     * @return
+     */
     JwtTokenRedisVo jwtTokenToJwtTokenRedisVo(JwtToken jwtToken);
+
 }

src/main/java/io/geekidea/springbootplus/shiro/jwt/JwtCredentialsMatcher.java

@@ -13,13 +13,11 @@
 
 package io.geekidea.springbootplus.shiro.jwt;
 
-import io.geekidea.springbootplus.shiro.cache.LoginRedisService;
 import io.geekidea.springbootplus.shiro.util.JwtUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.credential.CredentialsMatcher;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * JWT证书匹配
@@ -31,18 +29,14 @@
 @Slf4j
 public class JwtCredentialsMatcher implements CredentialsMatcher {
 
-    @Autowired
-    private LoginRedisService loginRedisService;
-
     @Override
     public boolean doCredentialsMatch(AuthenticationToken authenticationToken, AuthenticationInfo authenticationInfo) {
         String token = authenticationToken.getCredentials().toString();
         String salt = authenticationInfo.getCredentials().toString();
         try {
-            boolean success = JwtUtil.verifyToken(token, salt);
-            return success;
+            return JwtUtil.verifyToken(token, salt);
         } catch (Exception e) {
-            log.error("Token CredentialsMatch Exception:" + e.getMessage(), e);
+            log.error("JWT Token CredentialsMatch Exception:" + e.getMessage(), e);
         }
         return false;
     }