From 0dea21079fb334b71af9f251b1efd8dac1e6adc7 Mon Sep 17 00:00:00 2001
From: Github_lizhw <171332584@qq.com>
Date: Sun, 10 Nov 2024 13:41:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .run/ruoyi-server.run.xml                                     | 2 +-
 .../SysUserOnline.java => model/SysSaasUserOnlineDTO.java}    | 4 ++--
 .../org/ruoyi/sso/server/listener/UserActionListener.java     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/{domain/SysUserOnline.java => model/SysSaasUserOnlineDTO.java} (90%)

diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml
index 541800ddc..715389de5 100644
--- a/.run/ruoyi-server.run.xml
+++ b/.run/ruoyi-server.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="演示机">
+  <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
         <option name="imageTag" value="ruoyi/ruoyi-server:5.2.2" />
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/SysSaasUserOnlineDTO.java
similarity index 90%
rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java
rename to ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/SysSaasUserOnlineDTO.java
index 25c985ad6..376a3d003 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/SysSaasUserOnlineDTO.java
@@ -1,4 +1,4 @@
-package org.dromara.system.api.domain;
+package org.dromara.system.api.model;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,7 +13,7 @@ import java.io.Serializable;
  */
 @Data
 @NoArgsConstructor
-public class SysUserOnline implements Serializable {
+public class SysSaasUserOnlineDTO implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java
index 03d4aff26..51f3737f3 100644
--- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java
+++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java
@@ -7,6 +7,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
+import org.dromara.system.api.model.SysSaasUserOnlineDTO;
 import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -21,7 +22,6 @@ import org.dromara.common.log.event.LogininforEvent;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.system.api.RemoteUserService;
-import org.dromara.system.api.domain.SysUserOnline;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
@@ -49,7 +49,7 @@ public class UserActionListener implements SaTokenListener {
     public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) {
         UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
         String ip = ServletUtils.getClientIP();
-        SysUserOnline userOnline = new SysUserOnline();
+        SysSaasUserOnlineDTO userOnline = new SysSaasUserOnlineDTO();
         userOnline.setIpaddr(ip);
         userOnline.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
         userOnline.setBrowser(userAgent.getBrowser().getName());