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

疯狂的狮子li

2021-12-28 948ad860498cc6c482ee492611b3394f7e661741

 pom.xml

@@ -26,6 +26,7 @@
        <easyexcel.version>2.2.11</easyexcel.version>
        <cglib.version>3.3.0</cglib.version>
        <velocity.version>2.3</velocity.version>
        <satoken.version>1.28.0</satoken.version>
        <mybatis-plus.version>3.4.3.4</mybatis-plus.version>
        <p6spy.version>3.9.1</p6spy.version>
        <hutool.version>5.7.18</hutool.version>
@@ -128,6 +129,19 @@
                <version>${velocity.version}</version>
            </dependency>

            <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
            <dependency>
                <groupId>cn.dev33</groupId>
                <artifactId>sa-token-spring-boot-starter</artifactId>
                <version>${satoken.version}</version>
            </dependency>
            <!-- Sa-Token 整合 jwt -->
            <dependency>
                <groupId>cn.dev33</groupId>
                <artifactId>sa-token-jwt</artifactId>
                <version>${satoken.version}</version>
            </dependency>

            <!-- jdk11 缺失依赖 jaxb-->
            <dependency>
                <groupId>com.sun.xml.bind</groupId>