diff --git a/src/main/java/com/jmfy/controller/MailController.java b/src/main/java/com/jmfy/controller/MailController.java index 62ed884..2afa583 100644 --- a/src/main/java/com/jmfy/controller/MailController.java +++ b/src/main/java/com/jmfy/controller/MailController.java @@ -63,12 +63,6 @@ public class MailController { map.addAttribute("serverInfo",allServerInfo); map.addAttribute("itemNameMap",itemNameMap); - /*List idList =new ArrayList(); - for (int i = 0;i -
+
- + 英文 + 越南文
@@ -55,7 +60,9 @@ * 游戏公告内容:
- + 中文 + 英文 + 越南文
@@ -93,7 +100,7 @@
-
@@ -140,19 +147,77 @@ $('#updataSYSNotice').load(function () { function sendCheck() { var erroCode = $('.SERVERID'); + var reg = new RegExp("[|#]",'g'); var title1 = $("input[name='title1']").val(); - var content1 = document.getElementById("summary").value; + var title2 = $("input[name='title2']").val(); + var title3 = $("input[name='title3']").val(); + + var title = title1+"|"+title2+"|"+title3; + + var content1 = $("textarea[name='content1']").val(); + var content2 = $("textarea[name='content2']").val(); + var content3 = $("textarea[name='content3']").val(); + + var content = content1+"|"+content2+"|"+content3; + + if (reg.test(title1)){ + alert("中文标题不能有特殊字符") + } + if (reg.test(title2)){ + alert("英文标题不能有特殊字符") + } + if (reg.test(title3)){ + alert("越南文标题不能有特殊字符") + } + if (reg.test(content1)){ + alert("中文正文不能有特殊字符") + } + + if (reg.test(content2)){ + alert("英文正文不能有特殊字符") + } + if (reg.test(content3)){ + alert("越南文正文不能有特殊字符") + } + + var startTime = $("input[name='startTime']").val(); + var endTime = $("input[name='endTime']").val(); + var addType = $("select[name='addType']").val(); + + if (title === '' || title == null) { - if (title1 === '' || title1 == null) { erroCode.html('游戏公告标题不能为空!'); return false; } - if (content1 === '' || content1 == null) { + if (content === '' || content == null) { erroCode.html('游戏公告内容不能为空!'); return false; } + $.ajax({ + type: "POST", + data: + JSON.stringify({ + "title": title, + "content": content, + "startTime": startTime, + "endTime": endTime, + "addType": addType + }) + , + url: "/publishNotice", - return true; + contentType: 'application/json', + + success: function (data) { + console.log(data) + if (data === 0) { + layer.msg('成功!', {icon: 6, time: 1000}); + }else { + layer.msg('失败!', {icon: 6, time: 1000}); + } + } + } + ) } diff --git a/src/main/resources/templates/sendPersonalMail.html b/src/main/resources/templates/sendPersonalMail.html index f177517..a8651ed 100644 --- a/src/main/resources/templates/sendPersonalMail.html +++ b/src/main/resources/templates/sendPersonalMail.html @@ -69,7 +69,15 @@ * 邮件标题:
- +
+ 中文 +
+
+ 英文 +
+
+ 越南文 +
@@ -78,7 +86,9 @@ * 邮件正文:
- + 中文 + 英文 + 越南文
@@ -275,13 +285,43 @@ } }) } - + function sendSysMail() { + //特殊字符验证 + var reg = new RegExp("[|#]",'g'); + + var mailTitle1 = $("input[name='mailTitle1']").val(); + if (reg.test(mailTitle1)){ + alert("中文标题不能有特殊字符") + } + var mailTitle2 = $("input[name='mailTitle2']").val(); + if (reg.test(mailTitle2)){ + alert("英文标题不能有特殊字符") + } + var mailTitle3 = $("input[name='mailTitle3']").val(); + if (reg.test(mailTitle3)){ + alert("越南文标题不能有特殊字符") + } + + var mailContent1 = $("textarea[name='mailContent1']").val(); + if (reg.test(mailContent1)){ + alert("中文正文不能有特殊字符") + } + var mailContent2 = $("textarea[name='mailContent2']").val(); + if (reg.test(mailContent2)){ + alert("英文正文不能有特殊字符") + } + var mailContent3 = $("textarea[name='mailContent3']").val(); + if (reg.test(mailContent3)){ + alert("越南文正文不能有特殊字符") + } + + var mailTitle = mailTitle1+"|"+mailTitle2+"|"+mailTitle3; + + var mailContent = mailContent1+"|"+mailContent2+"|"+mailContent3; var erroCode = $('.SERVERID'); var serverId = $("#serverId").val(); - var mailTitle = $("input[name='mailTitle']").val(); - var mailContent = $("textarea[name='mailContent']").val(); // var attach = $("input[name='attach']").val(); var isAttach = document.getElementById("isAttach").value; var userId = $("input[name='userId']").val(); diff --git a/src/main/resources/templates/sendSysCmd.html b/src/main/resources/templates/sendSysCmd.html index 5bd5917..b078f9f 100644 --- a/src/main/resources/templates/sendSysCmd.html +++ b/src/main/resources/templates/sendSysCmd.html @@ -63,39 +63,61 @@
+
+ +
+ 全选 +
+
+ + + + + + + + -
- -
- 全选 -
-
-
- -
-
-
- -
- - +
+ +
+ + +
-
-
-
- +
+
+ +
-
+
@@ -158,7 +180,6 @@ } }); }); - diff --git a/src/main/resources/templates/sendSysMail.html b/src/main/resources/templates/sendSysMail.html index 4527106..530ee0d 100644 --- a/src/main/resources/templates/sendSysMail.html +++ b/src/main/resources/templates/sendSysMail.html @@ -68,7 +68,15 @@ * 邮件标题:
- +
+ 中文 +
+
+ 英文 +
+
+ 越南文 +
@@ -77,7 +85,9 @@ * 邮件正文:
- + 中文 + 英文 + 越南文
@@ -280,10 +290,45 @@ }); function sendSysMail() { + //特殊字符验证 + var reg = new RegExp("[|#]",'g'); + var mailTitle1 = $("input[name='mailTitle1']").val(); + var mailTitle2 = $("input[name='mailTitle2']").val(); + var mailTitle3 = $("input[name='mailTitle3']").val(); + + var mailContent1 = $("textarea[name='mailContent1']").val(); + var mailContent2 = $("textarea[name='mailContent2']").val(); + var mailContent3 = $("textarea[name='mailContent3']").val(); + + if (reg.test(mailTitle1)){ + alert("中文标题不能有特殊字符") + } + if (reg.test(mailTitle2)){ + alert("英文标题不能有特殊字符") + } + if (reg.test(mailTitle3)){ + alert("越南文标题不能有特殊字符") + } + if (reg.test(mailContent1)){ + alert("中文正文不能有特殊字符") + } + + if (reg.test(mailContent2)){ + alert("英文正文不能有特殊字符") + } + if (reg.test(mailContent3)){ + alert("越南文正文不能有特殊字符") + } + + var mailTitle = mailTitle1+"|"+mailTitle2+"|"+mailTitle3; + + var mailContent = mailContent1+"|"+mailContent2+"|"+mailContent3; + + var erroCode = $('.SERVERID'); var serverId = $("#serverId").val().toString(); - var mailTitle = $("input[name='mailTitle']").val(); - var mailContent = $("textarea[name='mailContent']").val(); + + // var attach = $("input[name='attach']").val(); var isAttach = document.getElementById("isAttach").value; var sendTime = $("input[name='sendTime']").val();