diff --git a/DOAN.Admin.WebApi/appsettings.Production.json b/DOAN.Admin.WebApi/appsettings.Production.json index f79e1cf..be882b1 100644 --- a/DOAN.Admin.WebApi/appsettings.Production.json +++ b/DOAN.Admin.WebApi/appsettings.Production.json @@ -87,18 +87,32 @@ } }, //邮箱配置信息 + //"MailOptions": { + // //发件人名称 + // "FromName": "gx.andon@gam.com.cn", + // //发送人邮箱 + // "FromEmail": "gx.andon@gam.com.cn", //eg:xxxx@qq.com + // //发送人邮箱密码 + // "Password": "chejinggx", + // //协议 + // "Smtp": "mail.gam.com.cn", + // "Port": 25, + // "Signature": "上海干巷Andon系统邮件,请勿回复! ", + // "UseSsl": false + //}, + // 邮箱配置信息 "MailOptions": { //发件人名称 - "FromName": "gx.andon@gam.com.cn", + "FromName": "3143976203", //发送人邮箱 - "FromEmail": "gx.andon@gam.com.cn", //eg:xxxx@qq.com + "FromEmail": "3143976203@qq.com", //eg:xxxx@qq.com //发送人邮箱密码 - "Password": "chejinggx", + "Password": "wwxcrgvbotxxdcfg", //协议 - "Smtp": "mail.gam.com.cn", - "Port": 25, - "Signature": "上海干巷Andon系统邮件,请勿回复! ", - "UseSsl": false + "Smtp": "smtp.qq.com", + "Port": 465, + "Signature": "系统邮件,请勿回复! ", + "UseSsl": true }, //redis服务配置 "RedisServer": { diff --git a/DOAN.Admin.WebApi/libman.json b/DOAN.Admin.WebApi/libman.json new file mode 100644 index 0000000..ceee271 --- /dev/null +++ b/DOAN.Admin.WebApi/libman.json @@ -0,0 +1,5 @@ +{ + "version": "1.0", + "defaultProvider": "cdnjs", + "libraries": [] +} \ No newline at end of file diff --git a/DOAN.Service/MES/andon/AndonInteractionService.cs b/DOAN.Service/MES/andon/AndonInteractionService.cs index cd2f418..0428f48 100644 --- a/DOAN.Service/MES/andon/AndonInteractionService.cs +++ b/DOAN.Service/MES/andon/AndonInteractionService.cs @@ -73,6 +73,7 @@ namespace DOAN.Service.MES.andon List andonFaults = GetFaultDicts(); // 获取超时记录 DateTime Overtime = DateTime.Now.AddHours(-1); + // 获取没有被响应的故障 List AlarmRecord = Context.Queryable().Where(it => it.Status == 1).Where(it => it.StartTime <= Overtime).ToList(); if (AlarmRecord.Count > 0 && andonFaults.Count > 0) @@ -105,8 +106,8 @@ namespace DOAN.Service.MES.andon msg.Append("\n"); msg.Append("\n"); msg.Append("\n"); - msg.Append("如果邮件中有任务不清楚的地方或者需要我们提供任何帮助,请联系苏州道安自动化有限公司IT部门,邮件地址为qianhao.xu@doan-tech.com"); - + msg.Append("如果邮件中有任务不清楚的地方或者需要我们提供任何帮助,请联系苏州道安自动化有限公司IT部门,邮件地址为qianhao.xu@doan-tech.com\n"); + msg.Append($"故障id {alarm.Id}"); sendEmailVo.Content = msg.ToString(); sendEmailVo.SendMe = true; sendEmailVo.AddTime = DateTime.Now;