Merge remote-tracking branch 'origin/master'

648540858

2024-03-13 f7e5fff44623eb0a01b1bc0f9a2e98d329e61a37

 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) {