整体测试邮件发送接口~

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/email/service/UasClientService.java

@@ -12,5 +12,6 @@ public interface UasClientService {
 
     void sendEmail(String subject, String content, Collection<String> toList, Collection<String> ccList, List<File> fileList);
 
+    void sendEmail1(String subject, String content, Collection<String> toList, Collection<String> ccList, List<File> fileList);
 
 }

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/email/service/impl/UasClientServiceImpl.java

@@ -42,18 +42,40 @@ public class UasClientServiceImpl implements UasClientService {
             params.put("subject", subject);
             params.put("content", content);
             params.put("to", StringUtils.join(toList, ","));
-            //params.put("topic", "qc"); ?
+            params.put("topic", "qc");
             if (!CollectionUtils.isEmpty(ccList)) {
                 params.put("cc", StringUtils.join(ccList, ","));
             }
-            String res = service.sendEmail1(params);
+            String res = service.sendEmail(params);
             this.logger.info("返回信息日志打印\n"+res);
             this.logger.info("[op:sendEmail] res={} ", new Object[]{res});
             JSONObject jsonObject = JSON.parseObject(res);
             if (jsonObject.getInteger("code") != 200) {
                 this.logger.error("SendEmail", (String)null, "send email failed, subject={},toList={},ccList={}", new Object[]{subject, JSON.toJSONString(toList), JSON.toJSONString(ccList)});
             }
+        }
+    }
 
+
+    public void sendEmail1(String subject, String content, Collection<String> toList, Collection<String> ccList, List<File> fileList) {
+        logger.info("调用接口111~~~~~~~~~~~~~~~~~~~~~~~~");
+        if (!CollectionUtils.isEmpty(toList)) {
+            //String url = MessageFormat.format("http://{0}{1}/{2}", this.thirdPartyDrmConfig.getUasHostInner(), "/push/email/", this.thirdPartyDrmConfig.getUasProduct());
+            Map<String, String> params = new HashMap();
+            params.put("subject", subject);
+            params.put("content", content);
+            params.put("to", StringUtils.join(toList, ","));
+            params.put("topic", "qc");
+            if (!CollectionUtils.isEmpty(ccList)) {
+                params.put("cc", StringUtils.join(ccList, ","));
+            }
+            String res = service.sendEmail1(params);
+            this.logger.info("返回信息日志打印\n"+res);
+            this.logger.info("[op:sendEmail] res={} ", new Object[]{res});
+            JSONObject jsonObject = JSON.parseObject(res);
+            if (jsonObject.getInteger("code") != 200) {
+                this.logger.error("SendEmail", (String)null, "send email failed, subject={},toList={},ccList={}", new Object[]{subject, JSON.toJSONString(toList), JSON.toJSONString(ccList)});
+            }
         }
     }
 

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/email/EmailRpcService.java

@@ -21,6 +21,7 @@ public interface EmailRpcService {
     @PostMapping("/push/email/yanxuan-qc-change-system/upload.json")
     String sendEmail1(Map<String, String> params);
 
+
     //yanxuan-sc-ehc
     @PostMapping("/push/email/bpm_risk_evaluation_11")
     String sendEmailInfo(Map<String, String> params);

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeConfigController.java

@@ -5,6 +5,7 @@ import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.netease.mail.yanxuan.change.biz.service.change.AdminChangeConfigService;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
+import com.netease.mail.yanxuan.change.integration.email.service.IUasEhcClient;
 import com.netease.mail.yanxuan.change.integration.email.service.UasClientService;
 import com.netease.mail.yanxuan.change.integration.flow.ius.*;
 import org.slf4j.Logger;
@@ -115,6 +116,9 @@ public class ChangeConfigController {
     @Autowired
     private UasClientService iEmailService;
 
+    @Autowired
+    private IUasEhcClient client;
+
     @GetMapping("/test")
     public void queryCommanderInfo(){
         ArrayList<String> strings = new ArrayList<>();
@@ -126,4 +130,34 @@ public class ChangeConfigController {
                 "}",        strings,null,null);
     }
 
+
+    @GetMapping("/test1")
+    public void queryCommanderInfo1(){
+        ArrayList<String> strings = new ArrayList<>();
+        logger.info("调用接口~~~~~~~~~~~~~~~~~~~~~~~~");
+        strings.add("wb.tanglongwei@mesg.corp.netease.com");
+        iEmailService.sendEmail1("测试标题","{\n" +
+                "  \"headline\" : \"测试标题\",\n" +
+                "  \"text\" : \"测试文本内容\"\n" +
+                "}",        strings,null,null);
+    }
+
+
+    @GetMapping("/test2")
+    public void queryCommanderInfo2(){
+        ArrayList<String> strings = new ArrayList<>();
+        logger.info("调用接口~~~~~~~~~~~~~~~~~~~~~~~~");
+        strings.add("wb.tanglongwei@mesg.corp.netease.com");
+        client.sendEmail("测试标题","{\n" +
+                "    \"flowId\":\"工单ID\",\n" +
+                "    \"releaseId\":\"发起人账号\",\n" +
+                "    \"releaseName\":\"发起人姓名\",\n" +
+                "    \"abnormalTitle\":\"异常标题\",\n" +
+                "    \"flowLink\":\"工单链接\",\n" +
+                "    \"findTime\":\"findTime\",\n" +
+                "    \"findDes\":\"findDes\"\n" +
+                "\n" +
+                "}",        strings,null,null);
+    }
+
 }