wgh/coreshoppro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

小程序端onlogin增加redis锁。

Browse Source
This commit is contained in:
大灰灰
2022-09-15 01:57:09 +08:00
parent 673628ed10
commit 0e87700656
2 changed files with 94 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CoreCms.Net.Model/FromBody/FMWxPost.cs
+3 -1
View File
@@ -10,6 +10,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using CoreCms.Net.Model.Entities; using CoreCms.Net.Model.Entities;
namespace CoreCms.Net.Model.FromBody namespace CoreCms.Net.Model.FromBody
@@ -20,8 +21,9 @@ namespace CoreCms.Net.Model.FromBody
public class FMWxPost public class FMWxPost
{ {
/// <summary> /// <summary>
/// 页面编码 /// 用户前端编码
/// </summary> /// </summary>
[Required(ErrorMessage = "请提交合法数据")]
public string code { get; set; } public string code { get; set; }
} }
CoreCms.Net.Web.WebApi/Controllers/UserController.cs
+49 -25
View File
@@ -20,6 +20,7 @@ using System.Threading.Tasks;
using CoreCms.Net.Auth.HttpContextUser; using CoreCms.Net.Auth.HttpContextUser;
using CoreCms.Net.Auth.Policys; using CoreCms.Net.Auth.Policys;
using CoreCms.Net.Caching.AccressToken; using CoreCms.Net.Caching.AccressToken;
using CoreCms.Net.Caching.AutoMate.RedisCache;
using CoreCms.Net.Configuration; using CoreCms.Net.Configuration;
using CoreCms.Net.IServices; using CoreCms.Net.IServices;
using CoreCms.Net.Loging; using CoreCms.Net.Loging;
@@ -35,6 +36,7 @@ using CoreCms.Net.WeChat.Service.HttpClients;
using CoreCms.Net.WeChat.Service.Models; using CoreCms.Net.WeChat.Service.Models;
using CoreCms.Net.WeChat.Service.Options; using CoreCms.Net.WeChat.Service.Options;
using CoreCms.Net.WeChat.Service.Utilities; using CoreCms.Net.WeChat.Service.Utilities;
using DotLiquid.Util;
using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
@@ -87,11 +89,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
private readonly ICoreCmsOrderServices _orderServices; private readonly ICoreCmsOrderServices _orderServices;
private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory; private readonly IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
private readonly WeChatOptions _weChatOptions; private readonly WeChatOptions _weChatOptions;
private readonly IRedisOperationRepository _redisOperationRepository;
private readonly AsyncLock _mutex = new AsyncLock();
/// <summary> /// <summary>
/// 构造函数 /// 构造函数
@@ -122,7 +120,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
, ICoreCmsSettingServices settingServices , ICoreCmsSettingServices settingServices
, ICoreCmsServicesServices servicesServices , ICoreCmsServicesServices servicesServices
, IOptions<WeChatOptions> weChatOptions , IOptions<WeChatOptions> weChatOptions
, ICoreCmsUserServicesOrderServices userServicesOrderServices, ICoreCmsUserServicesTicketServices userServicesTicketServices, ICoreCmsStoreServices storeServices, ICoreCmsCouponServices couponServices, ICoreCmsOrderServices orderServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory) , ICoreCmsUserServicesOrderServices userServicesOrderServices, ICoreCmsUserServicesTicketServices userServicesTicketServices, ICoreCmsStoreServices storeServices, ICoreCmsCouponServices couponServices, ICoreCmsOrderServices orderServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, IRedisOperationRepository redisOperationRepository)
{ {
_user = user; _user = user;
_userWeChatInfoServices = userWeChatInfoServices; _userWeChatInfoServices = userWeChatInfoServices;
@@ -154,6 +152,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
_couponServices = couponServices; _couponServices = couponServices;
_orderServices = orderServices; _orderServices = orderServices;
_weChatApiHttpClientFactory = weChatApiHttpClientFactory; _weChatApiHttpClientFactory = weChatApiHttpClientFactory;
_redisOperationRepository = redisOperationRepository;
_weChatOptions = weChatOptions.Value; _weChatOptions = weChatOptions.Value;
} }
@@ -170,27 +169,36 @@ namespace CoreCms.Net.Web.WebApi.Controllers
{ {
var jm = new WebApiCallBack(); var jm = new WebApiCallBack();
var lockKey = "LOCK_OnLogin:user_" + entity.code;
var lockHolder = Guid.NewGuid().ToString("N"); //锁持有者
var redisUserLock = await _redisOperationRepository.LockTakeAsync(lockKey, lockHolder, TimeSpan.FromSeconds(10));
if (redisUserLock)
{
try
{
var client = _weChatApiHttpClientFactory.CreateWxOpenClient(); var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken(); var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
var request = new SnsJsCode2SessionRequest(); var request = new SnsJsCode2SessionRequest
request.JsCode = entity.code; {
request.AccessToken = accessToken; JsCode = entity.code,
AccessToken = accessToken
};
var response = await client.ExecuteSnsJsCode2SessionAsync(request, HttpContext.RequestAborted); var response = await client.ExecuteSnsJsCode2SessionAsync(request, HttpContext.RequestAborted);
if (response.ErrorCode == (int)WeChatReturnCode.ReturnCode.请求成功) if (response.ErrorCode == (int)WeChatReturnCode.ReturnCode.请求成功)
{
using (await _mutex.LockAsync())
{ {
var userInfo = await _userWeChatInfoServices.QueryByClauseAsync(p => p.openid == response.OpenId); var userInfo = await _userWeChatInfoServices.QueryByClauseAsync(p => p.openid == response.OpenId);
if (userInfo == null) if (userInfo == null)
{ {
userInfo = new CoreCmsUserWeChatInfo(); userInfo = new CoreCmsUserWeChatInfo
userInfo.openid = response.OpenId; {
userInfo.type = (int)GlobalEnumVars.UserAccountTypes.微信小程序; openid = response.OpenId,
userInfo.sessionKey = response.SessionKey; type = (int)GlobalEnumVars.UserAccountTypes.微信小程序,
userInfo.gender = 1; sessionKey = response.SessionKey,
userInfo.createTime = DateTime.Now; gender = 1,
userInfo.unionId = response.UnionId; createTime = DateTime.Now,
unionId = response.UnionId
};
await _userWeChatInfoServices.InsertAsync(userInfo); await _userWeChatInfoServices.InsertAsync(userInfo);
} }
else else
@@ -225,18 +233,19 @@ namespace CoreCms.Net.Web.WebApi.Controllers
jm.otherData = response.OpenId; jm.otherData = response.OpenId;
//录入登录日志 //录入登录日志
var log = new CoreCmsUserLog(); var log = new CoreCmsUserLog
log.userId = user.id; {
log.state = (int)GlobalEnumVars.UserLogTypes.登录; userId = user.id,
log.ip = _httpContextAccessor.HttpContext?.Connection.RemoteIpAddress != null ? _httpContextAccessor.HttpContext.Connection.RemoteIpAddress.MapToIPv4().ToString() : "127.0.0.1"; state = (int)GlobalEnumVars.UserLogTypes.登录,
log.createTime = DateTime.Now; ip = _httpContextAccessor.HttpContext?.Connection.RemoteIpAddress != null ? _httpContextAccessor.HttpContext.Connection.RemoteIpAddress.MapToIPv4().ToString() : "127.0.0.1",
log.parameters = GlobalEnumVars.UserLogTypes.登录.ToString(); createTime = DateTime.Now,
parameters = GlobalEnumVars.UserLogTypes.登录.ToString()
};
await _userLogServices.InsertAsync(log); await _userLogServices.InsertAsync(log);
return jm; return jm;
} }
} }
}
//注意：生产环境下SessionKey属于敏感信息，不能进行传输！ //注意：生产环境下SessionKey属于敏感信息，不能进行传输！
//return new JsonResult(new { success = true, msg = "OK", sessionAuthId = sessionBag.Key, sessionKey = sessionBag.SessionKey, data = jsonResult, sessionBag = sessionBag }); //return new JsonResult(new { success = true, msg = "OK", sessionAuthId = sessionBag.Key, sessionKey = sessionBag.SessionKey, data = jsonResult, sessionBag = sessionBag });
jm.status = true; jm.status = true;
@@ -249,6 +258,21 @@ namespace CoreCms.Net.Web.WebApi.Controllers
{ {
jm.msg = response.ErrorMessage; jm.msg = response.ErrorMessage;
} }
}
catch (Exception e)
{
jm.msg = "数据处理异常";
jm.otherData = e;
}
finally
{
await _redisOperationRepository.LockReleaseAsync(lockKey, lockHolder);
}
}
else
{
jm.msg = "当前请求太频繁_请稍后再试";
}
return jm; return jm;
} }