邮箱配置问题修复

service-base/src/main/java/com/simuwang/base/common/enums/EmailCron.java

@@ -9,7 +9,7 @@ import java.util.stream.Stream;
  * Description: ${DESCRIPTION}
  */
 public enum EmailCron {
-    EVERY_HOUR("每小时执行", "0 0 0/1 * * *"), ONE_AM("每天一点整", "0 0 13 * * *");
+    EVERY_HOUR("1", "0 0 0/1 * * *"), ONE_AM("2", "0 0 13 * * *");
 
     private final String text;
     private final String cron;

service-base/src/main/java/com/simuwang/base/pojo/dos/MailboxInfoDO.java

@@ -15,11 +15,11 @@ public class MailboxInfoDO {
      */
     @TableId(value = "id")
     private Integer id;
-    /**
-     * 用户id
-     */
-    @TableField(value = "user_id")
-    private Integer userId;
+//    /**
+//     * 用户id
+//     */
+//    @TableField(value = "user_id")
+//    private Integer userId;
     /**
      * 邮箱类型:1-QQ邮箱,2-腾讯企业邮箱,3-网易邮箱,4-新浪邮箱,99-其他
      */

service-base/src/main/resources/mapper/MailBoxInfoMapper.xml

@@ -3,7 +3,6 @@
 <mapper namespace="com.simuwang.base.mapper.MailboxInfoMapper">
     <resultMap id="BaseResultMap" type="com.simuwang.base.pojo.dos.MailboxInfoDO">
         <id column="id" property="id"/>
-        <result column="user_id" property="userId"/>
         <result column="type" property="type"/>
         <result column="email" property="email"/>
         <result column="password" property="password"/>
@@ -48,7 +47,7 @@
         </if>
     </select>
     <sql id="selectConfigVo">
-        select id, user_id, type, email, password, protocol, server, port, cron, open_status,description,isvalid,creatorid,createtime,updaterid,updatetime
+        select id, type, email, password, protocol, server, port, cron, open_status,description,isvalid,creatorid,createtime,updaterid,updatetime
         from PPW_EMAIL.mailbox_info
     </sql>
     <select id="checkEmailUnique" resultType="com.simuwang.base.pojo.dos.MailboxInfoDO">

service-manage/src/main/java/com/simuwang/manage/api/email/EmailConfigController.java

@@ -6,6 +6,7 @@ import com.simuwang.base.pojo.vo.MailboxInfoTableVO;
 import com.simuwang.base.pojo.vo.MailboxInfoVO;
 import com.simuwang.manage.api.base.BaseController;
 import com.simuwang.manage.service.EmailConfigService;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +49,7 @@ public class EmailConfigController extends BaseController {
     @RequestMapping("save-email-config")
     public AjaxResult saveEmailConfig(@RequestBody MailboxInfoVO mailboxInfoVO){
         try{
-            if(mailboxInfoVO.getId() == null && emailConfigService.checkEmailUnique(mailboxInfoVO.getEmail())){
+            if(mailboxInfoVO.getId() == null && !emailConfigService.checkEmailUnique(mailboxInfoVO.getEmail())){
                 return AjaxResult.error("邮箱地址已存在，无需添加");
             }
             emailConfigService.saveEmailConfig(mailboxInfoVO);
@@ -65,7 +66,7 @@ public class EmailConfigController extends BaseController {
      * @return
      */
     @RequestMapping("delete-email-config")
-    public AjaxResult deleteEmailConfig(String ids){
+    public AjaxResult deleteEmailConfig(@RequestParam("ids") String ids){
         try{
             emailConfigService.deleteEmailConfig(ids);
         }catch (Exception e){

service-manage/src/main/java/com/simuwang/manage/service/impl/EmailConfigServiceImpl.java

@@ -49,12 +49,11 @@ public class EmailConfigServiceImpl implements EmailConfigService {
         MailboxInfoDO mailboxInfoDO = toMailboxInfoDO(mailboxInfoVO);
         if(mailboxInfoVO.getId() == null){
             mailboxInfoDO.setCreateTime(new Date());
+            mailboxInfoDO.setCron(EmailCron.getEmailCronByText(mailboxInfoVO.getCron()).getCron());
             emailConfigMapper.insert(mailboxInfoDO);
         }else{
             emailConfigMapper.updateById(mailboxInfoDO);
         }
-        //添加定时任务
-
     }
 
     @Override
@@ -64,6 +63,7 @@ public class EmailConfigServiceImpl implements EmailConfigService {
         mailboxInfoDTO.setPassword(mailboxInfoVO.getPassword());
         mailboxInfoDTO.setPort(mailboxInfoVO.getPort());
         mailboxInfoDTO.setHost(mailboxInfoVO.getServer());
+        mailboxInfoDTO.setProtocol(mailboxInfoVO.getProtocol());
         Store store = EmailUtil.getStoreNew(mailboxInfoDTO);
         if(store != null){
             try {
@@ -103,6 +103,7 @@ public class EmailConfigServiceImpl implements EmailConfigService {
         mailboxInfoDO.setPassword(mailboxInfoVO.getPassword());
         mailboxInfoDO.setType(mailboxInfoVO.getType());
         mailboxInfoDO.setProtocol(mailboxInfoVO.getProtocol());
+        mailboxInfoDO.setOpenStatus(mailboxInfoVO.getOpenStatus());
         mailboxInfoDO.setUpdateTime(new Date());
         mailboxInfoDO.setUpdaterId(999);
         mailboxInfoDO.setCreatorId(999);