|
@@ -50,23 +50,14 @@ public class EmailConfigController extends BaseController {
|
|
|
@RequestMapping("save-email-config")
|
|
|
public ResultVo saveEmailConfig(@RequestBody MailboxInfoVO mailboxInfoVO){
|
|
|
ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS.getCode());
|
|
|
- SuccessVO successVO = new SuccessVO();
|
|
|
- vo.setData(successVO);
|
|
|
try{
|
|
|
if(mailboxInfoVO.getId() == null && !emailConfigService.checkEmailUnique(mailboxInfoVO.getEmail())){
|
|
|
- successVO.setMsg("邮箱地址已存在,无需添加");
|
|
|
- successVO.setStatus(0);
|
|
|
- vo.setData(successVO);
|
|
|
vo.setCode(ResultCode.SAVE_FAILED.getCode());
|
|
|
vo.setMsg("邮箱地址已存在,无需添加");
|
|
|
return vo;
|
|
|
}
|
|
|
emailConfigService.saveEmailConfig(mailboxInfoVO);
|
|
|
- successVO.setMsg(ResultCode.SAVE_SUCCESS.getMsg());
|
|
|
- successVO.setStatus(1);
|
|
|
}catch (Exception e){
|
|
|
- successVO.setMsg(ResultCode.SAVE_FAILED.getMsg());
|
|
|
- successVO.setStatus(0);
|
|
|
vo.setCode(ResultCode.SAVE_FAILED.getCode());
|
|
|
logger.error(e.getMessage(),e);
|
|
|
}
|
|
@@ -81,16 +72,11 @@ public class EmailConfigController extends BaseController {
|
|
|
@RequestMapping("delete-email-config")
|
|
|
public ResultVo deleteEmailConfig(@RequestBody IdVO idVO){
|
|
|
ResultVo vo = new ResultVo(ResultCode.DELETE_SUCCESS.getCode());
|
|
|
- SuccessVO successVO = new SuccessVO();
|
|
|
- vo.setData(successVO);
|
|
|
try{
|
|
|
emailConfigService.deleteEmailConfig(idVO.getIdList());
|
|
|
- successVO.setMsg(ResultCode.DELETE_SUCCESS.getMsg());
|
|
|
- successVO.setStatus(1);
|
|
|
}catch (Exception e){
|
|
|
logger.error(e.getMessage(),e);
|
|
|
- successVO.setMsg(ResultCode.DELETE_FAILED.getMsg());
|
|
|
- successVO.setStatus(0);
|
|
|
+ vo.setCode(ResultCode.DELETE_FAILED.getCode());
|
|
|
}
|
|
|
return vo;
|
|
|
}
|
|
@@ -103,18 +89,12 @@ public class EmailConfigController extends BaseController {
|
|
|
@RequestMapping("connect-test")
|
|
|
public ResultVo connectTest(@RequestBody MailboxInfoVO mailboxInfoVO){
|
|
|
ResultVo vo = new ResultVo(ResultCode.SUCCESS.getCode());
|
|
|
- SuccessVO successVO = new SuccessVO();
|
|
|
- vo.setData(successVO);
|
|
|
String msg = "";
|
|
|
try{
|
|
|
msg = emailConfigService.connectTest(mailboxInfoVO);
|
|
|
vo.setMsg(msg);
|
|
|
- successVO.setMsg(msg);
|
|
|
- successVO.setStatus(1);
|
|
|
}catch (Exception e){
|
|
|
vo.setMsg(e.getMessage());
|
|
|
- successVO.setMsg(e.getMessage());
|
|
|
- successVO.setStatus(0);
|
|
|
}
|
|
|
return vo;
|
|
|
}
|