I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent 84694611c8 c49fce4da1
commit 67f061fff9
4 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File

17
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java
Unescape Escape View File

@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.MailConfig;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
@ -230,17 +231,23 @@ public class SysConfigController extends CoreBaseController {
}
}
@GetMapping("/send-test-mail/{to}")
@GetMapping("/send-test-mail")
@ApiOperation(value = "邮件测试")
public ResultBean sendTestMail(@PathVariable("to") String to){
public ResultBean sendTestMail(MailConfig mailConfig){
try {
ValidatorBean.checkNotNull(to,"收件人不能为空");
ValidatorBean.beginValid(mailConfig)
.notNull("mailHost",mailConfig.getMailHost())
.notNull("mailPort",mailConfig.getMailPort())
.notNull("mailUser",mailConfig.getMailUser())
.notNull("mailPassword",mailConfig.getMailPassword())
.notNull("mailNick",mailConfig.getMailNick())
.notNull("testTo",mailConfig.getTestTo());
mailUtil.init();
mailUtil.init(mailConfig);
mailUtil.setSubject("测试邮件");
mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getDescription());
mailUtil.setBody("测试邮件");
mailUtil.setTo(to);
mailUtil.setTo(mailConfig.getTestTo());
mailUtil.send();
return ResultBean.success("测试邮件已发送").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){

42
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java
Unescape Escape View File

@ -3,11 +3,14 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import cn.estsh.i3plus.pojo.platform.bean.SysFile;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@ -58,7 +61,9 @@ public class SysFileController extends CoreBaseController{
public ResultBean updateSysFile(SysFile sysFile){
try {
// 条件验证
ValidatorBean.beginValid(sysFile).notNull("name",sysFile.getName());
ValidatorBean.beginValid(sysFile)
.notNull("id",sysFile.getId())
.notNull("name",sysFile.getName());
sysFileService.updateSysFile(sysFile);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -242,4 +247,39 @@ public class SysFileController extends CoreBaseController{
}
}
@PostMapping(value = "/insert")
@ApiOperation(value = "新增文件资源",notes = "新增文件资源")
public ResultBean insertSysFile(@RequestBody SysFile sysFile){
try {
// 条件验证
ValidatorBean.beginValid(sysFile)
.notNull("dfsFileName",sysFile.getDfsFileName())
.notNull("dfsGroupName",sysFile.getDfsGroupName())
.notNull("fileOriginalName",sysFile.getFileOriginalName());
// 文件类型验证
SysDictionary dictionary = dictionaryService.getSysDictionaryByParentCodeAndCode(BaseConstWords.DICTIONARY_FILE_TYPE,
StringTool.getStringFileSuffix(sysFile.getFileOriginalName(),false));
if(dictionary == null){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode())
.setErrorDetail("文件格式不支持")
.setErrorSolution("请到字典管理中添加文件类型")
.build();
}
// 初始化数据
sysFile.setFileTypeId(dictionary.getId());
sysFile.setFileTypeName(dictionary.getName());
sysFile = sysFileService.insertSysFile(sysFile);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile);
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java
Unescape Escape View File

@ -60,7 +60,7 @@ public class MessageMailQueueReceiver {
mailUtil.setBody(msg.getMessageContent());
mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue());
//信息已处理
// mailUtil.send();
mailUtil.send();
}else {
// 收件人信息
@ -91,7 +91,7 @@ public class MessageMailQueueReceiver {
mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
mailUtil.setBody(msg.getMessageContent());
mailUtil.setTo(sysUser.getUserEmail());
// mailUtil.send();
mailUtil.send();
}
msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ","));

13
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.util;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.MailConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -58,6 +59,18 @@ public class MailUtil {
return this;
}
//初始化服务器邮箱参数
public MailUtil init(MailConfig mailConfig) {
this.smtpHost = mailConfig.getMailHost();
this.smtpPort = mailConfig.getMailPort();
this.from = mailConfig.getMailUser();
this.nick = mailConfig.getMailNick();
this.smtpUser = mailConfig.getMailUser();
this.smtpPassword = mailConfig.getMailPassword();
this.isAuthenticationSMTP = true;
return this;
}
/**
* 设置收件人地址
*

Write Preview
Loading…
Cancel
Save