diff --git a/src/main/java/com/jmfy/controller/LoginController.java b/src/main/java/com/jmfy/controller/LoginController.java index 37e4dfc..4fe32de 100644 --- a/src/main/java/com/jmfy/controller/LoginController.java +++ b/src/main/java/com/jmfy/controller/LoginController.java @@ -73,6 +73,7 @@ public class LoginController { powersVo.setAdminList(0); powersVo.setShopItemFlow(0); powersVo.setQuestion(0); + powersVo.setCheck(0); return; } for (Integer str : powerList) { @@ -112,6 +113,8 @@ public class LoginController { break; case 12: powersVo.setQuestion(0); + case 13: + powersVo.setCheck(0); break; } } @@ -209,6 +212,12 @@ public class LoginController { case 10: powers = "用户管理"; break; + case 12: + powers = "问卷"; + break; + case 13: + powers = "审核"; + break; } if (power.length() == 0) { power = new StringBuilder(powers); diff --git a/src/main/java/com/jmfy/controller/MailController.java b/src/main/java/com/jmfy/controller/MailController.java index 4da43da..dbc4a75 100644 --- a/src/main/java/com/jmfy/controller/MailController.java +++ b/src/main/java/com/jmfy/controller/MailController.java @@ -1,33 +1,223 @@ package com.jmfy.controller; +import com.jmfy.WebSecurityConfig; import com.jmfy.dao.MailDao; import com.jmfy.model.PersonalMail; +import com.jmfy.model.SCdkInfo; import com.jmfy.model.ServerMail; +import com.jmfy.model.vo.CDKInfoVo; +import com.jmfy.model.vo.ServerMailVo; +import com.jmfy.model.vo.ServerPMailVo; +import com.jmfy.utils.JsonUtil; +import com.jmfy.utils.SeqUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; @Controller public class MailController { @Autowired public MailDao mailDao; + @Resource + private SeqUtils seqUtils; + + private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - @PostMapping(value = "/sendSysMail") + @RequestMapping(value = "/deleteSysMailCheck", method = {RequestMethod.POST, RequestMethod.GET}) public @ResponseBody - int sendSysMail(@RequestBody ServerMail mail) throws Exception { + int removeSysMail(HttpServletRequest request) throws Exception { + HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); + String id = parameterMap.get("mailId"); + if(null ==id){ + return -1; + } + mailDao.removeSysMail(Integer.valueOf(id)); + return 0; + } + + + @RequestMapping(value = "/deletePMailCheck", method = {RequestMethod.POST, RequestMethod.GET}) + public @ResponseBody + int removePMail(HttpServletRequest request) throws Exception { + HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); + String id = parameterMap.get("mailId"); + if(null ==id){ + return -1; + } + mailDao.removePMail(Integer.valueOf(id)); + return 0; + } + + @RequestMapping(value = "/refuseSysMailCheck", method = {RequestMethod.POST, RequestMethod.GET}) + public @ResponseBody + int refuseSysMailCheck(HttpServletRequest request) throws Exception { + HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); + String id = parameterMap.get("mailId"); + if(null ==id){ + return -1; + } + ServerMail mail = mailDao.findSysMailId(Integer.valueOf(id)); + if(mail.getState()!=0){ + return 2; + } + mailDao.refreshSysMail(Integer.valueOf(id),1); + return 0; + } + + @RequestMapping(value = "/refusePMailCheck", method = {RequestMethod.POST, RequestMethod.GET}) + public @ResponseBody + int refusePMailCheck(HttpServletRequest request) throws Exception { + HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); + String id = parameterMap.get("mailId"); + if(null ==id){ + return -1; + } + PersonalMail mail = mailDao.findPersonalMailId(Integer.valueOf(id)); + if(mail.getState()!=0){ + return 2; + } + mailDao.refreshPMail(Integer.valueOf(id),1); + return 0; + } + + + + + @RequestMapping(value = "/toSendSysMail", method = {RequestMethod.POST, RequestMethod.GET}) + public @ResponseBody + int sendSysMail(HttpServletRequest request) throws Exception { + HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); + String id = parameterMap.get("mailId"); + if(null ==id){ + return -1; + } + + ServerMail mail = mailDao.findSysMailId(Integer.valueOf(id)); + if(mail.getState()!=0){ + return 2; + } + mailDao.refreshSysMail(Integer.valueOf(id),2); mailDao.sendSysMail(mail); return 0; } - @PostMapping(value = "/sendPersonalMail") + @PostMapping(value = "/tosendPersonalMail") public @ResponseBody - int sendPersonalMail(@RequestBody PersonalMail mail){ + int sendPersonalMail(HttpServletRequest request)throws Exception{ + HashMap parameterMap = JsonUtil.getInstence().getParameterMap(request); + String id = parameterMap.get("mailId"); + if(null ==id){ + return -1; + } + + PersonalMail mail = mailDao.findPersonalMailId(Integer.valueOf(id)); + if(mail.getState()!=0){ + return 2; + } + mailDao.refreshPMail(Integer.valueOf(id),2); mailDao.sendPersonalMail(mail); return 0; } + + @PostMapping(value = "/sendSysMailWithBack") + public @ResponseBody + int sendSysMailWithBack(@RequestBody ServerMail mail,HttpSession session) throws Exception{ + String useName = (String) session.getAttribute(WebSecurityConfig.SESSION_KEY); + if(null!= useName){ + mail.setCreateUser(useName); + } + mail.setCreateTime(sdf.format(new Date())); + mail.setId(seqUtils.getSequence("c_mail_id")); + mailDao.sendSysMailWithBack(mail); + return 0; + } + @PostMapping(value = "/sendPersonalMailWithBack") + public @ResponseBody + int sendPersonalMailWithBack(@RequestBody PersonalMail mail,HttpSession session)throws Exception{ + String useName = (String) session.getAttribute(WebSecurityConfig.SESSION_KEY); + if(null!= useName){ + mail.setCreateUser(useName); + } + mail.setCreateTime(sdf.format(new Date())); + mail.setId(seqUtils.getSequence("c_mail_id")); + mailDao.sendPersonalMailWithBack(mail); + return 0; + } + + + @RequestMapping(value = "/sysMailCheck", method = {RequestMethod.POST, RequestMethod.GET}) + public String sysMailCheck (HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { + List serverMails = mailDao.getSMailList(); + List sServerMailListVo = new ArrayList<>(); + for (ServerMail serverMail :serverMails){ + ServerMailVo serverMailVo = new ServerMailVo(); + serverMailVo.setId(serverMail.getId()); + serverMailVo.setServerId(serverMail.getServerId()); + serverMailVo.setMailContent(serverMail.getMailContent()); + serverMailVo.setMailTitle(serverMail.getMailTitle()); + serverMailVo.setVersion(serverMail.getVersion()); + serverMailVo.setCreateTime(serverMail.getCreateTime()); + serverMailVo.setState(serverMail.getState()); + serverMailVo.setCreateUser(serverMail.getCreateUser()); + String[] itemIds =new String[serverMail.getItemIds().size()]; + String[] itemNums = new String[serverMail.getItemNums().size()]; + for (int i = 0; i < serverMail.getItemIds().size(); i++) { + itemIds[i]=String.valueOf(serverMail.getItemIds().get(i)); + } + for (int i = 0; i < serverMail.getItemNums().size(); i++) { + itemNums[i]=String.valueOf(serverMail.getItemNums().get(i)); + } + serverMailVo.setRewards(JsonUtil.getInstence().getReward(itemIds,itemNums)); + sServerMailListVo.add(serverMailVo); + } + map.put("sServerMailListVo",sServerMailListVo); + return "sendSysMailCheck"; + } + + + @RequestMapping(value = "/pMailCheck", method = {RequestMethod.POST, RequestMethod.GET}) + public String pMailCheck (HttpSession session, ModelMap map , HttpServletRequest request) throws Exception { + List personalMail = mailDao.getPMailList(); + + List sServerMailListVo = new ArrayList<>(); + for (PersonalMail serverMail :personalMail){ + ServerPMailVo serverMailVo = new ServerPMailVo(); + serverMailVo.setId(serverMail.getId()); + serverMailVo.setUserId(serverMail.getUserId()); + serverMailVo.setServerId(serverMail.getServerId()); + serverMailVo.setMailContent(serverMail.getMailContent()); + serverMailVo.setMailTitle(serverMail.getMailTitle()); + serverMailVo.setVersion(serverMail.getVersion()); + serverMailVo.setCreateTime(serverMail.getCreateTime()); + serverMailVo.setState(serverMail.getState()); + serverMailVo.setCreateUser(serverMail.getCreateUser()); + String[] itemIds =new String[serverMail.getItemIds().size()]; + String[] itemNums = new String[serverMail.getItemNums().size()]; + for (int i = 0; i < serverMail.getItemIds().size(); i++) { + itemIds[i]=String.valueOf(serverMail.getItemIds().get(i)); + } + for (int i = 0; i < serverMail.getItemNums().size(); i++) { + itemNums[i]=String.valueOf(serverMail.getItemNums().get(i)); + } + serverMailVo.setRewards(JsonUtil.getInstence().getReward(itemIds,itemNums)); + sServerMailListVo.add(serverMailVo); + } + map.put("sServerMailListVo",sServerMailListVo); + return "sendPMailCheck"; + } + + + } diff --git a/src/main/java/com/jmfy/dao/MailDao.java b/src/main/java/com/jmfy/dao/MailDao.java index 2182121..ba245bb 100644 --- a/src/main/java/com/jmfy/dao/MailDao.java +++ b/src/main/java/com/jmfy/dao/MailDao.java @@ -3,9 +3,28 @@ package com.jmfy.dao; import com.jmfy.model.PersonalMail; import com.jmfy.model.ServerMail; +import java.util.List; + public interface MailDao { - void sendSysMail(ServerMail mail) throws Exception; + void sendSysMail(ServerMail mail) throws Exception; - void sendPersonalMail(PersonalMail mail); + void sendPersonalMail(PersonalMail mail); + + void sendSysMailWithBack(ServerMail mail) throws Exception; + + void sendPersonalMailWithBack(PersonalMail mail) throws Exception; + + List getSMailList() throws Exception; + + List getPMailList() throws Exception; + + ServerMail findSysMailId(int id) throws Exception; + + PersonalMail findPersonalMailId(int id) throws Exception; + + void removeSysMail(int id) throws Exception; + void removePMail(int id) throws Exception; + void refreshSysMail(int id,int state) throws Exception; + void refreshPMail(int id,int state) throws Exception; } diff --git a/src/main/java/com/jmfy/dao/impl/MailDaoImpl.java b/src/main/java/com/jmfy/dao/impl/MailDaoImpl.java index 12c85fc..289a6c9 100644 --- a/src/main/java/com/jmfy/dao/impl/MailDaoImpl.java +++ b/src/main/java/com/jmfy/dao/impl/MailDaoImpl.java @@ -14,6 +14,7 @@ import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.List; @Component public class MailDaoImpl implements MailDao { @@ -66,4 +67,83 @@ public class MailDaoImpl implements MailDao { RedisUtil.getInstence().putMapEntry(String.valueOf(mail.getServerId()),RedisUserKey.READY_TO_USER_MAIL+RedisUserKey.Delimiter_colon,uid[i],mailPersonalCache,240); } } + + @Override + public List getSMailList() throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(); + return mongoTemplate.find(query,ServerMail.class); + + } + + + @Override + public List getPMailList() throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(); + return mongoTemplate.find(query,PersonalMail.class); + + } + + @Override + public void sendSysMailWithBack(ServerMail mail) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + mongoTemplate.insert(mail); + } + + @Override + public void sendPersonalMailWithBack(PersonalMail mail)throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + mongoTemplate.insert(mail); + } + + @Override + public ServerMail findSysMailId(int id) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(); + query.addCriteria(Criteria.where("_id").is(id)); + return mongoTemplate.findOne(query, ServerMail.class); + } + @Override + public PersonalMail findPersonalMailId(int id) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(); + query.addCriteria(Criteria.where("_id").is(id)); + return mongoTemplate.findOne(query, PersonalMail.class); + } + + @Override + public void removeSysMail(int id) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(); + query.addCriteria(Criteria.where("_id").is(id)); + mongoTemplate.remove(query, ServerMail.class); + } + + @Override + public void removePMail(int id) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(); + query.addCriteria(Criteria.where("_id").is(id)); + mongoTemplate.remove(query, PersonalMail.class); + } + + @Override + public void refreshSysMail(int id,int state) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(Criteria.where("_id").is(id)); + Update update = new Update(); + update.set("state",state); + mongoTemplate.updateMulti(query, update, ServerMail.class); + } + + @Override + public void refreshPMail(int id ,int state) throws Exception { + MongoTemplate mongoTemplate = connect.getMongoTemplete(Constant.dbName); + Query query = new Query(Criteria.where("_id").is(id)); + Update update = new Update(); + update.set("state",state); + mongoTemplate.updateMulti(query, update, PersonalMail.class); + } + } diff --git a/src/main/java/com/jmfy/model/PersonalMail.java b/src/main/java/com/jmfy/model/PersonalMail.java index 3d16a22..2f7295d 100644 --- a/src/main/java/com/jmfy/model/PersonalMail.java +++ b/src/main/java/com/jmfy/model/PersonalMail.java @@ -1,8 +1,50 @@ package com.jmfy.model; -public class PersonalMail extends ServerMail { +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Field; + +import java.util.List; + +public class PersonalMail { + + @Id + private int id; + + @Field(value = "serverId") + private int serverId; + + @Field(value = "mailTitle") + private String mailTitle; + + @Field(value = "mailContent") + private String mailContent; + + @Field(value = "isAttach") + private int isAttach; + + @Field(value = "itemIds") + private List itemIds; + + @Field(value = "itemNums") + private List itemNums; + + @Field(value = "sendTime") + private String sendTime; + + @Field(value = "version") + private int version; + @Field(value = "userId") public String userId; + @Field(value = "createtime") + private String createTime; + + @Field(value = "state") + private int state;//0 1拒绝 2审核通过 + @Field(value = "createUser") + private String createUser;//创建者 + + public String getUserId() { return userId; } @@ -10,4 +52,100 @@ public class PersonalMail extends ServerMail { public void setUserId(String uid) { this.userId = uid; } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public int getServerId() { + return serverId; + } + + public void setServerId(int serverId) { + this.serverId = serverId; + } + + public String getMailTitle() { + return mailTitle; + } + + public void setMailTitle(String mailTitle) { + this.mailTitle = mailTitle; + } + + public String getMailContent() { + return mailContent; + } + + public void setMailContent(String mailContent) { + this.mailContent = mailContent; + } + + public int getIsAttach() { + return isAttach; + } + + public void setIsAttach(int isAttach) { + this.isAttach = isAttach; + } + + public List getItemIds() { + return itemIds; + } + + public void setItemIds(List itemIds) { + this.itemIds = itemIds; + } + + public List getItemNums() { + return itemNums; + } + + public void setItemNums(List itemNums) { + this.itemNums = itemNums; + } + + public String getSendTime() { + return sendTime; + } + + public void setSendTime(String sendTime) { + this.sendTime = sendTime; + } + + public int getVersion() { + return version; + } + + public void setVersion(int version) { + this.version = version; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } } diff --git a/src/main/java/com/jmfy/model/ServerMail.java b/src/main/java/com/jmfy/model/ServerMail.java index 472e50a..dd60e68 100644 --- a/src/main/java/com/jmfy/model/ServerMail.java +++ b/src/main/java/com/jmfy/model/ServerMail.java @@ -1,25 +1,50 @@ package com.jmfy.model; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; +import org.springframework.data.mongodb.core.mapping.Field; + import java.util.List; +@Document(collection = "server_mail") public class ServerMail { + @Id + private int id; + + @Field(value = "serverId") private int serverId; + @Field(value = "mailTitle") private String mailTitle; + @Field(value = "mailContent") private String mailContent; + @Field(value = "isAttach") private int isAttach; + @Field(value = "itemIds") private List itemIds; + @Field(value = "itemNums") private List itemNums; + @Field(value = "sendTime") private String sendTime; + @Field(value = "createtime") + private String createTime; + + @Field(value = "version") private int version; + @Field(value = "state") + private int state;//0 -1拒绝 1 审核通过 + + @Field(value = "createUser") + private String createUser;//创建者 + // "mailTitle": mailTitle, // "mailContent": mailContent, // "isAttach": isAttach, @@ -101,4 +126,36 @@ public class ServerMail { public void setVersion(int version) { this.version = version; } + + public int getId() { + return id; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateTime() { + return createTime; + } + + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + public void setId(int id) { + this.id = id; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } } diff --git a/src/main/java/com/jmfy/model/vo/PowersVo.java b/src/main/java/com/jmfy/model/vo/PowersVo.java index 0632eb1..9cefe2f 100644 --- a/src/main/java/com/jmfy/model/vo/PowersVo.java +++ b/src/main/java/com/jmfy/model/vo/PowersVo.java @@ -15,6 +15,7 @@ public class PowersVo { public int arenaInfo=1; public int shopItemFlow =1; public int question =1; + public int check =1; public void setAdminList(int adminList) { this.adminList = adminList; } @@ -65,4 +66,12 @@ public class PowersVo { public void setQuestion(int question) { this.question = question; } + + public int getCheck() { + return check; + } + + public void setCheck(int check) { + this.check = check; + } } diff --git a/src/main/java/com/jmfy/model/vo/ServerMailVo.java b/src/main/java/com/jmfy/model/vo/ServerMailVo.java new file mode 100644 index 0000000..7946e25 --- /dev/null +++ b/src/main/java/com/jmfy/model/vo/ServerMailVo.java @@ -0,0 +1,94 @@ +package com.jmfy.model.vo; + +import java.util.List; + +public class ServerMailVo { + + private int id; + + private int serverId; + + private String mailTitle; + + private String createTime; + private String mailContent; + private String rewards; + private int version; + private int state; + private String createUser; + + public int getServerId() { + return serverId; + } + + public void setServerId(int serverId) { + this.serverId = serverId; + } + + public String getMailTitle() { + return mailTitle; + } + + public String getMailContent() { + return mailContent; + } + + + public void setMailTitle(String mailTitle) { + this.mailTitle = mailTitle; + } + + public void setMailContent(String mailContent) { + this.mailContent = mailContent; + } + + + public int getVersion() { + return version; + } + + + public int getId() { + return id; + } + + public String getRewards() { + return rewards; + } + + public void setVersion(int version) { + this.version = version; + } + + public void setRewards(String rewards) { + this.rewards = rewards; + } + + public void setId(int id) { + this.id = id; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } +} diff --git a/src/main/java/com/jmfy/model/vo/ServerPMailVo.java b/src/main/java/com/jmfy/model/vo/ServerPMailVo.java new file mode 100644 index 0000000..37e7ab9 --- /dev/null +++ b/src/main/java/com/jmfy/model/vo/ServerPMailVo.java @@ -0,0 +1,101 @@ +package com.jmfy.model.vo; + +public class ServerPMailVo { + + private int id; + + private int serverId; + private String userId; + + private String mailTitle; + + private String createTime; + private String mailContent; + private String rewards; + private int version; + private int state; + private String createUser; + + public int getServerId() { + return serverId; + } + + public void setServerId(int serverId) { + this.serverId = serverId; + } + + public String getMailTitle() { + return mailTitle; + } + + public String getMailContent() { + return mailContent; + } + + + public void setMailTitle(String mailTitle) { + this.mailTitle = mailTitle; + } + + public void setMailContent(String mailContent) { + this.mailContent = mailContent; + } + + + public int getVersion() { + return version; + } + + + public int getId() { + return id; + } + + public String getRewards() { + return rewards; + } + + public void setVersion(int version) { + this.version = version; + } + + public void setRewards(String rewards) { + this.rewards = rewards; + } + + public void setId(int id) { + this.id = id; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } +} diff --git a/src/main/java/com/jmfy/utils/JsonUtil.java b/src/main/java/com/jmfy/utils/JsonUtil.java index 219c082..76fba10 100644 --- a/src/main/java/com/jmfy/utils/JsonUtil.java +++ b/src/main/java/com/jmfy/utils/JsonUtil.java @@ -51,6 +51,12 @@ public class JsonUtil { StringBuilder reward = new StringBuilder(); String[] itemIds = request.getParameterValues("itemIds[]"); String[] itemNums = request.getParameterValues("itemNums[]"); + return getReward(itemIds,itemNums); + } + + + public String getReward(String[] itemIds,String[] itemNums) { + StringBuilder reward = new StringBuilder(); if (itemIds.length ==0 || itemNums.length ==0 ){ return reward.toString(); @@ -68,6 +74,7 @@ public class JsonUtil { return reward.toString(); } + public static String getServiceKey(String serviceName, String host, String port) { StringBuilder sb = new StringBuilder(); return sb.append(serviceName).append("|") diff --git a/src/main/resources/static/html/member-add.html b/src/main/resources/static/html/member-add.html index c2d9070..d2e6058 100644 --- a/src/main/resources/static/html/member-add.html +++ b/src/main/resources/static/html/member-add.html @@ -70,12 +70,15 @@ + + + Gm管理 @@ -83,14 +86,14 @@ 封號/解封/禁言/解封 + + 审核 diff --git a/src/main/resources/static/html/sendPersonalMail.html b/src/main/resources/static/html/sendPersonalMail.html index 56776a6..9f8ac01 100644 --- a/src/main/resources/static/html/sendPersonalMail.html +++ b/src/main/resources/static/html/sendPersonalMail.html @@ -268,7 +268,7 @@ dataType: "json", contentType:'application/json', - url: "/sendPersonalMail", + url: "/sendPersonalMailWithBack", success: function (data) { if (data == 0) { layer.msg('发送邮件成功!', {icon: 6, time: 1000}); diff --git a/src/main/resources/static/html/sendSysMail.html b/src/main/resources/static/html/sendSysMail.html index 5a00937..0071ffb 100644 --- a/src/main/resources/static/html/sendSysMail.html +++ b/src/main/resources/static/html/sendSysMail.html @@ -264,7 +264,7 @@ function sendSysMail() { "version": version }) , - url: "/sendSysMail", + url: "/sendSysMailWithBack", dataType: "json", contentType:'application/json', diff --git a/src/main/resources/static/html/sendSysNotice.html b/src/main/resources/static/html/sendSysNotice.html index 07e853f..9075bb9 100644 --- a/src/main/resources/static/html/sendSysNotice.html +++ b/src/main/resources/static/html/sendSysNotice.html @@ -36,7 +36,7 @@
-
- + @@ -95,7 +95,7 @@ $(function(){ }); }); -$('#updataSYSQuest').load(function () { +$('#updataSYSNotice').load(function () { // 根据后台返回值处理结果 var text=$(this).contents().find("body").text(); if (text != 0) { diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 113cf0c..faa4061 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -107,6 +107,16 @@ +
+ +
@@ -159,6 +169,19 @@
+
+
+ +
+
diff --git a/src/main/resources/templates/sendPMailCheck.html b/src/main/resources/templates/sendPMailCheck.html new file mode 100644 index 0000000..febedb4 --- /dev/null +++ b/src/main/resources/templates/sendPMailCheck.html @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + 审核信息 + + + +
+

审核信息

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
服务器id玩家id标题内容创建时间附件客户端版本号发件人状态操作
+ 待审核 + 拒绝 + 通过 + + + + +
+
+
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/sendSysMailCheck.html b/src/main/resources/templates/sendSysMailCheck.html new file mode 100644 index 0000000..cfb220a --- /dev/null +++ b/src/main/resources/templates/sendSysMailCheck.html @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + 审核信息 + + + +
+

审核信息

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
服务器id标题内容创建时间附件客户端版本号发件人状态操作
+ 待审核 + 拒绝 + 通过 + + + + +
+
+
+ + + + + + + + + + + + + \ No newline at end of file