Merge branch 'master' into dev/zlm

648540858

2024-04-09 b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347

 src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java

@@ -28,7 +28,7 @@

    private static final Logger logger = LoggerFactory.getLogger(JwtUtils.class);

    private static final String HEADER = "access-token";
    public static final String HEADER = "access-token";

    private static final String AUDIENCE = "Audience";

@@ -144,6 +144,7 @@
            jwtUser.setUserName(username);
            jwtUser.setPassword(user.getPassword());
            jwtUser.setRoleId(user.getRole().getId());
            jwtUser.setUserId(user.getId());

            return jwtUser;
        } catch (InvalidJwtException e) {