邮件

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/po/EnterpriseFolder.java

@@ -33,21 +33,6 @@ public class EnterpriseFolder extends BaseIdPo {
     private String name;
 
     /**
-     * 上次同步邮件number
-     */
-    private Integer lastMessageNumber;
-
-    /**
-     * 上次同步邮件发送时间
-     */
-    private Date lastReceivedDate;
-
-    /**
-     * 同步邮件状态: 1同步 0不同步
-     */
-    private Integer syncStatus;
-
-    /**
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)

hx-mail/src/main/java/com/fjhx/mail/entity/enterprise/po/EnterpriseMailbox.java

@@ -60,4 +60,9 @@ public class EnterpriseMailbox extends BasePo {
     @NotNull(message = "绑定用户id不能为空")
     private Long userId;
 
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
 }

hx-mail/src/main/java/com/fjhx/mail/entity/personal/po/PersonalFolder.java

@@ -2,18 +2,19 @@ package com.fjhx.mail.entity.personal.po;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.common.core.domain.BaseIdPo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BaseIdPo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * <p>
  * 个人邮箱文件夹
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-07
  */
 @Getter
@@ -32,21 +33,6 @@ public class PersonalFolder extends BaseIdPo {
     private String name;
 
     /**
-     * 上次同步邮件number
-     */
-    private Integer lastMessageNumber;
-
-    /**
-     * 上次同步邮件发送时间
-     */
-    private Date lastReceivedDate;
-
-    /**
-     * 同步邮件状态: 1同步 0不同步
-     */
-    private Integer syncStatus;
-
-    /**
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)

hx-mail/src/main/java/com/fjhx/mail/entity/personal/po/PersonalMailbox.java

@@ -95,4 +95,9 @@ public class PersonalMailbox extends BasePo {
      */
     private Long userId;
 
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
 }

hx-mail/src/main/java/com/fjhx/mail/service/enterprise/impl/EnterpriseMailboxServiceImpl.java

@@ -72,6 +72,7 @@ public class EnterpriseMailboxServiceImpl extends ServiceImpl<EnterpriseMailboxM
     public JSONObject add(EnterpriseMailboxDto enterpriseMailboxDto) {
         enterpriseMailboxDto.setCreateUser(SecurityUtils.getUserId());
         enterpriseMailboxDto.setUpdateUser(SecurityUtils.getUserId());
+        enterpriseMailboxDto.setTenantId(SecurityUtils.getTenantId());
         Long domainId = enterpriseMailboxDto.getDomainId();
         EnterpriseDomain domain = enterpriseDomainService.getById(domainId);
         if (domain == null) {

hx-mail/src/main/java/com/fjhx/mail/service/message/impl/InfoServiceImpl.java

@@ -83,6 +83,7 @@ public class InfoServiceImpl implements InfoService {
     public String sendMail(SendDto dto) {
         Integer type = dto.getType();
         Long mailboxId = dto.getMailboxId();
+        String urlPrefix;
 
         StringJoiner urlJoiner = new StringJoiner("/");
         urlJoiner.add("sendMail");
@@ -97,6 +98,11 @@ public class InfoServiceImpl implements InfoService {
             urlJoiner.add(personalMailbox.getMailUser());
             urlJoiner.add(personalMailbox.getMailPassword());
 
+            if (Objects.equals(personalMailbox.getType(), 2)) {
+                urlPrefix = MailServiceConfig.abroadUrlPrefix;
+            } else {
+                urlPrefix = MailServiceConfig.urlPrefix;
+            }
         } else {
 
             EnterpriseMailbox enterpriseMailbox = enterpriseMailboxService.getById(mailboxId);
@@ -111,9 +117,14 @@ public class InfoServiceImpl implements InfoService {
             urlJoiner.add(enterpriseMailbox.getMailUserPrefix() + "@" + enterpriseDomain.getDomainName());
             urlJoiner.add(enterpriseMailbox.getMailPassword());
 
+            if (Objects.equals(enterpriseDomain.getType(), 2)) {
+                urlPrefix = MailServiceConfig.abroadUrlPrefix;
+            } else {
+                urlPrefix = MailServiceConfig.urlPrefix;
+            }
         }
 
-        return HttpUtil.post(MailServiceConfig.urlPrefix + urlJoiner, JSON.toJSONString(dto));
+        return HttpUtil.post(urlPrefix + urlJoiner, JSON.toJSONString(dto));
     }
 
     private void subordinateDeptId(Long deptId, Set<Long> deptSet, Map<Long, List<SysDept>> parentDeptMap) {

hx-mail/src/main/java/com/fjhx/mail/service/personal/impl/PersonalMailboxServiceImpl.java

@@ -56,6 +56,7 @@ public class PersonalMailboxServiceImpl extends ServiceImpl<PersonalMailboxMappe
         personalMailboxDto.setCreateUser(SecurityUtils.getUserId());
         personalMailboxDto.setUpdateUser(SecurityUtils.getUserId());
         personalMailboxDto.setUserId(SecurityUtils.getUserId());
+        personalMailboxDto.setTenantId(SecurityUtils.getTenantId());
         String urlPrefix;
         if (Objects.equals(personalMailboxDto.getType(), 2)) {
             urlPrefix = MailServiceConfig.abroadUrlPrefix;