From 3f7748672821512b6a1d4df7b25ed342c3f7df9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=98=89=E7=A5=A5=20=E8=A9=B9?= Date: Wed, 27 Mar 2024 15:23:47 +0800 Subject: [PATCH] updates --- Controllers/ApiController.cs | 29 ++++++++++- Program.cs | 33 ++++++------ Views/Shared/_BackEnd.cshtml | 2 +- .../assets/javascript/custom/globalJS.js | 50 +++++++++---------- .../assets/javascript/custom/newslist.js | 7 ++- 5 files changed, 75 insertions(+), 46 deletions(-) diff --git a/Controllers/ApiController.cs b/Controllers/ApiController.cs index 031f100..1b3cfd1 100644 --- a/Controllers/ApiController.cs +++ b/Controllers/ApiController.cs @@ -70,6 +70,7 @@ namespace Bremen_ESG.Controllers foreach (news objNew in newsList) { newsDetial objDetial = new newsDetial(objNew); + objDetial.news_content = objDetial.news_content.Replace("color: rgb(5, 5, 5);", "").Replace("font-family: 微軟正黑體;", ""); ret.news_list.Add(objDetial); } @@ -77,8 +78,8 @@ namespace Bremen_ESG.Controllers return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8"); } + - [Route("esg_message")] public async Task Esg_Message(IFormCollection obj) { result ret = new result(); @@ -95,6 +96,30 @@ namespace Bremen_ESG.Controllers objEsg.esgMessage_mediaUrl = obj["mediaUrl"].ToString(); objEsg.esgMessage_testResult = obj["result"].ToString(); + string err_msg = ""; + + if (objEsg.esgMessage_company == "") { + err_msg += "無企業名稱\n"; + } + + if (objEsg.esgMessage_name == "") + { + err_msg += "無聯絡人姓名\n"; + } + + if (objEsg.esgMessage_tel == "") + { + err_msg += "無聯絡人電話\n"; + } + + if (err_msg != "") { + ret.ret = "no"; + ret.message = err_msg; + ret.err_code = "0001"; + + return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8"); + } + string[] mediaUrl = objEsg.esgMessage_mediaUrl.Split(";"); string htmlBody = ""; @@ -118,7 +143,7 @@ namespace Bremen_ESG.Controllers MailRequest mailRequest = new MailRequest(); - mailRequest.ToEmail = "calvin@bremen.com.tw,queenie@bremen.com.tw,sunny.lin@bremen.com.tw,poli.chen@bremen.com.tw"; + mailRequest.ToEmail = "calvin@bremen.com.tw,queenie@bremen.com.tw,sunny.lin@bremen.com.tw"; //mailRequest.attach = arrBites; //mailRequest.attachName = "結果.xlsx"; mailRequest.Body = htmlBody; diff --git a/Program.cs b/Program.cs index 1b26ae4..9aef6c0 100644 --- a/Program.cs +++ b/Program.cs @@ -5,20 +5,20 @@ using Microsoft.Extensions.DependencyInjection.Extensions; var builder = WebApplication.CreateBuilder(args); -builder.Services.AddCors(options => -{ - options.AddDefaultPolicy( - policy => - { - policy.WithOrigins("http://www.bremen.com.tw", - "http://bremen.com.tw", - "https://www.bremen.com.tw", - "https://bremen.com.tw", - "http://preview.bremen.com.tw", - "https://preview.bremen.com.tw" - ).AllowAnyMethod().AllowAnyHeader(); - }); -}); +//builder.Services.AddCors(options => +//{ +// options.AddDefaultPolicy( +// policy => +// { +// policy.WithOrigins("http://www.bremen.com.tw", +// "http://bremen.com.tw", +// "https://www.bremen.com.tw", +// "https://bremen.com.tw", +// "http://preview.bremen.com.tw", +// "https://preview.bremen.com.tw" +// ).AllowAnyMethod().AllowAnyHeader(); +// }); +//}); //builder.Services.AddCors(options => //{ @@ -59,7 +59,7 @@ builder.Services.AddCors(options => // Add services to the container. builder.Services.AddControllersWithViews(); -builder.Services.AddControllers(); +//builder.Services.AddControllers(); builder.Services.TryAddSingleton(); @@ -83,7 +83,8 @@ app.UseHttpsRedirection(); app.UseStaticFiles(); app.UseRouting(); -app.UseCors("AllowAll"); +//app.UseCors("AllowAnyOrigins"); +//app.UseCors("AllowAll"); //app.UseCors(); app.UseAuthorization(); diff --git a/Views/Shared/_BackEnd.cshtml b/Views/Shared/_BackEnd.cshtml index f1d4c9f..4620e1a 100644 --- a/Views/Shared/_BackEnd.cshtml +++ b/Views/Shared/_BackEnd.cshtml @@ -177,7 +177,7 @@ - + diff --git a/wwwroot/BackEnd/assets/javascript/custom/globalJS.js b/wwwroot/BackEnd/assets/javascript/custom/globalJS.js index 22d56b6..7d1c722 100644 --- a/wwwroot/BackEnd/assets/javascript/custom/globalJS.js +++ b/wwwroot/BackEnd/assets/javascript/custom/globalJS.js @@ -124,33 +124,33 @@ function padding(num, length) { } function clearChildren(element) { - for (var i = 0; i < element.childNodes.length; i++) { - var e = element.childNodes[i]; - if (e.tagName) switch (e.tagName.toLowerCase()) { - case 'input': - switch (e.type) { - case "radio": - case "checkbox": break; - case "button": - case "submit": - case "text": e.value = ''; break; - case "image": break; - default: if (e.type != "checkbox") { e.value = ''; }; break; - } - break; - case 'select': e.selectedIndex = 0; break; - case 'textarea': e.innerHTML = ''; break; - default: clearChildren(e); - } - } + //for (var i = 0; i < element.childNodes.length; i++) { + // var e = element.childNodes[i]; + // if (e.tagName) switch (e.tagName.toLowerCase()) { + // case 'input': + // switch (e.type) { + // case "radio": + // case "checkbox": break; + // case "button": + // case "submit": + // case "text": e.value = ''; break; + // case "image": break; + // default: if (e.type != "checkbox") { e.value = ''; }; break; + // } + // break; + // case 'select': e.selectedIndex = 0; break; + // case 'textarea': e.innerHTML = ''; break; + // default: clearChildren(e); + // } + //} - $(element).children().find('textarea').each(function () { - $(this).val(''); - }); + //$(element).children().find('textarea').each(function () { + // $(this).val(''); + //}); - $(element).children().find('select').each(function () { - $(this).prop('selectedIndex', 0); - }); + //$(element).children().find('select').each(function () { + // $(this).prop('selectedIndex', 0); + //}); } diff --git a/wwwroot/BackEnd/assets/javascript/custom/newslist.js b/wwwroot/BackEnd/assets/javascript/custom/newslist.js index a8adc89..beaca2a 100644 --- a/wwwroot/BackEnd/assets/javascript/custom/newslist.js +++ b/wwwroot/BackEnd/assets/javascript/custom/newslist.js @@ -671,9 +671,12 @@ function initSummernote() { // [groupName, [list of button]] ['style', ['bold', 'italic', 'underline', 'clear']], ['font', ['strikethrough', 'superscript', 'subscript']], - ['color', ['color']], ['insert', ['link']], ['para', ['ul', 'paragraph']] - ] + ],onPaste: function (e) { + var bufferText = ((e.originalEvent || e).clipboardData || window.clipboardData).getData('Text'); + e.preventDefault(); + document.execCommand('insertText', false, bufferText); + } }); } \ No newline at end of file