提交

src/main/java/com/fjhx/email/controller/MailController.java

@@ -145,6 +145,7 @@ public class MailController {
     @PostMapping("addEnterpriseMailbox")
     public R addEnterpriseMailbox(@RequestBody EnterpriseMailbox enterpriseMailbox) {
         enterpriseMailboxService.add(enterpriseMailbox);
+        userLogin(enterpriseMailbox.getUserId());
         return R.ok();
     }
 
@@ -154,6 +155,7 @@ public class MailController {
     @PostMapping("addPersonalMailbox")
     public R addPersonalMailbox(@RequestBody PersonalMailbox personalMailbox) {
         personalMailboxService.add(personalMailbox);
+        userLogin(personalMailbox.getUserId());
         return R.ok();
     }
 

src/main/java/com/fjhx/email/entity/EnterpriseFolder.java

@@ -44,4 +44,7 @@ public class EnterpriseFolder extends BaseEntity {
      * 同步邮件状态: 1同步 0不同步
      */
     private Integer syncStatus;
+
+    private Integer delFlag;
+
 }

src/main/java/com/fjhx/email/entity/PersonalFolder.java

@@ -45,4 +45,6 @@ public class PersonalFolder extends BaseEntity {
      */
     private Integer syncStatus;
 
+    private Integer delFlag;
+
 }

src/main/java/com/fjhx/email/mapper/xml/MailMapper.xml

@@ -60,7 +60,7 @@
         (select 2 type,
         0 skip,
         em.id,
-        em.mail_user_prefix + '@' + ed.domain_name mail_user,
+        CONCAT(em.mail_user_prefix,'@',ed.domain_name) mail_user,
         em.mail_password,
         ed.receive_host,
         ed.receive_port,

src/main/java/com/fjhx/email/service/impl/EnterpriseMailboxServiceImpl.java

@@ -63,6 +63,7 @@ public class EnterpriseMailboxServiceImpl extends ServiceImpl<EnterpriseMailboxM
                 enterpriseFolder.setMailboxId(enterpriseMailboxId);
                 enterpriseFolder.setName(item);
                 enterpriseFolder.setSyncStatus(1);
+                enterpriseFolder.setDelFlag(0);
                 return enterpriseFolder;
             }).collect(Collectors.toList());
 
@@ -76,6 +77,7 @@ public class EnterpriseMailboxServiceImpl extends ServiceImpl<EnterpriseMailboxM
         enterpriseMailbox.setDefaultStatus(0);
         enterpriseMailbox.setSyncStatus(1);
         enterpriseMailbox.setStatus(1);
+        enterpriseMailbox.setDelFlag(0);
         this.save(enterpriseMailbox);
     }
 

src/main/java/com/fjhx/email/service/impl/PersonalMailboxServiceImpl.java

@@ -51,6 +51,7 @@ public class PersonalMailboxServiceImpl extends ServiceImpl<PersonalMailboxMappe
                 personalFolder.setMailboxId(personalMailboxId);
                 personalFolder.setName(item);
                 personalFolder.setSyncStatus(1);
+                personalFolder.setDelFlag(0);
                 return personalFolder;
             }).collect(Collectors.toList());
 
@@ -64,6 +65,7 @@ public class PersonalMailboxServiceImpl extends ServiceImpl<PersonalMailboxMappe
         personalMailbox.setStatus(1);
         personalMailbox.setSyncStatus(1);
         personalMailbox.setDefaultStatus(0);
+        personalMailbox.setDelFlag(0);
 
         this.save(personalMailbox);
     }

src/main/resources/application-dev.yml

@@ -15,6 +15,6 @@ mail:
   # 超过多少次后将不再同步此邮箱
   errorNumber: 5
   # 获取邮箱类型 1国内邮箱 2国外邮箱
-  mailType: 2
+  mailType: 1
   # 调用主服务url前缀
   urlPrefix: http://localhost:9898/open/mail/