Commit 9ee1a561 authored by 黄奎's avatar 黄奎

甲鹤上传调整

parent 16b39fe3
...@@ -242,7 +242,7 @@ namespace Edu.Module.System ...@@ -242,7 +242,7 @@ namespace Edu.Module.System
} }
} }
} }
// ThirdCore.Message.SMSService.SendMsg("13551132417", PhoneMessage, "SMS_201722097", "印象之旅", "dysmsapi.aliyuncs.com", "LTAIwE7l9dImZSa3", "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI", "cn-hangzhou");
} }
......
This diff is collapsed.
...@@ -25,16 +25,16 @@ namespace Edu.ThirdCore.Message ...@@ -25,16 +25,16 @@ namespace Edu.ThirdCore.Message
/// <param name="task"></param> /// <param name="task"></param>
public static void EnqueueTask(string task) public static void EnqueueTask(string task)
{ {
lock (locker) //lock (locker)
{ //{
//同样的任务,不同时加入 // //同样的任务,不同时加入
IList<string> tasks = Queue.ToList(); // IList<string> tasks = Queue.ToList();
if (tasks.Count(p => p == task) == 0) // if (tasks.Count(p => p == task) == 0)
{ // {
Queue.Enqueue(task); // Queue.Enqueue(task);
Monitor.PulseAll(locker); // Monitor.PulseAll(locker);
} // }
} //}
} }
} }
} }
...@@ -40,7 +40,7 @@ namespace Edu.ThirdCore.Message ...@@ -40,7 +40,7 @@ namespace Edu.ThirdCore.Message
var TemplateParam = new { code }; var TemplateParam = new { code };
obj["OutId"] = OutId; obj["OutId"] = OutId;
obj["templateParam"] = JsonConvert.SerializeObject(TemplateParam); obj["templateParam"] = JsonConvert.SerializeObject(TemplateParam);
QueueHelper.EnqueueTask(JsonConvert.SerializeObject(obj)); // QueueHelper.EnqueueTask(JsonConvert.SerializeObject(obj));
} }
/// <summary> /// <summary>
...@@ -65,7 +65,7 @@ namespace Edu.ThirdCore.Message ...@@ -65,7 +65,7 @@ namespace Edu.ThirdCore.Message
var TemplateParam = new { content }; var TemplateParam = new { content };
obj["OutId"] = OutId; obj["OutId"] = OutId;
obj["templateParam"] = JsonConvert.SerializeObject(TemplateParam); obj["templateParam"] = JsonConvert.SerializeObject(TemplateParam);
QueueHelper.EnqueueTask(JsonConvert.SerializeObject(obj)); //QueueHelper.EnqueueTask(JsonConvert.SerializeObject(obj));
} }
/// <summary> /// <summary>
...@@ -90,7 +90,7 @@ namespace Edu.ThirdCore.Message ...@@ -90,7 +90,7 @@ namespace Edu.ThirdCore.Message
obj["AccessKeySecret"] = AccessKeySecret; obj["AccessKeySecret"] = AccessKeySecret;
obj["OutId"] = OutId; obj["OutId"] = OutId;
obj["templateParam"] = JsonConvert.SerializeObject(TemplateParam); obj["templateParam"] = JsonConvert.SerializeObject(TemplateParam);
QueueHelper.EnqueueTask(JsonConvert.SerializeObject(obj)); //QueueHelper.EnqueueTask(JsonConvert.SerializeObject(obj));
} }
} }
} }
...@@ -295,7 +295,6 @@ namespace Edu.WebApi.Controllers.Public ...@@ -295,7 +295,6 @@ namespace Edu.WebApi.Controllers.Public
msgLogModule.SendMsg(PhoneMessage, Common.Enum.System.BaseTemplateTypeEnum.OrderSuccess, msgLogModel); msgLogModule.SendMsg(PhoneMessage, Common.Enum.System.BaseTemplateTypeEnum.OrderSuccess, msgLogModel);
// ThirdCore.Message.SMSService.SendMsg("13551132417", PhoneMessage, "SMS_201722097", "印象之旅", "dysmsapi.aliyuncs.com", "LTAIwE7l9dImZSa3", "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI", "cn-hangzhou");
return ApiResult.Success(""); return ApiResult.Success("");
} }
......
...@@ -111,8 +111,7 @@ namespace Edu.WebApi ...@@ -111,8 +111,7 @@ namespace Edu.WebApi
//启动信息发送 //启动信息发送
// Task.Run(() => MessageCore.Init()); //Task.Run(() => MessageCore.Init());
Task.Run(() => MessageCore.Init());
app.UseEndpoints(endpoints => app.UseEndpoints(endpoints =>
{ {
endpoints.MapHub<MessageCenterHub>("/messagecenter"); endpoints.MapHub<MessageCenterHub>("/messagecenter");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment