Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-18 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f

 server/services/src/main/java/com/doumee/core/Jwt/JwtTokenUtil.java

@@ -126,7 +126,7 @@
    /**
     * 生成token,根据userId和过期时间
     */
    public static String generateToken(Integer userId, Date exppiredDate, Map<String, Object> claims) {
    public static String generateToken(String userId, Date exppiredDate, Map<String, Object> claims) {

        final Date createdDate = new Date();
        String secret = getJwtSecret();