1

hutongqing

2025-01-15 441e73cbc890127b60853a7c80a7f3d600c0b02f

1

 ´úÂë¹ÜÀí/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('数据处理成功.');

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9810d861-42a0-437f-a9ad-8e033478a6cd.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a03bb6c9-6a9c-4e1f-9c40-304cdb5e9f4d.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e3866d26-515d-474f-abfb-51e4ed23e1b5.vsidx

Binary files differ

 ´úÂë¹ÜÀí/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]))
                {
                    //如果使用了固定Token不过期，直接对token的合法性及token是否存在进行验证
                    //if (context.Filters
                    //   .Where(item => item is IFixedTokenFilter)
                    //   .FirstOrDefault() is IFixedTokenFilter tokenFilter)
                    //{
                    //    tokenFilter.OnAuthorization(context);
                    //    return;
                    //}
                    //匿名并传入了token，需要将用户的ID缓存起来，保证UserHelper里能正确获取到用户信息
                    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))
            {

 ´úÂë¹ÜÀí/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);

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Core/HttpContextUser/IUser.cs

@@ -32,6 +32,8 @@

        void UpdateToke(string token);

        void UpdateToke(string token, int userId);

        /// <summary>
        /// æ˜¯å¦è®¤è¯
        /// </summary>

 ´úÂë¹ÜÀí/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()
                    {

 ´úÂë¹ÜÀí/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)