From 441e73cbc890127b60853a7c80a7f3d600c0b02f Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期三, 15 一月 2025 15:43:46 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSClient/src/extension/outbound/mesOutboundOrder.js | 2
/dev/null | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/IUser.cs | 2 +
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e3866d26-515d-474f-abfb-51e4ed23e1b5.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs | 29 ++------------
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs | 8 ++--
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs | 59 ++++++++++++++++-------------
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a03bb6c9-6a9c-4e1f-9c40-304cdb5e9f4d.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs | 3 +
9 files changed, 45 insertions(+), 58 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/mesOutboundOrder.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/mesOutboundOrder.js"
index 4bb4e08..1c3066e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/mesOutboundOrder.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/mesOutboundOrder.js"
@@ -33,7 +33,7 @@
if (rows.length > 1) return this.$error("璇烽�夋嫨涓�鏉℃暟鎹�!");
var param = rows[0].taskNum;
this.http
- .post("api/Task/HandSubstrateOut?orderId=" + rows[0].id, "鏁版嵁澶勭悊涓�...")
+ .post("api/Task/HandSubstrateOut?orderId=" + rows[0].id, null, "鏁版嵁澶勭悊涓�...")
.then((x) => {
if (x.status) {
this.$Message.success('鏁版嵁澶勭悊鎴愬姛.');
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9810d861-42a0-437f-a9ad-8e033478a6cd.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9810d861-42a0-437f-a9ad-8e033478a6cd.vsidx"
deleted file mode 100644
index 8f3e39e..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9810d861-42a0-437f-a9ad-8e033478a6cd.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a03bb6c9-6a9c-4e1f-9c40-304cdb5e9f4d.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a03bb6c9-6a9c-4e1f-9c40-304cdb5e9f4d.vsidx"
new file mode 100644
index 0000000..904814a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a03bb6c9-6a9c-4e1f-9c40-304cdb5e9f4d.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e3866d26-515d-474f-abfb-51e4ed23e1b5.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e3866d26-515d-474f-abfb-51e4ed23e1b5.vsidx"
new file mode 100644
index 0000000..2314a3d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e3866d26-515d-474f-abfb-51e4ed23e1b5.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs"
index e87a29d..74593d0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs"
@@ -38,35 +38,14 @@
/// <param name="context"></param>
public void OnAuthorization(AuthorizationFilterContext context)
{
- //if (!App.HostEnvironment.IsProduction() || context.HttpContext.Request.Path.Value == loginPath || context.HttpContext.Request.Path.Value == vierificationCodePath)
+ if (context.ActionDescriptor.EndpointMetadata.Any(item => item is IAllowAnonymous))
{
- if (context.ActionDescriptor.EndpointMetadata.Any(item => item is IAllowAnonymous))
+ if (!context.HttpContext.User.Identity?.IsAuthenticated ?? false && !string.IsNullOrEmpty(context.HttpContext.Request.Headers[AppSecret.TokenHeaderName]))
{
- //濡傛灉浣跨敤浜嗗浐瀹歍oken涓嶈繃鏈燂紝鐩存帴瀵箃oken鐨勫悎娉曟�у強token鏄惁瀛樺湪杩涜楠岃瘉
- //if (context.Filters
- // .Where(item => item is IFixedTokenFilter)
- // .FirstOrDefault() is IFixedTokenFilter tokenFilter)
- //{
- // tokenFilter.OnAuthorization(context);
- // return;
- //}
- //鍖垮悕骞朵紶鍏ヤ簡token锛岄渶瑕佸皢鐢ㄦ埛鐨処D缂撳瓨璧锋潵锛屼繚璇乁serHelper閲岃兘姝ｇ‘鑾峰彇鍒扮敤鎴蜂俊鎭�
- if (!context.HttpContext.User.Identity?.IsAuthenticated ?? false && !string.IsNullOrEmpty(context.HttpContext.Request.Headers[AppSecret.TokenHeaderName]))
- {
- context.AddIdentity();
- }
- return;
+ context.AddIdentity();
}
+ return;
}
- //else
- //{
- // if (!context.HttpContext.User.Identity?.IsAuthenticated ?? false || !context.HttpContext.Request.Headers.ContainsKey(AppSecret.TokenHeaderName))
- // {
- // context.Unauthorized("鏈巿鏉�");
- // return;
- // }
- //}
-
#region 鍗曠偣鐧诲綍
if (string.IsNullOrEmpty(App.User.Token))
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs"
index 87092e2..4637b01 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/AspNetUser.cs"
@@ -48,40 +48,45 @@
public string GetToken()
{
string token = "";
- token = _cacheService.Get(UserId.ToString());
- if (!string.IsNullOrEmpty(token)) { return token; }
- token = _accessor.HttpContext?.Request?.Headers["Authorization"].ObjToString().Replace("Bearer ", "") ?? "";
- if (!token.IsNullOrEmpty())
+
+ if (MenuType == 0)
{
+ token = _cacheService.Get(UserId.ToString());
+ if (!string.IsNullOrEmpty(token)) { return token; }
+ token = _accessor.HttpContext?.Request?.Headers["Authorization"].ObjToString().Replace("Bearer ", "") ?? "";
+ if (!token.IsNullOrEmpty())
+ {
+ return token;
+ }
return token;
}
- //if (_accessor.HttpContext?.IsSuccessSwagger() ?? false)
- //{
- // token = _accessor.HttpContext.GetSuccessSwaggerJwt();
- // if (token.IsNotEmptyOrNull())
- // {
- // List<Claim> claims1 = _accessor.HttpContext.User.Claims.ToList();
- // if (_accessor.HttpContext.User.Claims.Any(s => s.Type == JwtRegisteredClaimNames.Jti))
- // {
- // return token;
- // }
-
- // var claims = new ClaimsIdentity(GetClaimsIdentity(token));
- // _accessor.HttpContext.User.AddIdentity(claims);
- // return token;
- // }
- //}
- return token;
-
- // string token = _cacheService.Get(UserId.ToString());
- //if (!string.IsNullOrEmpty(token)) { return token; }
- //return string.Empty;
- //return _accessor.HttpContext?.Request?.Headers["Authorization"].ObjToString().Replace("Bearer ", "") ?? "";
+ else
+ {
+ token = _cacheService.Get(UserId.ToString() + "-App");
+ if (!string.IsNullOrEmpty(token)) { return token; }
+ token = _accessor.HttpContext?.Request?.Headers["Authorization"].ObjToString().Replace("Bearer ", "") ?? "";
+ if (!token.IsNullOrEmpty())
+ {
+ return token;
+ }
+ return token;
+ }
}
public void UpdateToke(string token)
{
- _cacheService.AddOrUpdate(UserId.ToString(), token);
+ if (MenuType == 0)
+ _cacheService.AddOrUpdate(UserId.ToString(), token);
+ else
+ _cacheService.AddOrUpdate(UserId.ToString() + "-App", token);
+ }
+
+ public void UpdateToke(string token, int userId)
+ {
+ if (MenuType == 0)
+ _cacheService.AddOrUpdate(userId.ToString(), token);
+ else
+ _cacheService.AddOrUpdate(userId.ToString() + "-App", token);
}
public bool IsSuperAdmin => IsRoleIdSuperAdmin(RoleId);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/IUser.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/IUser.cs"
index 0c40736..db4d27b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/IUser.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/IUser.cs"
@@ -32,6 +32,8 @@
void UpdateToke(string token);
+ void UpdateToke(string token, int userId);
+
/// <summary>
/// 鏄惁璁よ瘉
/// </summary>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
index 44d2822..b71f4e9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_UserService.cs"
@@ -80,8 +80,8 @@
UserName = user.UserName,
TenantId = user.TenantId,
});
+ App.User.UpdateToke(token, user.UserId);
- _cacheService.AddOrUpdate(user.UserId.ToString(), token);
if (PermissionDataHostService.UserRoles.FirstOrDefault(x => x.UserId == user.UserId) == null)
PermissionDataHostService.UserRoles.AddRange(PermissionDataHostService.GetUserRoles(Db, user.UserId));
@@ -233,7 +233,7 @@
}
return content;
}
- public WebResponseContent ModifyUserPwd(string password,string userName)
+ public WebResponseContent ModifyUserPwd(string password, string userName)
{
WebResponseContent content = new WebResponseContent();
string message = "";
@@ -242,11 +242,11 @@
{
if (string.IsNullOrEmpty(password)) return WebResponseContent.Instance.Error("瀵嗙爜涓嶈兘涓虹┖");
//鑾峰彇鐢ㄦ埛
- Sys_User user = BaseDal.QueryFirst(x=>x.UserName==userName);
+ Sys_User user = BaseDal.QueryFirst(x => x.UserName == userName);
if (user == null) return WebResponseContent.Instance.Error("鐢ㄦ埛涓嶅瓨鍦�");
user.UserPwd = password.EncryptDES(AppSecret.User);
BaseDal.UpdateData(user);
- if (App.User.UserId== user.UserId)
+ if (App.User.UserId == user.UserId)
{
string token = JwtHelper.IssueJwt(new TokenModelJwt()
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
index 0545c40..5db7809 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_UserController.cs"
@@ -114,7 +114,8 @@
UserName = App.User.UserName
};
string newToken = JwtHelper.IssueJwt(tokenModelJwt);
- _cacheService.AddOrUpdate(tokenModelJwt.UserId.ToString(), newToken);
+
+ App.User.UpdateToke(newToken, App.User.UserId);
return responseContent = WebResponseContent.Instance.OK(data: newToken);
}
catch (Exception ex)
--
Gitblit v1.9.3