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

疯狂的狮子li

2021-12-28 948ad860498cc6c482ee492611b3394f7e661741

 pom.xml

@@ -6,15 +6,15 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-vue-plus</artifactId>
    <version>3.4.0</version>
    <version>3.5.0</version>

    <name>RuoYi-Vue-Plus</name>
    <url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url>
    <description>RuoYi-Vue-Plus后台管理系统</description>

    <properties>
        <ruoyi-vue-plus.version>3.4.0</ruoyi-vue-plus.version>
        <spring-boot.version>2.5.7</spring-boot.version>
        <ruoyi-vue-plus.version>3.5.0</ruoyi-vue-plus.version>
        <spring-boot.version>2.5.8</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
@@ -26,12 +26,13 @@
        <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.16</hutool.version>
        <hutool.version>5.7.18</hutool.version>
        <okhttp.version>4.9.2</okhttp.version>
        <spring-boot-admin.version>2.5.4</spring-boot-admin.version>
        <redisson.version>3.16.6</redisson.version>
        <spring-boot-admin.version>2.5.5</spring-boot-admin.version>
        <redisson.version>3.16.7</redisson.version>
        <lock4j.version>2.2.1</lock4j.version>
        <dynamic-ds.version>3.5.0</dynamic-ds.version>
        <tlog.version>1.3.6</tlog.version>
@@ -41,10 +42,10 @@
        <jaxb.version>3.0.1</jaxb.version>

        <!-- OSS 配置 -->
        <qiniu.version>7.8.0</qiniu.version>
        <qiniu.version>7.9.0</qiniu.version>
        <aliyun.oss.version>3.13.1</aliyun.oss.version>
        <qcloud.cos.version>5.6.58</qcloud.cos.version>
        <minio.version>8.3.3</minio.version>
        <minio.version>8.3.4</minio.version>

        <!-- docker 配置 -->
        <docker.registry.url>localhost</docker.registry.url>
@@ -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>