From 9a35ea161d18c299d6d2c18b2f336a8d260df0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Mon, 24 Aug 2020 11:06:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90jwt=E5=B7=A5=E5=85=B7=E7=B1=BB?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/jwt/JwtProperties.java | 41 ---------- .../com/elink/esua/epdc/jwt/JwtUtils.java | 75 ------------------- .../epdc/service/impl/AuthServiceImpl.java | 5 +- 3 files changed, 3 insertions(+), 118 deletions(-) delete mode 100644 esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/jwt/JwtProperties.java delete mode 100644 esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/jwt/JwtProperties.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/jwt/JwtProperties.java deleted file mode 100644 index b2f79ec3b..000000000 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/jwt/JwtProperties.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.elink.esua.epdc.jwt; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -/** - * Jwt - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Configuration -@ConfigurationProperties(prefix = "jwt") -public class JwtProperties { - private String secret; - private int expire; - - public String getSecret() { - return secret; - } - - public void setSecret(String secret) { - this.secret = secret; - } - - public int getExpire() { - return expire; - } - - public void setExpire(int expire) { - this.expire = expire; - } -} diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java deleted file mode 100644 index 4f9f76ee2..000000000 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.elink.esua.epdc.jwt; - -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; -import org.joda.time.DateTime; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Date; -import java.util.Map; - -/** - * Jwt工具类 - * - * @author Mark sunlightcs@gmail.com - * @since 1.0.0 - */ -@Component -public class JwtUtils { - private static final Logger logger = LoggerFactory.getLogger(JwtUtils.class); - - @Autowired - private JwtProperties jwtProperties; - - /** - * 生成jwt token - */ - public String generateToken(Long userId) { - return Jwts.builder() - .setHeaderParam("typ", "JWT") - .setSubject(userId+"") - .setIssuedAt(new Date()) - .setExpiration(DateTime.now().plusSeconds(jwtProperties.getExpire()).toDate()) - .signWith(SignatureAlgorithm.HS512, jwtProperties.getSecret()) - .compact(); - } - - public Claims getClaimByToken(String token) { - try { - return Jwts.parser() - .setSigningKey(jwtProperties.getSecret()) - .parseClaimsJws(token) - .getBody(); - }catch (Exception e){ - logger.debug("validate is token error, token = " + token, e); - return null; - } - } - public static String generateEpmetToken(Map claims, String Secret){ - return Jwts.builder() - .setHeaderParam("typ", "JWT") - .setClaims(claims) - .signWith(SignatureAlgorithm.HS512,Secret) - .compact(); - } - - /** - * token是否过期 - * @return true：过期 - */ - public boolean isTokenExpired(Date expiration) { - return expiration.before(new Date()); - } -} diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java index 349851312..a37d720de 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java @@ -27,6 +27,8 @@ import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis; import com.elink.esua.epdc.commons.tools.security.enums.UserKillEnum; +import com.elink.esua.epdc.commons.tools.security.jwt.JwtProperties; +import com.elink.esua.epdc.commons.tools.security.jwt.JwtUtils; import com.elink.esua.epdc.commons.tools.security.password.PasswordUtils; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; @@ -37,8 +39,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.enums.UserStatusEnum; import com.elink.esua.epdc.feign.UserFeignClient; -import com.elink.esua.epdc.jwt.JwtProperties; -import com.elink.esua.epdc.jwt.JwtUtils; + import com.elink.esua.epdc.service.AuthService; import io.jsonwebtoken.Claims; import org.springframework.beans.factory.annotation.Autowired;