Merge remote-tracking branch 'origin/master'

mailbox-common/src/main/java/com/biutag/config/Minio.java

@@ -9,12 +9,14 @@ import io.minio.*;
 import io.minio.errors.*;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLDecoder;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
 import java.util.Date;
 import java.util.Optional;
 
@@ -46,8 +48,12 @@ public class Minio {
     }
 
     public String upload(InputStream is, String originName) {
+        return upload(is, originName, false);
+    }
+
+    public String upload(InputStream is, String originName, boolean fullPath) {
         try {
-            String filepath = DateUtil.format(new Date(), "YYMMdd") + "/" + IdUtil.nanoId(8) +
+            String filepath = fullPath ? originName : DateUtil.format(new Date(), "YYMMdd") + "/" + IdUtil.nanoId(8) +
                     (StrUtil.isNotBlank(originName) && originName.contains(".") ? originName.substring(originName.lastIndexOf(".")) : "");
             PutObjectArgs putObjectArgs = PutObjectArgs.builder()
                     .object(filepath)
@@ -85,4 +91,12 @@ public class Minio {
         }
     }
 
+    public String getBase64(String filepath) {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        get(filepath, os);
+        byte[] data = os.toByteArray();
+        // 使用Base64编码器对字节数组进行编码
+        return Base64.getEncoder().encodeToString(data);
+    }
+
 }

mailbox-common/src/main/java/com/biutag/entity/system/PoliceUser.java

@@ -14,7 +14,7 @@ public class PoliceUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value="id", type=IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty("ID")
     private Integer id;
 
@@ -92,7 +92,6 @@ public class PoliceUser implements Serializable {
     private String type;
 
 
-
     @ApiModelProperty("多端登录: [0=否, 1=是]")
     private Integer isMultipoint;
 
@@ -103,7 +102,6 @@ public class PoliceUser implements Serializable {
     private Integer isDelete;
 
 
-
     @ApiModelProperty("最后登录IP")
     private String lastLoginIp;
 

mailbox-common/src/main/java/com/biutag/exception/AuthException.java

@@ -6,4 +6,11 @@ package com.biutag.exception;
  */
 public class AuthException extends RuntimeException {
 
+    public AuthException() {
+    }
+
+    public AuthException(String message) {
+        super(message);
+    }
+
 }

mailbox-lan/src/main/java/com/biutag/lan/controller/ApiV1Controller.java

@@ -0,0 +1,68 @@
+package com.biutag.lan.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.digest.MD5;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.biutag.config.Minio;
+import com.biutag.core.AjaxResult;
+import com.biutag.exception.AuthException;
+import com.biutag.exception.BusinessException;
+import com.biutag.lan.domain.MailSource;
+import com.biutag.lan.domain.bo.MailApiV1Req;
+import com.biutag.lan.service.MailSourceService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.simpleframework.xml.core.Validate;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+@RequiredArgsConstructor
+@Validate
+@RequestMapping("/v1/")
+@RestController
+public class ApiV1Controller {
+
+    private final MailSourceService mailSourceService;
+
+    private final Minio minio;
+
+    private final String key = "mailbox";
+
+    @PostMapping("mail")
+    public AjaxResult<Void> addMail(@RequestBody @Valid  MailApiV1Req mail, HttpServletRequest request) {
+        validAuth(request);
+        if (mailSourceService.exists(new LambdaQueryWrapper<MailSource>().eq(MailSource::getId, mail.getId()))) {
+            return AjaxResult.success();
+        }
+        if (StrUtil.isNotBlank(mail.getAttachments())) {
+            List<JSONObject> attachments = JSON.parseArray(mail.getAttachments()).toList(JSONObject.class);
+            for (JSONObject attachment : attachments) {
+                //minio.upload(IOUtil.base64ToStream(attachment.getString("base64")), attachment.getString("filepath"), true);
+                attachment.remove("base64");
+            }
+            mail.setAttachments(JSON.toJSONString(attachments));
+        }
+        mailSourceService.saveBatch(Collections.singletonList(mail.toMailOuter()));
+        return AjaxResult.success();
+    }
+
+    private void validAuth(HttpServletRequest request) {
+        String authorization = request.getHeader("Authorization");
+        String timestamp = request.getHeader("timestamp");
+        if (StrUtil.isBlank(authorization) || StrUtil.isBlank(timestamp)) {
+            throw new AuthException();
+        }
+        if (!authorization.equals(MD5.create().digestHex(key + timestamp))) {
+            throw new AuthException();
+        }
+    }
+
+}

mailbox-lan/src/main/java/com/biutag/lan/controller/MailController.java

@@ -62,4 +62,7 @@ public class MailController {
         return AjaxResult.success(mailService.invalidCompletion(completion));
     }
 
+
+
+
 }

mailbox-lan/src/main/java/com/biutag/lan/crontab/MailSourceJob.java

@@ -1,82 +0,0 @@
-package com.biutag.lan.crontab;
-
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.http.HttpResponse;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.biutag.constants.AppConstants;
-import com.biutag.lan.domain.MailSourceEtl;
-import com.biutag.lan.domain.bo.MailOuter;
-import com.biutag.lan.service.MailSourceEtlService;
-import com.biutag.lan.service.MailSourceService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@RequiredArgsConstructor
-@Component
-public class MailSourceJob {
-
-    private final MailSourceEtlService mailSourceEtlService;
-
-    private final MailSourceService mailSourceService;
-
-//    @Scheduled(fixedRate = 60000)
-    @Transactional(rollbackFor = Exception.class)
-    public void extractMailSource() {
-        System.out.println("extractMailSource------------");
-        MailSourceEtl latestEtl = mailSourceEtlService.getLatestSuccess();
-        LocalDateTime beginTime = Optional.ofNullable(latestEtl).map(MailSourceEtl::getEtlTime).orElse(LocalDateTime.of(1970, 1, 1, 0, 0, 0));
-        LocalDateTime now = LocalDateTime.now();
-        int current = 1;
-        int size = 10;
-        Page<MailOuter> mailOuterPage = pageMailOuterByCreateTime(current, size,
-                beginTime.format(DatePattern.NORM_DATETIME_FORMAT.getDateTimeFormatter()),
-                now.format(DatePattern.NORM_DATETIME_FORMAT.getDateTimeFormatter()),
-                new ArrayList<>());
-        // 保存记录
-        if (mailOuterPage.getTotal() > 0) {
-            mailSourceService.saveBatch(mailOuterPage.getRecords());
-            mailSourceEtlService.save(new MailSourceEtl().setEtlTime(now).setSuccess(AppConstants.YES).setTotal(mailOuterPage.getTotal()));
-        }
-    }
-
-    public Page<MailOuter> pageMailOuterByCreateTime(int current, int size, String beginTime, String endTime, List<MailOuter> records) {
-        String url = String.format("https://mailbox.biutag.com/api/api/mail?current=%s&size=%s&beginTime=%s&endTime=%s", current, size, beginTime, endTime);
-        HttpResponse httpResponse = HttpUtil.createGet(url)
-                .auth("chuangke")
-                .execute();
-        if (!httpResponse.isOk()) {
-
-        }
-        JSONObject data = JSON.parseObject(httpResponse.body());
-        Long total = data.getLong("total");
-        records.addAll(data.getList("records", MailOuter.class));
-        if (total <= records.size()) {
-            return new Page<MailOuter>().setTotal(total).setRecords(records);
-        }
-        return pageMailOuterByCreateTime(++current, size, beginTime, endTime, records, total);
-    }
-
-    public Page<MailOuter> pageMailOuterByCreateTime(int current, int size, String beginTime, String endTime, List<MailOuter> records, long total) {
-        String url = String.format("https://mailbox.biutag.com/api/api/mail?current=%s&size=%s&beginTime=%s&endTime=%s", current, size, beginTime, endTime);
-        HttpResponse httpResponse = HttpUtil.createGet(url)
-                .auth("chuangke")
-                .execute();
-        JSONObject data = JSON.parseObject(httpResponse.body());
-        records.addAll(data.getList("records", MailOuter.class));
-        if (total <= records.size()) {
-            return new Page<MailOuter>().setTotal(total).setRecords(records);
-        }
-        return pageMailOuterByCreateTime(++current, size, beginTime, endTime, records);
-    }
-
-}

mailbox-lan/src/main/java/com/biutag/lan/domain/MailReturn.java

@@ -15,14 +15,17 @@ public class MailReturn {
 
     @TableId(type = IdType.AUTO)
     private Integer id;
+
     /**
      *
      */
     private String mailId;
+
     /**
      * 退回原因
      */
     private String reason;
+
     /**
      *
      */
@@ -37,12 +40,15 @@ public class MailReturn {
      *
      */
     private Integer handlerDeptId;
+
     /**
      *
      */
     private String handlerDeptName;
+
     /**
      *
      */
     private LocalDateTime createTime;
+
 }

mailbox-lan/src/main/java/com/biutag/lan/domain/bo/MailApiV1Req.java

@@ -0,0 +1,92 @@
+package com.biutag.lan.domain.bo;
+
+import com.biutag.lan.domain.MailSource;
+import com.biutag.validator.annotation.IdCard;
+import com.biutag.validator.annotation.Phone;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
+import org.springframework.beans.BeanUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+@Setter
+@Getter
+public class MailApiV1Req {
+
+    /**
+     *
+     */
+    @NotBlank
+    private String id;
+
+    /**
+     * 联系人姓名
+     */
+    @NotBlank(message = "请输入联系人姓名")
+    private String contactName;
+
+    /**
+     * 联系人性别 M / F
+     */
+    private String contactSex;
+
+    /**
+     * 联系人身份证号
+     */
+    @IdCard
+    private String contactIdCard;
+
+    /**
+     * 联系人手机号
+     */
+    @Phone
+    private String contactPhone;
+
+    /**
+     * 案件编号
+     */
+    private String caseNumber;
+
+    /**
+     * 内容
+     */
+    @Length(min= 10, max = 300, message = "信件内容不符合规范（不少于10字，不多于300字）")
+    @NotBlank(message = "请输入信件内容")
+    private String content;
+
+    /**
+     * 附件
+     */
+    private String attachments;
+
+    /**
+     * 创建时间
+     */
+    @NotNull
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 涉及单位ID
+     */
+    private Integer involvedDeptId;
+
+    /**
+     * 涉及单位名称
+     */
+    private String involvedDeptName;
+
+
+    private String source = MailSource.Source.MAILBOX.getValue();
+
+    public MailOuter toMailOuter() {
+        MailOuter mailOuter = new MailOuter();
+        BeanUtils.copyProperties(this, mailOuter);
+        return mailOuter;
+    }
+
+}

mailbox-lan/src/main/java/com/biutag/lan/flow/node/CountersignFlow.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
 import java.time.LocalDateTime;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
@@ -53,7 +54,7 @@ public class CountersignFlow extends Flow {
             return null;
         }
         List<MailFlow> mailFlows = mailFlowService.list(mailId);
-        MailFlow mailFlow = mailFlows.stream().filter(item -> item.getFlowAfterName().equals("发起会签")).findFirst().get();
+        MailFlow mailFlow = mailFlows.stream().sorted(Comparator.comparing(MailFlow::getCreateTime).reversed()).filter(item -> item.getFlowAfterName().equals("发起会签")).findFirst().get();
         List<FlowNode> flowNodes = flowNodeService.list();
         String flowBeforeName = flowNodes.stream().filter(item -> item.getKey().equals(mailFlow.getFlowKey())).findFirst().map(FlowNode::getBeforeName).get();
         // 会签完成

mailbox-lan/src/main/java/com/biutag/lan/flow/node/FirstApprovalFlow.java

@@ -95,7 +95,6 @@ public class FirstApprovalFlow extends Flow {
     public Flow mailReturn(String mailId, JSONObject data) {
         LocalDateTime now = LocalDateTime.now();
         String returnOperate = data.getString("returnOperate");
-        Assert.hasText(returnOperate, "参数错误");
         String reason = data.getString("reason");
         Assert.hasText(reason, "参数错误");
         Mail mail = mailService.getById(mailId);
@@ -115,6 +114,7 @@ public class FirstApprovalFlow extends Flow {
         // 更新信件
         mail.setUpdateTime(now)
                 .setFlowKey(FlowNodeEnum.SECOND_APPROVAL.getKey())
+                .setCurrentOperator(String.format("%s专班", mail.getSecondDeptName()))
                 .setReturnOperate(returnOperate);
         mailService.updateById(mail);
         return null;

mailbox-lan/src/main/java/com/biutag/lan/service/impl/PoliceUserServiceImpl.java

@@ -16,6 +16,7 @@ import com.biutag.lan.mapper.PoliceUserMapper;
 import com.biutag.lan.service.IDeptService;
 import com.biutag.lan.service.IPermService;
 import com.biutag.lan.service.IPoliceUserService;
+import com.biutag.lan.service.IPostService;
 import com.biutag.lan.validate.commons.PageValidate;
 import com.biutag.lan.validate.system.PoliceUserCreateValidate;
 import com.biutag.lan.validate.system.PoliceUserSearchValidate;
@@ -62,6 +63,9 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
     @Resource
     IDeptService deptService;
 
+    @Resource
+    IPostService iPostService;
+
     /**
      * 管理员列表
      *
@@ -95,7 +99,6 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
         return PageResult.iPageHandle(pages);
     }
 
-
     /**
      * 管理员列表
      *
@@ -280,9 +283,11 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
         model.setDeptIds(createValidate.getDeptIds().toString());
         model.setDeptName(deptVo.getName());
 
-        this.batchSaveDepartByEmpNo(createValidate.getEmpNo(), Arrays.asList(createValidate.getDeptIds()));
+        this.batchSaveDepartByEmpNo(createValidate.getEmpNo(), Collections.singletonList(createValidate.getDeptIds()));
         model.setPostIds(createValidate.getPostIds().toString());
-        this.batchSavePositionByEmpNo(createValidate.getEmpNo(), Arrays.asList(createValidate.getPostIds()));
+        PostVo post = iPostService.detail(createValidate.getPostIds());
+        model.setPostTitle(post.getName());
+        this.batchSavePositionByEmpNo(createValidate.getEmpNo(), Collections.singletonList(createValidate.getPostIds()));
         model.setEmpNo(createValidate.getEmpNo());
         model.setName(createValidate.getName());
         model.setAvatar(avatar);
@@ -343,6 +348,9 @@ public class PoliceUserServiceImpl implements IPoliceUserService {
         model.setDeptName(deptVo.getName());
 
         if(StringUtils.isNotNull(updateValidate.getPostIds())) {
+            model.setPostIds(updateValidate.getPostIds().toString());
+            PostVo post = iPostService.detail(updateValidate.getPostIds());
+            model.setPostTitle(post.getName());
             if(!policeUser.getPostIds().equals(model.getPostIds())){
                 this.batchSavePositionByEmpNo(updateValidate.getEmpNo(), Collections.singletonList(updateValidate.getPostIds()));
             }

mailbox-lan/src/main/resources/mapper/PoliceUserMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.biutag.lan.mapper.PoliceUserMapper">
 
     <select id="selectPage" resultType="com.biutag.lan.vo.system.PoliceUserListedVo">
-        select u.id, u.emp_no, u.name, u.id_code, u.phone, r.name role, d.full_name dept, p.name post, u.last_login_time, u.last_login_ip, u.is_disable
+        select u.id, u.emp_no, u.name, u.id_code, u.phone, u.mobile, r.name role, d.full_name dept, p.name post, u.last_login_time, u.last_login_ip, u.is_disable
         from police_user u
             left join dept d on u.dept_ids = d.id
             left join post p on u.post_ids = p.id

mailbox-outer/pom.xml

@@ -85,6 +85,10 @@
     <build>
 
         <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
             <resource>
                 <directory>src/main/resources</directory>
                 <includes>

mailbox-outer/src/main/java/com/biutag/outer/OuterApplication.java

@@ -3,7 +3,9 @@ package com.biutag.outer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
+@EnableScheduling
 @SpringBootApplication(exclude = {RedisRepositoriesAutoConfiguration.class})
 public class OuterApplication {
 

mailbox-outer/src/main/java/com/biutag/outer/domain/Mail.java

@@ -1,5 +1,6 @@
 package com.biutag.outer.domain;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Getter;
 import lombok.Setter;
@@ -57,6 +58,7 @@ public class Mail {
     /**
      * 创建时间
      */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**

mailbox-outer/src/main/java/com/biutag/outer/domain/MailEtl.java

@@ -0,0 +1,27 @@
+package com.biutag.outer.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Accessors(chain = true)
+@Setter
+@Getter
+public class MailEtl {
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    private String mailId;
+
+    private Boolean success;
+
+    private LocalDateTime createTime;
+
+    private String errMsg;
+
+}

mailbox-outer/src/main/java/com/biutag/outer/job/MailJob.java

@@ -0,0 +1,82 @@
+package com.biutag.outer.job;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.digest.MD5;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.biutag.config.Minio;
+import com.biutag.outer.domain.Mail;
+import com.biutag.outer.domain.MailEtl;
+import com.biutag.outer.mapper.MailEtlMapper;
+import com.biutag.outer.mapper.MailMapper;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class MailJob {
+
+    private final MailEtlMapper mailEtlMapper;
+
+    private final MailMapper mailMapper;
+
+    private final Minio minio;
+
+    @Value("${mailbox.url}")
+    private String mailboxUrl;
+
+    private final String key = "mailbox";
+
+    // 1分钟
+    @Scheduled(fixedRate = 60000)
+    @Transactional(rollbackFor = Exception.class)
+    public void pushMailData() {
+        System.out.println(LocalDateTime.now());
+        List<Mail> mails = mailMapper.listByMailEtl();
+        for (Mail mail : mails) {
+            try {
+                if (StrUtil.isNotBlank(mail.getAttachments())) {
+                    List<JSONObject> attachments = JSON.parseArray(mail.getAttachments()).toList(JSONObject.class);
+                    for (JSONObject attachment : attachments) {
+                        attachment.put("base64", minio.getBase64(attachment.getString("filepath")));
+                    }
+                    mail.setAttachments(JSON.toJSONString(attachments));
+                }
+                long timestamp = new Date().getTime();
+                HttpResponse httpResponse = HttpUtil.createPost(mailboxUrl + "mail")
+                        .header("timestamp", String.valueOf(timestamp))
+                        .auth(MD5.create().digestHex(key + timestamp))
+                        .body(JSON.toJSONString(mail))
+                        .execute();
+                if (!httpResponse.isOk()) {
+                    throw new RuntimeException(String.format("httpCode: %s", httpResponse.getStatus()));
+                }
+                log.info(httpResponse.body());
+                JSONObject response = JSONObject.parseObject(httpResponse.body());
+                if (response.getInteger("code") != 200) {
+                    throw new RuntimeException(response.getString("msg"));
+                }
+                MailEtl mailEtl = new MailEtl().setMailId(mail.getId()).setSuccess(true).setCreateTime(LocalDateTime.now());
+                mailEtlMapper.insert(mailEtl);
+            } catch (RuntimeException e) {
+                log.error("推送信件[{}]异常: {}", mail.getId(), e.getMessage(), e);
+                MailEtl mailEtl = new MailEtl().setMailId(mail.getId()).setSuccess(false).setCreateTime(LocalDateTime.now()).setErrMsg(e.getMessage());
+                mailEtlMapper.insert(mailEtl);
+            }
+        }
+
+    }
+
+}

mailbox-outer/src/main/java/com/biutag/outer/mapper/MailEtlMapper.java

@@ -0,0 +1,9 @@
+package com.biutag.outer.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.biutag.outer.domain.MailEtl;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface MailEtlMapper extends BaseMapper<MailEtl> {
+}

mailbox-outer/src/main/java/com/biutag/outer/mapper/MailMapper.java

@@ -5,10 +5,15 @@ import com.biutag.outer.domain.Mail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 @Mapper
 public interface MailMapper extends BaseMapper<Mail> {
 
     @Select("SELECT nextval('mail_id_seq') ")
     Integer getMailIdSeqVal();
 
+    @Select("select m.* from mail m left join mail_etl etl on m.id = etl.mail_id and etl.success = 1 where etl.id is null")
+    List<Mail> listByMailEtl();
+
 }

mailbox-outer/src/main/resources/application-dev.yml

@@ -6,8 +6,11 @@ spring:
 
 oss:
   minio:
-    enable: false
+    enable: true
     endpoint: http://172.31.217.20:31401
     accessKey: n8yPVAJk4yw879zi
     secretKey: eElQ7gCwuNxaFhKEbtRRq0lsovoOTgI1
     bucketName: mailbox
+
+mailbox:
+  url: http://127.0.0.1:8082/v1/

mailbox-outer/src/test/java/com/biutag/outer/ApiTest.java

@@ -0,0 +1,19 @@
+package com.biutag.outer;
+
+import cn.hutool.crypto.digest.MD5;
+import com.alibaba.fastjson2.JSON;
+import com.biutag.outer.domain.Mail;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+public class ApiTest {
+
+    @Test
+    public void testAuth() {
+        Mail mail = new Mail();
+        mail.setCreateTime(LocalDateTime.now());
+        System.out.println(JSON.toJSONString(mail));
+    }
+}