强制退出功能

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml

@@ -344,6 +344,26 @@
             <param name="id"></param>
             <returns></returns>
         </member>
+        <member name="T:Yi.Framework.ApiMicroservice.Controllers.OnlineController">
+            <summary>
+            在线管理
+            </summary>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.OnlineController.PageList(Yi.Framework.WebCore.SignalRHub.OnlineUser,Yi.Framework.Common.Models.PageParModel)">
+            <summary>
+            动态条件获取当前在线用户
+            </summary>
+            <param name="online"></param>
+            <param name="page"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.OnlineController.ForceOut(System.String)">
+            <summary>
+            强制退出用户
+            </summary>
+            <param name="connnectionId"></param>
+            <returns></returns>
+        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.OperationLogController.PageList(Yi.Framework.Model.Models.OperationLogEntity,Yi.Framework.Common.Models.PageParModel)">
             <summary>
             动态条件分页查询

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/OnlineController.cs

@@ -0,0 +1,84 @@
+using Hei.Captcha;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Const;
+using Yi.Framework.Common.Enum;
+using Yi.Framework.Common.Helper;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Core;
+using Yi.Framework.DTOModel;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+using Yi.Framework.WebCore;
+using Yi.Framework.WebCore.AttributeExtend;
+using Yi.Framework.WebCore.AuthorizationPolicy;
+using Yi.Framework.WebCore.SignalRHub;
+
+namespace Yi.Framework.ApiMicroservice.Controllers
+{
+    /// <summary>
+    /// 在线管理
+    /// </summary>
+    [ApiController]
+    [Authorize]
+    [Route("api/[controller]/[action]")]
+    public class OnlineController : ControllerBase
+    {
+        private ILogger<OnlineController> _logger;
+        private IHubContext<MainHub> _hub;
+        public OnlineController(ILogger<OnlineController> logger, IHubContext<MainHub> hub)
+        {
+            _logger = logger;
+            _hub = hub;
+        }
+
+        /// <summary>
+        /// 动态条件获取当前在线用户
+        /// </summary>
+        /// <param name="online"></param>
+        /// <param name="page"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Result PageList([FromQuery] OnlineUser online, [FromQuery] PageParModel page)
+        {
+            var data = MainHub.clientUsers;
+            IEnumerable<OnlineUser> dataWhere = data.AsEnumerable();
+
+            if (!string.IsNullOrEmpty(online.Ipaddr))
+            {
+                dataWhere = dataWhere.Where((u) => u.Ipaddr.Contains(online.Ipaddr));
+            }
+            if (!string.IsNullOrEmpty(online.UserName))
+            {
+                dataWhere = dataWhere.Where((u) => u.UserName.Contains(online.UserName));
+            }
+            return Result.Success().SetData(new PageModel<List<OnlineUser>>() { Total = data.Count, Data = dataWhere.ToList() });
+        }
+
+
+        /// <summary>
+        /// 强制退出用户
+        /// </summary>
+        /// <param name="connnectionId"></param>
+        /// <returns></returns>
+        [HttpDelete]
+        [Route("{connnectionId}")]
+        public async Task<Result> ForceOut(string connnectionId)
+        {
+            if (MainHub.clientUsers.Exists(u => u.ConnnectionId == connnectionId))
+            {
+                //前端接受到这个事件后，触发前端自动退出
+                await _hub.Clients.Client(connnectionId).SendAsync(HubTypeEnum.forceOut.ToString(),"你已被强制退出！");
+                return Result.Success(); 
+            }
+            return Result.Error("操作失败！未发现该连接！");
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/SignalrController.cs

@@ -1,211 +0,0 @@
-using Hei.Captcha;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Yi.Framework.Common.Const;
-using Yi.Framework.Common.Enum;
-using Yi.Framework.Common.Helper;
-using Yi.Framework.Common.Models;
-using Yi.Framework.Core;
-using Yi.Framework.DTOModel;
-using Yi.Framework.Interface;
-using Yi.Framework.Model.Models;
-using Yi.Framework.Repository;
-using Yi.Framework.WebCore;
-using Yi.Framework.WebCore.AttributeExtend;
-using Yi.Framework.WebCore.AuthorizationPolicy;
-
-namespace Yi.Framework.ApiMicroservice.Controllers
-{
-    /// <summary>
-    /// 账户管理
-    /// </summary>
-    [ApiController]
-    [Authorize]
-    [Route("api/[controller]/[action]")]
-    public class AccountController : ControllerBase
-    {
-        private IUserService _iUserService;
-        private JwtInvoker _jwtInvoker;
-        private ILogger _logger;
-        private SecurityCodeHelper _securityCode;
-        private IRepository<UserEntity> _repository;
-        public AccountController(ILogger<UserEntity> logger, IUserService iUserService, JwtInvoker jwtInvoker, SecurityCodeHelper securityCode)
-        {
-            _iUserService = iUserService;
-            _jwtInvoker = jwtInvoker;
-            _logger = logger;
-            _securityCode = securityCode;
-            _repository = iUserService._repository;
-        }
-
-        /// <summary>
-        ///  重置管理员CC的密码
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        [AllowAnonymous]
-        public async Task<Result> RestCC()
-        {
-            var user = await _iUserService._repository.GetFirstAsync(u => u.UserName == "cc");
-            user.Password = "123456";
-            user.BuildPassword();
-            await _iUserService._repository.UpdateIgnoreNullAsync(user);
-            return Result.Success();
-        }
-
-        /// <summary>
-        /// 没啥说，登录
-        /// </summary>
-        /// <param name="loginDto"></param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        [HttpPost]
-        public async Task<Result> Login(LoginDto loginDto)
-        {
-            //跳过，需要redis缓存获取uuid与code的关系，进行比较即可
-            //先效验验证码和UUID
-            //登录还需要进行登录日志的落库
-
-            var loginInfo = HttpContext.GetLoginLogInfo();
-            loginInfo.LoginUser = loginDto.UserName;
-            loginInfo.LogMsg = "登录成功！";
-            var loginLogRepository = _repository.ChangeRepository<Repository<LoginLogEntity>>();
-            UserEntity user = new();
-            if (await _iUserService.Login(loginDto.UserName, loginDto.Password, o => user = o))
-            {
-                var userRoleMenu = await _iUserService.GetUserAllInfo(user.Id);
-                await loginLogRepository.InsertReturnSnowflakeIdAsync(loginInfo);
-                return Result.Success(loginInfo.LogMsg).SetData(new { token = _jwtInvoker.GetAccessToken(userRoleMenu.User, userRoleMenu.Menus) });
-            }
-            loginInfo.LogMsg = "登录失败！用户名或者密码错误！";
-            await loginLogRepository.InsertReturnSnowflakeIdAsync(loginInfo);
-            return Result.Error(loginInfo.LogMsg);
-        }
-
-
-
-        /// <summary>
-        /// 没啥说，注册
-        /// </summary>
-        /// <param name="registerDto"></param>
-        /// <returns></returns>
-        [AllowAnonymous]
-        [HttpPost]
-        public async Task<Result> Register(RegisterDto registerDto)
-        {
-            UserEntity user = new();
-            if (await _iUserService.Register(WebCore.Mapper.MapperHelper.Map<UserEntity, RegisterDto>(registerDto), o => user = o))
-            {
-                return Result.Success("注册成功！").SetData(user);
-            }
-            return Result.SuccessError("注册失败！用户名已存在！");
-        }
-
-        /// <summary>
-        /// 没啥说，登出
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        [AllowAnonymous]
-        public Result Logout()
-        {
-            return Result.Success("安全登出成功！");
-        }
-
-        /// <summary>
-        /// 通过已登录的用户获取用户信息
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        //[Authorize]
-        public async Task<Result> GetUserAllInfo()
-        {
-            //通过鉴权jwt获取到用户的id
-            var userId = HttpContext.GetUserIdInfo();
-            var data = await _iUserService.GetUserAllInfo(userId);
-            //系统用户数据被重置，老前端访问重新授权
-            if (data is null)
-            {
-                return Result.UnAuthorize();
-            }
-
-            data.Menus.Clear();
-            return Result.Success().SetData(data);
-        }
-
-        /// <summary>
-        /// 获取当前登录用户的前端路由
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public async Task<Result> GetRouterInfo()
-        {
-            var userId = HttpContext.GetUserIdInfo();
-            var data = await _iUserService.GetUserAllInfo(userId);
-            var menus = data.Menus.ToList();
-
-            //为超级管理员直接给全部路由
-            if (SystemConst.Admin.Equals(data.User.UserName))
-            {
-                menus = await _iUserService._repository.ChangeRepository<Repository<MenuEntity>>().GetListAsync();
-            }
-            //将后端菜单转换成前端路由，组件级别需要过滤
-            List<VueRouterModel> routers = MenuEntity.RouterBuild(menus);
-            return Result.Success().SetData(routers);
-        }
-
-        /// <summary>
-        /// 更新已登录用户的用户信息
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        [HttpPut]
-        public async Task<Result> UpdateUserByHttp(UserEntity user)
-        {
-            //当然，密码是不能给他修改的
-            user.Password = null;
-            user.Salt = null;
-
-            //修改需要赋值上主键哦
-            user.Id = HttpContext.GetUserIdInfo();
-            return Result.Success().SetStatus(await _iUserService._repository.UpdateIgnoreNullAsync(user));
-        }
-
-        /// <summary>
-        /// 自己更新密码
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPut]
-        public async Task<Result> UpdatePassword(UpdatePasswordDto dto)
-        {
-            long userId = HttpContext.GetUserIdInfo();
-
-            if (await _iUserService.UpdatePassword(dto, userId))
-            {
-                return Result.Success();
-            }
-            return Result.Error("更新失败！");
-        }
-
-        /// <summary>
-        /// 验证码
-        /// </summary>
-        /// <returns></returns>
-        [AllowAnonymous]
-        [HttpGet]
-        public Result CaptchaImage()
-        {
-            var uuid = Guid.NewGuid();
-            var code = _securityCode.GetRandomEnDigitalText(4);
-            //将uuid与code，Redis缓存中心化保存起来，登录根据uuid比对即可
-            var imgbyte = _securityCode.GetEnDigitalCodeByte(code);
-            return Result.Success().SetData(new { uuid = uuid, img = imgbyte });
-        }
-    }
-}

Yi.Framework.Net6/Yi.Framework.Common/Enum/HubTypeEnum.cs

@@ -8,7 +8,14 @@ namespace Yi.Framework.Common.Enum
 {
     public enum HubTypeEnum
     {
+       /// <summary>
+       /// 在线总数
+       /// </summary>
         onlineNum,
 
+        /// <summary>
+        /// 强制退出
+        /// </summary>
+        forceOut
     }
 }

Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs

@@ -45,6 +45,29 @@ namespace Yi.Framework.Model.SeedData
             };
             Entitys.Add(monitoring);
 
+
+            //在线用户
+            MenuEntity online = new MenuEntity()
+            {
+                Id = SnowFlakeSingle.Instance.NextId(),
+                MenuName = "在线用户",
+                PermissionCode = "monitor:online:list",
+                MenuType = MenuTypeEnum.Menu.GetHashCode(),
+                Router = "online",
+                IsShow = true,
+                IsLink = false,
+                IsCache = true,
+                Component = "monitor/online/index",
+                MenuIcon = "online",
+                OrderNum = 100,
+                ParentId = monitoring.Id,
+                IsDeleted = false
+            };
+            Entitys.Add(online);
+
+
+
+
             //系统工具
             MenuEntity tool = new MenuEntity()
             {

Yi.Framework.Net6/Yi.Framework.WebCore/SignalRHub/MainHub.cs

@@ -13,6 +13,9 @@ namespace Yi.Framework.WebCore.SignalRHub
 {
     public class MainHub : Hub
     {
+        public static readonly List<OnlineUser> clientUsers = new();
+
+
         private HttpContext _httpContext;
         private ILogger<MainHub> _logger;
         public MainHub(IHttpContextAccessor httpContextAccessor,ILogger<MainHub> logger)
@@ -21,7 +24,7 @@ namespace Yi.Framework.WebCore.SignalRHub
             _logger = logger;
         }
 
-        private static readonly List<OnlineUser> clientUsers = new();
+     
 
         /// <summary>
         /// 成功连接
@@ -30,17 +33,19 @@ namespace Yi.Framework.WebCore.SignalRHub
         public override Task OnConnectedAsync()
         {
             var name = _httpContext.GetUserNameInfo();
-            var ip = _httpContext.GetClientIp();
+            var loginUser = _httpContext.GetLoginLogInfo();
-            var ip_info = IpTool.Search(ip);
-
-            var loginUser = _httpContext.GetUserEntityInfo(out _);
             var user = clientUsers.Any(u => u.ConnnectionId == Context.ConnectionId);
             //判断用户是否存在，否则添加集合
             if (!user && Context.User.Identity.IsAuthenticated)
             {
-                OnlineUser users = new(Context.ConnectionId, name, loginUser.Id, ip)
+                OnlineUser users = new(Context.ConnectionId)
                 {
-                    Location = ip_info.City
+                    Browser= loginUser.Browser,
+                    LoginLocation = loginUser.LoginLocation,
+                    Ipaddr= loginUser.LoginIp,
+                    LoginTime=DateTime.Now,
+                    Os=loginUser.Os,
+                    UserName= name
                 };
                 clientUsers.Add(users);
                 _logger.LogInformation($"{DateTime.Now}：{name},{Context.ConnectionId}连接服务端success，当前已连接{clientUsers.Count}个");
@@ -67,7 +72,7 @@ namespace Yi.Framework.WebCore.SignalRHub
                 clientUsers.Remove(user);
                 Clients.All.SendAsync(HubTypeEnum.onlineNum.ToString(), clientUsers.Count);
                 //Clients.All.SendAsync(HubsConstant.OnlineUser, clientUsers);
-                _logger.LogInformation($"用户{user?.Name}离开了，当前已连接{clientUsers.Count}个");
+                _logger.LogInformation($"用户{user?.UserName}离开了，当前已连接{clientUsers.Count}个");
             }
             return base.OnDisconnectedAsync(exception);
         }

Yi.Framework.Net6/Yi.Framework.WebCore/SignalRHub/OnlineUser.cs

@@ -6,26 +6,32 @@ namespace Yi.Framework.WebCore.SignalRHub
 {
     public class OnlineUser
     {
+
+        public OnlineUser()
+        {
+          
+        }
+        public OnlineUser(string connnectionId)
+        {
+            this.ConnnectionId = connnectionId;
+        }
+
         /// <summary>
         /// 客户端连接Id
         /// </summary>
-        public string ConnnectionId { get; set; }
+        public string ConnnectionId { get; }
         /// <summary>
         /// 用户id
         /// </summary>
-        public long? Userid { get; set; }
+        public long? UserId { get; set; }
-        public string Name { get; set; }
+        public string UserName { get; set; }
         public DateTime LoginTime { get; set; }
-        public string UserIP { get; set; }
+        public string Ipaddr { get; set; }
-        public string Location { get; set; }
+        public string LoginLocation { get; set; }
+
+        public string Os { get; set; }
+        public string Browser { get; set; }
+
 
-        public OnlineUser(string clientid, string name, long? userid, string userip)
-        {
-            ConnnectionId = clientid;
-            Name = name;
-            LoginTime = DateTime.Now;
-            Userid = userid;
-            UserIP = userip;
-        }
     }
 }

Yi.Vue3.X.RuoYi/src/App.vue

@@ -5,6 +5,11 @@
 <script setup>
 import useSettingsStore from '@/store/modules/settings'
 import { handleThemeStyle } from '@/utils/theme'
+import useUserStore from '@/store/modules/user'
+import { storeToRefs } from 'pinia';
+import signalR from '@/utils/signalR'
+
+const {token}=storeToRefs(useUserStore());
 
 onMounted(() => {
   nextTick(() => {
@@ -13,5 +18,12 @@ onMounted(() => {
   })
 })
 
+
 //这里还需要监视token的变化，重新进行signalr连接
+watch(()=>token.value,async (newValue,oldValue)=>{
+  console.log("重新连接");
+  await signalR.close();
+  await signalR.start();
+})
+
 </script>

Yi.Vue3.X.RuoYi/src/api/monitor/online.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询在线用户列表
 export function list(query) {
   return request({
-    url: '/monitor/online/list',
+    url: '/online/pageList',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function list(query) {
 // 强退用户
 export function forceLogout(tokenId) {
   return request({
-    url: '/monitor/online/' + tokenId,
+    url: '/online/ForceOut/' + tokenId,
     method: 'delete'
   })
 }

Yi.Vue3.X.RuoYi/src/utils/signalR.js

@@ -2,7 +2,8 @@
 import * as signalR from '@microsoft/signalr'
 import useSocketStore from '@/store/modules/socket'
 import { getToken } from '@/utils/auth'
-
+import useUserStore from '@/store/modules/user'
+import { ElMessage } from 'element-plus'
 
 export default {
   // signalR对象
@@ -36,6 +37,12 @@ export default {
    * 调用 this.signalR.start().then(async () => { await this.SR.invoke("method")})
    * @returns 
    */
+async close(){
+  var that = this;
+  await this.SR.stop();
+},
+
+
   async start() {
     var that = this;
 
@@ -62,6 +69,12 @@ export default {
       const socketStore = useSocketStore();
       socketStore.setOnlineNum(data)
     });
+    connection.on("forceOut", (msg) => {
+      useUserStore().logOut().then(() => {
+        ElMessage.error(msg);
+        location.href = '/index';
+      })
+    });
     // connection.on("onlineNum", (data) => {
     //   store.dispatch("socket/changeOnlineNum", data);
     // });

Yi.Vue3.X.RuoYi/src/views/monitor/online/index.vue

@@ -1,10 +1,10 @@
 <template>
    <div class="app-container">
       <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
-         <el-form-item label="登录地址" prop="ipaddr">
+         <el-form-item label="登录ip" prop="ipaddr">
             <el-input
                v-model="queryParams.ipaddr"
-               placeholder="请输入登录地址"
+               placeholder="请输入登录ip"
                clearable
                @keyup.enter="handleQuery"
             />
@@ -24,17 +24,16 @@
       </el-form>
       <el-table
          v-loading="loading"
-         :data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+         :data="onlineList.slice((queryParams.pageNum - 1) * queryParams.pageSize, queryParams.pageNum * queryParams.pageSize)"
          style="width: 100%;"
       >
          <el-table-column label="序号" width="50" type="index" align="center">
             <template #default="scope">
-               <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
+               <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
+         <el-table-column label="会话编号" align="center" prop="connnectionId" :show-overflow-tooltip="true" />
          <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
-         <el-table-column label="所属部门" align="center" prop="deptName" :show-overflow-tooltip="true" />
          <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
          <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
          <el-table-column label="操作系统" align="center" prop="os" :show-overflow-tooltip="true" />
@@ -56,7 +55,7 @@
          </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" />
    </div>
 </template>
 
@@ -68,10 +67,12 @@ const { proxy } = getCurrentInstance();
 const onlineList = ref([]);
 const loading = ref(true);
 const total = ref(0);
-const pageNum = ref(1);
+// const pageNum = ref(1);
-const pageSize = ref(10);
+// const pageSize = ref(10);
 
 const queryParams = ref({
+   pageNum: 1,
+    pageSize: 10,
   ipaddr: undefined,
   userName: undefined
 });
@@ -80,14 +81,14 @@ const queryParams = ref({
 function getList() {
   loading.value = true;
   initData(queryParams.value).then(response => {
-    onlineList.value = response.rows;
+    onlineList.value = response.data.data;
-    total.value = response.total;
+    total.value = response.data.total;
     loading.value = false;
   });
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-  pageNum.value = 1;
+   queryParams.value.pageNum = 1;
   getList();
 }
 /** 重置按钮操作 */
@@ -98,7 +99,7 @@ function resetQuery() {
 /** 强退按钮操作 */
 function handleForceLogout(row) {
     proxy.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(function () {
-  return forceLogout(row.tokenId);
+  return forceLogout(row.connnectionId);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");