Compare commits
No commits in common. "nugetmanager" and "master" have entirely different histories.
nugetmanag
...
master
@ -3,15 +3,11 @@ using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using HHWMS.Web.Support;
|
||||
using HHWMS.Web.ViewModels.HomeVMs;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.DataProtection;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
@ -157,18 +153,6 @@ namespace HHWMS.Web.Controllers
|
||||
return JsonMore("No Data");
|
||||
}
|
||||
|
||||
[Public]
|
||||
public IActionResult CheckLogin()
|
||||
{
|
||||
return Ok();
|
||||
}
|
||||
|
||||
[Public]
|
||||
public IActionResult BeforeLogin(LoginVM vm)
|
||||
{
|
||||
return JsonMore(UserSessionManager.AllSignined().ToList());
|
||||
}
|
||||
|
||||
//[AllowAnonymous]
|
||||
//public github GetGithubInfo()
|
||||
//{
|
||||
|
||||
@ -14,11 +14,6 @@ using WalkingTec.Mvvm.Mvc.Admin.ViewModels.FrameworkUserVms;
|
||||
using HHWMS.Web.ViewModels.HomeVMs;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using HHWMS.Web.Support;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using Microsoft.Extensions.Caching.Distributed;
|
||||
using WalkingTec.Mvvm.Core.Support.Quartz;
|
||||
|
||||
namespace HHWMS.Web.Controllers
|
||||
{
|
||||
@ -38,7 +33,7 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
return View(vm);
|
||||
}
|
||||
|
||||
|
||||
[Public]
|
||||
[HttpPost]
|
||||
public async Task<ActionResult> Login(LoginVM vm)
|
||||
@ -52,9 +47,7 @@ namespace HHWMS.Web.Controllers
|
||||
return View(vm);
|
||||
}
|
||||
}*/
|
||||
|
||||
var user = Wtm.DoLogin(vm.ITCode, vm.Password, vm.Tenant);
|
||||
|
||||
if (user == null)
|
||||
{
|
||||
vm.MSD.AddModelError("", Localizer["Sys.LoginFailed"]);
|
||||
@ -62,13 +55,6 @@ namespace HHWMS.Web.Controllers
|
||||
}
|
||||
else
|
||||
{
|
||||
var bb = UserSessionManager.IsUserSignined(user.Name);
|
||||
if (bb)
|
||||
{
|
||||
// 踢人下线
|
||||
await KickUser(user.Name);
|
||||
}
|
||||
|
||||
//其他属性可以通过user.Attributes["aaa"] = "bbb"方式赋值
|
||||
Wtm.LoginUserInfo = user;
|
||||
string url = string.Empty;
|
||||
@ -91,9 +77,7 @@ namespace HHWMS.Web.Controllers
|
||||
};
|
||||
}
|
||||
var principal = user.CreatePrincipal();
|
||||
|
||||
await HttpContext.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, principal, properties);
|
||||
UserSessionManager.AddUserSession(user.Name,principal.Claims.First(c => c.Type == "SessionId").Value);
|
||||
return Redirect(HttpUtility.UrlDecode(url));
|
||||
}
|
||||
}
|
||||
@ -136,7 +120,6 @@ namespace HHWMS.Web.Controllers
|
||||
[ActionDescription("Logout")]
|
||||
public async Task Logout()
|
||||
{
|
||||
UserSessionManager.RemoveUserSession(Wtm.LoginUserInfo.Name);
|
||||
HttpContext.Session.Clear();
|
||||
await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
if (ConfigInfo.HasMainHost == false || Wtm.LoginUserInfo?.CurrentTenant != null)
|
||||
@ -149,15 +132,7 @@ namespace HHWMS.Web.Controllers
|
||||
HttpContext.Response.Redirect(ConfigInfo.MainHost);
|
||||
}
|
||||
}
|
||||
|
||||
[AllRights]
|
||||
public async Task<IActionResult> KickUser(string ITcode)
|
||||
{
|
||||
UserSessionManager.KickUser(ITcode);
|
||||
await HttpContext.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
return Ok();
|
||||
}
|
||||
|
||||
|
||||
[AllRights]
|
||||
[ActionDescription("ChangePassword")]
|
||||
public ActionResult ChangePassword()
|
||||
|
||||
@ -76,7 +76,6 @@ app.UseSession();
|
||||
app.UseWtmSwagger(false);
|
||||
app.UseSwaggerExt();
|
||||
app.UseWtm();
|
||||
app.UseMiddleware<SessionValidationMiddleware>();
|
||||
app.AddQuartzJobs();
|
||||
|
||||
app.UseEndpoints(endpoints => {
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
using WalkingTec.Mvvm.Core.Support.Quartz;
|
||||
|
||||
namespace HHWMS.Web.Support;
|
||||
|
||||
public class SessionValidationMiddleware
|
||||
{
|
||||
private readonly RequestDelegate _next;
|
||||
|
||||
public SessionValidationMiddleware(RequestDelegate next)
|
||||
{
|
||||
_next = next;
|
||||
}
|
||||
|
||||
public async Task InvokeAsync(HttpContext context)
|
||||
{
|
||||
if (context.User.Identity.IsAuthenticated)
|
||||
{
|
||||
var userId = context.User.Identity.Name;
|
||||
var sessionId = context.User.Claims.FirstOrDefault(c => c.Type == "SessionId")?.Value;
|
||||
|
||||
if (!UserSessionManager.IsUserSessionValid(userId, sessionId))
|
||||
{
|
||||
// UserSessionManager.RemoveUserSession(userId);
|
||||
await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||
context.Response.Redirect(new Configs().CookieOptions.LogoutPath);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
await _next(context);
|
||||
}
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
using System.Linq;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using WalkingTec.Mvvm.Core;
|
||||
|
||||
namespace HHWMS.Web.Support;
|
||||
|
||||
using System.Collections.Concurrent;
|
||||
|
||||
public class UserSessionManager
|
||||
{
|
||||
private static ConcurrentDictionary<string, string> userSessions = new ConcurrentDictionary<string, string>();
|
||||
|
||||
public static void AddUserSession(string userId, string sessionId)
|
||||
{
|
||||
userSessions[userId.ToLower()] = sessionId;
|
||||
}
|
||||
|
||||
public static void RemoveUserSession(string userId)
|
||||
{
|
||||
userSessions.TryRemove(userId, out _);
|
||||
}
|
||||
|
||||
public static bool IsUserSessionValid(string userId, string sessionId)
|
||||
{
|
||||
return userSessions.TryGetValue(userId.ToLower(), out var storedSessionId) && storedSessionId == sessionId;
|
||||
}
|
||||
|
||||
public static bool IsUserSignined(string userId)
|
||||
{
|
||||
return userSessions.ContainsKey(userId);
|
||||
}
|
||||
|
||||
public static void KickUser(string userId)
|
||||
{
|
||||
userSessions.TryRemove(userId, out _);
|
||||
}
|
||||
|
||||
public static ConcurrentDictionary<string, string> AllSignined()
|
||||
{
|
||||
return userSessions;
|
||||
}
|
||||
}
|
||||
@ -1,28 +1 @@
|
||||
<script>layui.use('index')</script>
|
||||
<script>
|
||||
|
||||
// 检查Token是否过期的函数
|
||||
function isTokenExpired() {
|
||||
$.ajax({
|
||||
url: 'Home/CheckLogin/',
|
||||
statusCode: {
|
||||
// 处理200 OK状态码
|
||||
200: function(data) {
|
||||
if (data.indexOf('Login') !== -1) {
|
||||
clearInterval(timerId);
|
||||
alert("您的账号已在其他地方登陆,若继续使用,请重新登录!");
|
||||
location.reload();
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
// 存储定时器ID
|
||||
var timerId = setInterval(function() {
|
||||
// 你的代码逻辑
|
||||
isTokenExpired();
|
||||
}, 10000); // 每10000毫秒执行一次
|
||||
|
||||
</script>
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
<div class="login-form">
|
||||
<h1>WMS</h1>
|
||||
<br />
|
||||
<form id="login" action="/Login/Login" method="post">
|
||||
<form action="/Login/Login" method="post">
|
||||
<input type="hidden" name="Redirect" value="@Model.Redirect">
|
||||
<ul class="loginForm">
|
||||
<li>
|
||||
@ -75,36 +75,7 @@
|
||||
margin-bottom: 1%;
|
||||
">© 2022 华恒工程技术中心有限公司</p>*@
|
||||
</div>
|
||||
<script>
|
||||
var loginData = [];
|
||||
$.post('/Home/BeforeLogin/',{},function (data){
|
||||
loginData = data.Data;
|
||||
});
|
||||
// 给表单添加 onsubmit 事件处理器
|
||||
document.getElementById('login').onsubmit = function() {
|
||||
var usernameValue = $('input[name="ITCode"]').val();
|
||||
|
||||
var issigned;
|
||||
// 从loginData查找 itcode
|
||||
loginData.forEach(function(item) {
|
||||
if (item.Key === usernameValue) {
|
||||
var isConfirmed = confirm("您的账号已在其他地方登陆,确定在此设备重新登录吗?\n(此设备登陆后,其他设备的账号将自动退出!)");
|
||||
|
||||
// 如果用户点击“取消”,返回 false 以阻断表单提交
|
||||
if (!isConfirmed) {
|
||||
issigned = false;
|
||||
}
|
||||
else{
|
||||
issigned = true;
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return issigned;
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
@ -41,9 +41,9 @@
|
||||
//}
|
||||
],
|
||||
"CookiePre": "HHWMS", //cookie前缀
|
||||
"IsQuickDebug": false, //是否启用debug模式
|
||||
"IsQuickDebug": true, //是否启用debug模式
|
||||
"EnableTenant": false, //是否启动多租户
|
||||
"SyncDb": false, //是否自动同步数据库
|
||||
"SyncDb": true, //是否自动同步数据库
|
||||
"EncryptKey": "", //加密密钥
|
||||
"PageMode": "Tab", //页面显示模式,Single或者Tab
|
||||
"TabMode": "Simple", //Tab页显示方式,Default或者Simple
|
||||
|
||||
@ -15,11 +15,7 @@ namespace WalkingTec.Mvvm.Core.Extensions
|
||||
public static ClaimsPrincipal CreatePrincipal(this LoginUserInfo self)
|
||||
{
|
||||
if (string.IsNullOrEmpty(self.ITCode)) throw new ArgumentException("Id is mandatory", nameof(self.ITCode));
|
||||
var claims = new List<Claim>
|
||||
{
|
||||
new Claim(AuthConstants.JwtClaimTypes.Subject, self.ITCode) ,
|
||||
new Claim("SessionId", Guid.NewGuid().ToString())
|
||||
};
|
||||
var claims = new List<Claim> { new Claim(AuthConstants.JwtClaimTypes.Subject, self.ITCode) };
|
||||
|
||||
if (!string.IsNullOrEmpty(self.Name))
|
||||
{
|
||||
|
||||
@ -12,11 +12,11 @@ namespace $namespace$
|
||||
[ActionDescription("$des$")]
|
||||
public partial class $modelname$Controller : BaseController
|
||||
{
|
||||
private readonly IUnitWork _unitWork;
|
||||
private readonly IUnitWork _unitwork;
|
||||
|
||||
public $modelname$Controller(IUnitWork unitWork)
|
||||
public $modelname$Controller(IUnitWork unitwork)
|
||||
{
|
||||
_unitWork = unitWork;
|
||||
_unitwork = unitwork;
|
||||
}
|
||||
|
||||
#region Search
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>6.4.0</VersionPrefix>
|
||||
<VersionPrefix>6.3.7</VersionPrefix>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user