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

疯狂的狮子li

2022-02-21 ea7ea2ec59a50db2fec8228efc81a63afd8283de

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

@@ -42,7 +42,7 @@
            UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
            String ip = ServletUtils.getClientIP();
            LoginUser user = LoginHelper.getLoginUser();
            String tokenValue = StpUtil.getTokenValue();
            String tokenValue = StpUtil.getTokenValueByLoginId(loginId);
            UserOnlineDTO dto = new UserOnlineDTO();
            dto.setIpaddr(ip);
            dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));