Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-04 736b58a43b0afb40745f885f400ef97d070f46a9

 febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/FebsUtil.java

@@ -284,6 +284,12 @@
        }
    }

    public static String getUserId(){
        return Optional.ofNullable(getCurrentUser())
                .map(u -> u.getUserId().toString())
                .orElse("1");
    }

    /**
     * 获取当前用户名称
     *