wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 22:43:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

【修复】修复日历签到连续签到的统计错误的问题，增加用户签到redis锁。

Browse Source
This commit is contained in:
大灰灰
2022-10-21 14:26:00 +08:00
parent c88951e1f3
commit c8175d1090
2 changed files with 74 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
CoreCms.Net.Web.WebApi/Controllers/CheckInController.cs
View File

@@ -1,7 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using CoreCms.Net.Auth.HttpContextUser;
using CoreCms.Net.Caching.AutoMate.RedisCache;
using CoreCms.Net.Configuration;
using CoreCms.Net.IRepository;
using CoreCms.Net.IServices;
using CoreCms.Net.Model.Entities;
@@ -22,17 +25,17 @@ namespace CoreCms.Net.Web.WebApi.Controllers
{
private readonly ICoreCmsUserCheckInDetailsServices _userCheckInDetailsServices;
private readonly IHttpContextUser _user;
private readonly IRedisOperationRepository _redisOperationRepository;
//简单的异步锁
private readonly AsyncLock _mutex = new AsyncLock();
/// <summary>
/// 构造函数
/// </summary>
public CheckInController(IHttpContextUser user, ICoreCmsUserCheckInDetailsServices userCheckInDetailsServices)
public CheckInController(IHttpContextUser user, ICoreCmsUserCheckInDetailsServices userCheckInDetailsServices, IRedisOperationRepository redisOperationRepository)
{
_user = user;
_userCheckInDetailsServices = userCheckInDetailsServices;
_redisOperationRepository = redisOperationRepository;
}
@@ -44,27 +47,48 @@ namespace CoreCms.Net.Web.WebApi.Controllers
[Authorize]
public async Task<WebApiCallBack> DoUserCheckIn([FromBody] FMDoUserCheckIn entity)
{
using (await _mutex.LockAsync())
var jm = new WebApiCallBack();
var lockKey = "LOCK_DoUserCheckIn:user_" + _user.ID;
var lockHolder = Guid.NewGuid().ToString("N"); //锁持有者
var redisUserLock = await _redisOperationRepository.LockTakeAsync(lockKey, lockHolder, TimeSpan.FromSeconds(5));
if (redisUserLock)
{
var jm = new WebApiCallBack();
var isHave = await _userCheckInDetailsServices.ExistsAsync(p => p.userId == _user.ID && p.checkInData == entity.date);
if (isHave)
try
{
jm.msg = "今日您已签到";
var isHave = await _userCheckInDetailsServices.ExistsAsync(p => p.userId == _user.ID && p.checkInData == entity.date);
if (isHave)
{
jm.msg = "今日您已签到";
return jm;
}
var detail = new CoreCmsUserCheckInDetails
{
userId = _user.ID,
checkInData = entity.date,
createTime = DateTime.Now
};
var callBack = await _userCheckInDetailsServices.DoCheckIn(detail);
jm.status = callBack.code == 0;
jm.msg = callBack.msg;
jm.data = callBack.data;
return jm;
}
var detail = new CoreCmsUserCheckInDetails
catch (Exception e)
{
userId = _user.ID,
checkInData = entity.date,
createTime = DateTime.Now
};
var callBack = await _userCheckInDetailsServices.DoCheckIn(detail);
jm.status = callBack.code == 0;
jm.msg = callBack.msg;
jm.data = callBack.data;
return jm;
jm.msg = "数据处理异常";
jm.otherData = e;
}
finally
{
await _redisOperationRepository.LockReleaseAsync(lockKey, lockHolder);
}
}
else
{
jm.msg = "当前请求太频繁_请稍后再试";
}
return jm;
}
/// <summary>
@@ -101,12 +125,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
var list = await _userCheckInDetailsServices.QueryListByClauseAsync(p => p.userId == _user.ID && p.checkInData > min && p.checkInData < max);
var stringArr = new List<string>();
foreach (var item in list)
{
var stringStr = item.checkInData.ToString("yyyy-MM-dd");
stringArr.Add(stringStr);
}
var stringArr = list.Select(item => item.checkInData.ToString("yyyy-MM-dd")).ToList();
jm.status = true;
jm.data = stringArr;