diff --git a/web/src/main/java/cn/jlw/Interceptor/AuthenticationInterceptor.java b/web/src/main/java/cn/jlw/Interceptor/AuthenticationInterceptor.java index 64ff2d7c..9309a48d 100644 --- a/web/src/main/java/cn/jlw/Interceptor/AuthenticationInterceptor.java +++ b/web/src/main/java/cn/jlw/Interceptor/AuthenticationInterceptor.java @@ -8,7 +8,7 @@ import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.exceptions.JWTVerificationException; import com.auth0.jwt.interfaces.DecodedJWT; -import com.ibeetl.jlw.entity.TokenInterface; +import com.ibeetl.jlw.entity.AbstractToken; import com.ibeetl.jlw.service.WebPlatformService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -110,11 +110,11 @@ public class AuthenticationInterceptor implements HandlerInterceptor { httpServletResponse.getWriter().write(JSONArray.toJSONString(map)); return false; } - TokenInterface tokenInterface = null; + AbstractToken abstractToken = null; try{ - tokenInterface = ToolUtils.deepCopy(tokenMap.get(attributeName + "_" + id)); + abstractToken = ToolUtils.deepCopy(tokenMap.get(attributeName + "_" + id)); }catch (Exception e){} - if (tokenInterface == null) { + if (abstractToken == null) { actionLog.delByUUId(httpServletRequest); Mapmap = new HashMap<>(); @@ -127,7 +127,7 @@ public class AuthenticationInterceptor implements HandlerInterceptor { } // 验证 token - JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256((tokenInterface.getAddTime().getTime())+"")).build(); + JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256((abstractToken.getAddTime().getTime())+"")).build(); try { jwtVerifier.verify(token); } catch (JWTVerificationException e) { @@ -142,14 +142,14 @@ public class AuthenticationInterceptor implements HandlerInterceptor { httpServletResponse.getWriter().write(JSONArray.toJSONString(map)); return false; } - actionLog.init(httpServletRequest,token,null == tokenInterface?null: Long.valueOf(tokenInterface.getId()),null); + actionLog.init(httpServletRequest,token,null == abstractToken ?null: Long.valueOf(abstractToken.getId()),null); /** 根据身份,插入到Session。Key是不用的。 * 供这里使用 {@link WebPlatformService#getUserInfoFromSessionByIdentity} */ // attributeName = tokenInterface.getIdentity().getAttributeName(); if (StringUtils.isNotBlank(attributeName)) { - httpServletRequest.setAttribute(attributeName, tokenInterface); + httpServletRequest.setAttribute(attributeName, abstractToken); } return true; } diff --git a/web/src/main/java/cn/jlw/token/TokenService.java b/web/src/main/java/cn/jlw/token/TokenService.java index 7a499d34..929ded4a 100644 --- a/web/src/main/java/cn/jlw/token/TokenService.java +++ b/web/src/main/java/cn/jlw/token/TokenService.java @@ -9,9 +9,9 @@ import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.exceptions.JWTVerificationException; import com.ibeetl.admin.core.util.HttpRequestLocal; +import com.ibeetl.jlw.entity.AbstractToken; import com.ibeetl.jlw.entity.Student; import com.ibeetl.jlw.entity.Teacher; -import com.ibeetl.jlw.entity.TokenInterface; import com.ibeetl.jlw.service.StudentService; import com.ibeetl.jlw.service.TeacherService; import org.apache.commons.logging.Log; @@ -37,7 +37,7 @@ public class TokenService { //静态参数 - public static Map tokenMap = new ConcurrentHashMap<>(); + public static Map tokenMap = new ConcurrentHashMap<>(); //初始化 public static void init(){ @@ -46,7 +46,7 @@ public class TokenService { List studentList = studentService.getValues(null); List teacherList = teacherService.getValues(null); - List lists = new ArrayList<>(16); + List lists = new ArrayList<>(16); if (CollectionUtil.isNotEmpty(studentList)) { lists.addAll(studentList); } @@ -54,9 +54,9 @@ public class TokenService { lists.addAll(teacherList); } - for (TokenInterface tokenInterface : lists) { - String tokenKey = tokenInterface.getIdentity().getAttributeName() + "_" + tokenInterface.getId(); - tokenMap.put(tokenKey, tokenInterface); + for (AbstractToken abstractToken : lists) { + String tokenKey = abstractToken.getIdentity().getAttributeName() + "_" + abstractToken.getId(); + tokenMap.put(tokenKey, abstractToken); } } @@ -67,7 +67,7 @@ public class TokenService { List studentList = studentService.getByIds(ids); List teacherList = teacherService.getByIds(ids); - List lists = new ArrayList<>(16); + List lists = new ArrayList<>(16); if (CollectionUtil.isNotEmpty(studentList)) { lists.addAll(studentList); } @@ -75,36 +75,36 @@ public class TokenService { lists.addAll(teacherList); } - for (TokenInterface tokenInterface : lists) { - String tokenKey = tokenInterface.getIdentity().getAttributeName() + "_" + tokenInterface.getId(); - tokenMap.put(tokenKey, tokenInterface); + for (AbstractToken abstractToken : lists) { + String tokenKey = abstractToken.getIdentity().getAttributeName() + "_" + abstractToken.getId(); + tokenMap.put(tokenKey, abstractToken); } } //获取会员信息简述,合并了微信信息 - public static TokenInterface getTokenInterfaceInfo(String tokenId) { - TokenInterface tokenInterface = ToolUtils.deepCopy(tokenMap.get(tokenId)); - return tokenInterface; + public static AbstractToken getTokenInterfaceInfo(String tokenId) { + AbstractToken abstractToken = ToolUtils.deepCopy(tokenMap.get(tokenId)); + return abstractToken; } - public static Map getMap(TokenInterface tokenInterface, TokenService tokenService){ - TokenInterface student = ToolUtils.deepCopy(tokenInterface); + public static Map getMap(AbstractToken abstractToken, TokenService tokenService){ + AbstractToken student = ToolUtils.deepCopy(abstractToken); Map map = new HashMap<>(); //生成token String token = tokenService.getToken(student); map.put("token",token); - map.put("member", getTokenInterfaceInfo(tokenInterface.getId())); + map.put("member", getTokenInterfaceInfo(abstractToken.getId())); return map; } - public String getToken(TokenInterface tokenInterface) { + public String getToken(AbstractToken abstractToken) { String token=""; token= JWT.create() - .withAudience(tokenInterface.getId()) - .withClaim(tokenInterface.getId(), tokenInterface.getIdentity().getAttributeName()) - .sign(Algorithm.HMAC256((tokenInterface.getAddTime().getTime()) + "")); + .withAudience(abstractToken.getId()) + .withClaim(abstractToken.getId(), abstractToken.getIdentity().getAttributeName()) + .sign(Algorithm.HMAC256((abstractToken.getAddTime().getTime()) + "")); //加时间戳区分登陆不同设备的同一个账户 token = token+"."+System.currentTimeMillis(); @@ -131,19 +131,19 @@ public class TokenService { j.printStackTrace(); return null; } - TokenInterface tokenInterface = null; + AbstractToken abstractToken = null; try{ - tokenInterface = ToolUtils.deepCopy(tokenMap.get(Long.parseLong(id))); + abstractToken = ToolUtils.deepCopy(tokenMap.get(Long.parseLong(id))); }catch (Exception e){} // 验证 token - JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256((tokenInterface.getAddTime().getTime())+"")).build(); + JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256((abstractToken.getAddTime().getTime())+"")).build(); try { jwtVerifier.verify(token); } catch (JWTVerificationException e) { return null; } - Object[] o = {tokenInterface , null}; + Object[] o = {abstractToken, null}; return o; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TokenInterface.java b/web/src/main/java/com/ibeetl/jlw/entity/AbstractToken.java similarity index 91% rename from web/src/main/java/com/ibeetl/jlw/entity/TokenInterface.java rename to web/src/main/java/com/ibeetl/jlw/entity/AbstractToken.java index 3606b4be..9db14c8e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TokenInterface.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/AbstractToken.java @@ -9,7 +9,7 @@ import java.util.Date; * * @author mlx */ -public interface TokenInterface { +public interface AbstractToken { /** * 主键ID diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Student.java b/web/src/main/java/com/ibeetl/jlw/entity/Student.java index 267499b1..66854b73 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Student.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Student.java @@ -20,7 +20,7 @@ import java.util.Date; * gen by Spring Boot2 Admin 2021-06-19 */ @Fetch -public class Student extends BaseEntity implements TokenInterface { +public class Student extends BaseEntity implements AbstractToken { //ID @NotNull(message = "请选择需要修改的学生", groups =ValidateConfig.UPDATE.class) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java index 8f552629..deadba6f 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java @@ -14,7 +14,7 @@ import java.util.Date; * 教师管理 * gen by Spring Boot2 Admin 2021-06-19 */ -public class Teacher extends BaseEntity implements TokenInterface{ +public class Teacher extends BaseEntity implements AbstractToken { //ID @NotNull(message = "请选择需要修改的教师", groups =ValidateConfig.UPDATE.class)