Bremen
/
ESG
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

main
嘉祥 詹 2024-03-27 15:23:47 +08:00
parent 81b7bd3fe0
commit 3f77486728
5 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Controllers/ApiController.cs
View File

@ -70,6 +70,7 @@ namespace Bremen_ESG.Controllers
foreach (news objNew in newsList) foreach (news objNew in newsList)
{ {
newsDetial objDetial = new newsDetial(objNew); 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); ret.news_list.Add(objDetial);
} }
@ -95,6 +96,30 @@ namespace Bremen_ESG.Controllers
objEsg.esgMessage_mediaUrl = obj["mediaUrl"].ToString(); objEsg.esgMessage_mediaUrl = obj["mediaUrl"].ToString();
objEsg.esgMessage_testResult = obj["result"].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[] mediaUrl = objEsg.esgMessage_mediaUrl.Split(";");
string htmlBody = ""; string htmlBody = "";
@ -118,7 +143,7 @@ namespace Bremen_ESG.Controllers
MailRequest mailRequest = new MailRequest(); 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.attach = arrBites;
//mailRequest.attachName = "結果.xlsx"; //mailRequest.attachName = "結果.xlsx";
mailRequest.Body = htmlBody; mailRequest.Body = htmlBody;

33
Program.cs
View File

@ -5,20 +5,20 @@ using Microsoft.Extensions.DependencyInjection.Extensions;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
builder.Services.AddCors(options => //builder.Services.AddCors(options =>
{ //{
options.AddDefaultPolicy( // options.AddDefaultPolicy(
policy => // policy =>
{ // {
policy.WithOrigins("http://www.bremen.com.tw", // policy.WithOrigins("http://www.bremen.com.tw",
"http://bremen.com.tw", // "http://bremen.com.tw",
"https://www.bremen.com.tw", // "https://www.bremen.com.tw",
"https://bremen.com.tw", // "https://bremen.com.tw",
"http://preview.bremen.com.tw", // "http://preview.bremen.com.tw",
"https://preview.bremen.com.tw" // "https://preview.bremen.com.tw"
).AllowAnyMethod().AllowAnyHeader(); // ).AllowAnyMethod().AllowAnyHeader();
}); // });
}); //});
//builder.Services.AddCors(options => //builder.Services.AddCors(options =>
//{ //{
@ -59,7 +59,7 @@ builder.Services.AddCors(options =>
// Add services to the container. // Add services to the container.
builder.Services.AddControllersWithViews(); builder.Services.AddControllersWithViews();
builder.Services.AddControllers(); //builder.Services.AddControllers();
builder.Services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>(); builder.Services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
@ -83,7 +83,8 @@ app.UseHttpsRedirection();
app.UseStaticFiles(); app.UseStaticFiles();
app.UseRouting(); app.UseRouting();
app.UseCors("AllowAll"); //app.UseCors("AllowAnyOrigins");
//app.UseCors("AllowAll");
//app.UseCors(); //app.UseCors();
app.UseAuthorization(); app.UseAuthorization();

2
Views/Shared/_BackEnd.cshtml
View File

@ -177,7 +177,7 @@
<script src="~/BackEnd/assets/javascript/pages/sha256.js"></script> <!-- END PLUGINS JS --> <script src="~/BackEnd/assets/javascript/pages/sha256.js"></script> <!-- END PLUGINS JS -->
<script src="~/BackEnd/assets/javascript/pages/waitingfor.js"></script> <script src="~/BackEnd/assets/javascript/pages/waitingfor.js"></script>
<script src="~/BackEnd/assets/javascript/custom/globalJS.js"></script> <script src="~/BackEnd/assets/javascript/custom/globalJS.js" asp-append-version="true"></script>
<!-- BEGIN THEME JS --> <!-- BEGIN THEME JS -->
<script src="~/BackEnd/assets/javascript/theme.min.js"></script> <!-- END THEME JS --> <script src="~/BackEnd/assets/javascript/theme.min.js"></script> <!-- END THEME JS -->
<!-- BEGIN datatables JS--> <!-- BEGIN datatables JS-->

50
wwwroot/BackEnd/assets/javascript/custom/globalJS.js
View File

@ -124,33 +124,33 @@ function padding(num, length) {
} }
function clearChildren(element) { function clearChildren(element) {
for (var i = 0; i < element.childNodes.length; i++) { //for (var i = 0; i < element.childNodes.length; i++) {
var e = element.childNodes[i]; // var e = element.childNodes[i];
if (e.tagName) switch (e.tagName.toLowerCase()) { // if (e.tagName) switch (e.tagName.toLowerCase()) {
case 'input': // case 'input':
switch (e.type) { // switch (e.type) {
case "radio": // case "radio":
case "checkbox": break; // case "checkbox": break;
case "button": // case "button":
case "submit": // case "submit":
case "text": e.value = ''; break; // case "text": e.value = ''; break;
case "image": break; // case "image": break;
default: if (e.type != "checkbox") { e.value = ''; }; break; // default: if (e.type != "checkbox") { e.value = ''; }; break;
} // }
break; // break;
case 'select': e.selectedIndex = 0; break; // case 'select': e.selectedIndex = 0; break;
case 'textarea': e.innerHTML = ''; break; // case 'textarea': e.innerHTML = ''; break;
default: clearChildren(e); // default: clearChildren(e);
} // }
} //}
$(element).children().find('textarea').each(function () { //$(element).children().find('textarea').each(function () {
$(this).val(''); // $(this).val('');
}); //});
$(element).children().find('select').each(function () { //$(element).children().find('select').each(function () {
$(this).prop('selectedIndex', 0); // $(this).prop('selectedIndex', 0);
}); //});
} }

7
wwwroot/BackEnd/assets/javascript/custom/newslist.js
View File

@ -671,9 +671,12 @@ function initSummernote() {
// [groupName, [list of button]] // [groupName, [list of button]]
['style', ['bold', 'italic', 'underline', 'clear']], ['style', ['bold', 'italic', 'underline', 'clear']],
['font', ['strikethrough', 'superscript', 'subscript']], ['font', ['strikethrough', 'superscript', 'subscript']],
['color', ['color']],
['insert', ['link']], ['insert', ['link']],
['para', ['ul', 'paragraph']] ['para', ['ul', 'paragraph']]
] ],onPaste: function (e) {
var bufferText = ((e.originalEvent || e).clipboardData || window.clipboardData).getData('Text');
e.preventDefault();
document.execCommand('insertText', false, bufferText);
}
}); });
} }