Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
commit
ebd9596a5f
|
@ -227,3 +227,5 @@
|
||||||
|
|
||||||
|
|
||||||
//app.Run();
|
//app.Run();
|
||||||
|
|
||||||
|
//イ簗ヤヘャイス
|
||||||
|
|
|
@ -165,10 +165,17 @@ namespace IRaCIS.Core.Application.Filter
|
||||||
|
|
||||||
var cacheResultDic = _provider.GetAll<string>(new[] { trialIdStr });
|
var cacheResultDic = _provider.GetAll<string>(new[] { trialIdStr });
|
||||||
|
|
||||||
var trialStatusStr = cacheResultDic[trialIdStr];
|
var trialStatusStr = cacheResultDic[trialIdStr].Value;
|
||||||
|
|
||||||
|
//意外 导致缓存过期,调整服务器时间,测试不想重启程序
|
||||||
|
if (string.IsNullOrWhiteSpace(trialStatusStr))
|
||||||
|
{
|
||||||
|
var trialRepository = context.HttpContext.RequestServices.GetService(typeof(IRepository<Trial>)) as IRepository<Trial>;
|
||||||
|
trialStatusStr = trialRepository?.Where(t => t.Id == Guid.Parse(trialIdStr)).Select(t => t.TrialStatusStr).FirstOrDefault();
|
||||||
|
}
|
||||||
|
|
||||||
// 这里是统一拦截 项目有关的操作允许情况(特殊的地方,比如项目配置(有的在多种状态(初始化,ongoing)都可以操作,有的仅仅在Initializing)还有 项目添加和更新,不走这里,特殊处理,不然在这里显得很乱,判断是哪个接口)
|
// 这里是统一拦截 项目有关的操作允许情况(特殊的地方,比如项目配置(有的在多种状态(初始化,ongoing)都可以操作,有的仅仅在Initializing)还有 项目添加和更新,不走这里,特殊处理,不然在这里显得很乱,判断是哪个接口)
|
||||||
if (trialStatusStr.Value == StaticData.TrialState.TrialOngoing || _trialOptList.Any(t=>t== TrialOpt.BeforeOngoingCantOpt) )
|
if (trialStatusStr == StaticData.TrialState.TrialOngoing || _trialOptList.Any(t=>t== TrialOpt.BeforeOngoingCantOpt) )
|
||||||
{
|
{
|
||||||
|
|
||||||
await next.Invoke();
|
await next.Invoke();
|
||||||
|
|
|
@ -145,6 +145,14 @@ namespace IRaCIS.Application.Services
|
||||||
return findStr;
|
return findStr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[AllowAnonymous]
|
||||||
|
public async Task testwwwww([FromServices] IWebHostEnvironment env)
|
||||||
|
{
|
||||||
|
await Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
public async Task<object> GetEnvironmentName([FromServices] IWebHostEnvironment env)
|
public async Task<object> GetEnvironmentName([FromServices] IWebHostEnvironment env)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue