update springboot-admin 2.6.6 => 2.6.7 update springboot-mybatis 2.2.0 => 2...

疯狂的狮子li

2022-05-10 80d1e28d0f5b643a753a2989dbba4e123b9ad87d

update springboot-admin 2.6.6 => 2.6.7
update springboot-mybatis 2.2.0 => 2.2.2
update sa-token 1.29.0 => 1.30.0
update hutool 5.7.22 => 5.8.0
update druid 1.2.8 => 1.2.9
update tlog 1.3.6 => 1.4.0

 pom.xml

@@ -19,24 +19,24 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
        <spring-boot.mybatis>2.2.0</spring-boot.mybatis>
        <druid.version>1.2.8</druid.version>
        <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
        <druid.version>1.2.9</druid.version>
        <knife4j.version>3.0.3</knife4j.version>
        <swagger-annotations.version>1.5.22</swagger-annotations.version>
        <poi.version>4.1.2</poi.version>
        <commons-compress.version>1.21</commons-compress.version>
        <easyexcel.version>3.0.5</easyexcel.version>
        <velocity.version>2.3</velocity.version>
        <satoken.version>1.29.0</satoken.version>
        <satoken.version>1.30.0</satoken.version>
        <mybatis-plus.version>3.5.1</mybatis-plus.version>
        <p6spy.version>3.9.1</p6spy.version>
        <hutool.version>5.7.22</hutool.version>
        <hutool.version>5.8.0</hutool.version>
        <okhttp.version>4.9.3</okhttp.version>
        <spring-boot-admin.version>2.6.6</spring-boot-admin.version>
        <spring-boot-admin.version>2.6.7</spring-boot-admin.version>
        <redisson.version>3.17.0</redisson.version>
        <lock4j.version>2.2.1</lock4j.version>
        <dynamic-ds.version>3.5.1</dynamic-ds.version>
        <tlog.version>1.3.6</tlog.version>
        <tlog.version>1.4.0</tlog.version>
        <xxl-job.version>2.3.0</xxl-job.version>

        <!-- jdk11 缺失依赖 jaxb-->

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java

@@ -2,7 +2,7 @@

import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
import cn.dev33.satoken.interceptor.SaRouteInterceptor;
import cn.dev33.satoken.jwt.StpLogicJwtForStyle;
import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
import cn.dev33.satoken.router.SaRouter;
import cn.dev33.satoken.stp.StpLogic;
import cn.dev33.satoken.stp.StpUtil;
@@ -67,8 +67,8 @@

    @Bean
    public StpLogic getStpLogicJwt() {
        // Sa-Token 整合 jwt (Style模式)
        return new StpLogicJwtForStyle();
        // Sa-Token 整合 jwt (简单模式)
        return new StpLogicJwtForSimple();
    }

}

 ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java

@@ -3,7 +3,6 @@
import cn.dev33.satoken.config.SaTokenConfig;
import cn.dev33.satoken.listener.SaTokenListener;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
import com.ruoyi.common.constant.Constants;
@@ -36,13 +35,12 @@
     * 每次登录时触发
     */
    @Override
    public void doLogin(String loginType, Object loginId, SaLoginModel loginModel) {
    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) {
        UserType userType = UserType.getUserType(loginId.toString());
        if (userType == UserType.SYS_USER) {
            UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
            String ip = ServletUtils.getClientIP();
            LoginUser user = LoginHelper.getLoginUser();
            String tokenValue = StpUtil.getTokenValueByLoginId(loginId);
            UserOnlineDTO dto = new UserOnlineDTO();
            dto.setIpaddr(ip);
            dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));