pengchaozhi преди 2 месеца
родител
ревизия
2ce5c488bc

+ 1 - 0
projects-service/src/main/java/com/rtrh/projects/modules/account/mapper/SecUserMapper.java

@@ -18,6 +18,7 @@ public interface SecUserMapper {
             "is_unit as isUnit,\n" +
             "login,\n" +
             "kind,\n" +
+            "other_kind as otherKind,\n" +
             "unit_id as unitId,\n" +
             "depart_id as departId,\n" +
             "remark,\n" +

+ 1 - 2
projects/src/main/java/com/rtrh/projects/outapi/base/JwtUtils.java

@@ -130,7 +130,6 @@ public class JwtUtils {
      * @return 返回是否校验通过
      * @throws UserNotLoginException
      */
-    @Transactional
     public boolean verifyToken() throws UserNotLoginException, UserDisableException {
     	 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
          String token = request.getHeader("token");
@@ -161,7 +160,7 @@ public class JwtUtils {
             JWTVerifier verifier = JWT.require(algorithm)
             		.withClaim(SESSION_ID_NAME, jwtId)
             		.withClaim(LOGIN_ID, user.getId())
-            		.withClaim(USER_INFO, JSONUtil.toJsonStr(vo))
+//            		.withClaim(USER_INFO, JSONUtil.toJsonStr(vo))
         			.withClaim(UNIT_ID, user.getUnitId())
                     .acceptExpiresAt(System.currentTimeMillis() + EXPIRE_TIME * 1000)  //JWT 正确的配置续期姿势
                     .build();