邮件调试提交........

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

@@ -12,4 +12,9 @@ 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);
+
+    void sendEmail2(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

@@ -49,4 +49,46 @@ public class UasClientServiceImpl implements UasClientService {
         }
     }
 
+    public void sendEmail1(String subject, String content, Collection<String> toList, Collection<String> ccList, List<File> fileList) {
+        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, ","));
+            }
+            logger.info(JSONObject.toJSONString(params));
+            String res = service.sendEmail1(params);
+            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 sendEmail2(String subject, String content, Collection<String> toList, Collection<String> ccList, List<File> fileList) {
+        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, ","));
+            }
+            logger.info(JSONObject.toJSONString(params));
+            String res = service.sendEmail2(params);
+            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

@@ -17,8 +17,16 @@ public interface EmailRpcService {
     @PostMapping("/push/email/attach/qc/upload.json")
     String sendEmail(Map<String, String> params);
 
+
+    @PostMapping("/push/email/qc/upload.json")
+    String sendEmail1(Map<String, String> params);
+
+    @PostMapping("/push/email/qc")
+    String sendEmail2(Map<String, String> params);
+
+
     //yanxuan-sc-ehc
-    @PostMapping("/push/email/yanxuan-qc-ehc/upload.json")
+    @PostMapping("/push/email/qc/upload.json")
     String sendEmailInfo(Map<String, String> params);
 
 }

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

@@ -107,18 +107,11 @@ public class ChangeConfigController {
         return service.queryConfigType();
     }
 
-    @Autowired
-    private IusRpcService iusRpcService;
-
-
     private static Logger logger = LoggerFactory.getLogger(ChangeConfigController.class);
 
     @Autowired
     private UasClientService iEmailService;
 
-    @Autowired
-    private IUasEhcClient client;
-
     @GetMapping("/test")
     public void queryCommanderInfo(){
         ArrayList<String> strings = new ArrayList<>();
@@ -141,23 +134,31 @@ public class ChangeConfigController {
         ArrayList<String> strings = new ArrayList<>();
         logger.info("调用接口~~~~~~~~~~~~~~~~~~~~~~~~");
         strings.add("wb.tanglongwei@mesg.corp.netease.com");
-        client.sendEmail("bpm_risk_evaluation_11","{\n" +
-                "\n" +
-                "\u200B    \"itemId\":\"商品id\",\n" +
-                "\n" +
-                "\u200B    \"itemName\":\"商品名称\",\n" +
-                "\n" +
-                "\u200B    \"sqeId\":\"sqeId\",\n" +
-                "\n" +
-                "\u200B    \"sqeName\":\"sqe名称\",\n" +
-                "\n" +
-                "\u200B    \"createTime\":\"开始时间\",\n" +
-                "\n" +
-                "\u200B    \"flowId\":\"工单id\",\n" +
-                "\n" +
-                "\u200B    \"flowUrl\":\"工单链接\",\n" +
+        iEmailService.sendEmail1("yxqc_release_flow","{\n" +
+                "    \"flowId\":\"工单ID\",\n" +
+                "    \"releaseId\":\"发起人账号\",\n" +
+                "    \"releaseName\":\"发起人姓名\",\n" +
+                "    \"abnormalTitle\":\"异常标题\",\n" +
+                "    \"flowLink\":\"工单链接\",\n" +
+                "    \"findTime\":\"findTime\",\n" +
+                "    \"findDes\":\"findDes\"\n" +
                 "\n" +
-                "\u200B\t”subject“：\"xxx\"\n" +
+                "}",        strings,null,null);
+    }
+
+    @GetMapping("/test2")
+    public void queryCommanderInfo2(){
+        ArrayList<String> strings = new ArrayList<>();
+        logger.info("调用接口~~~~~~~~~~~~~~~~~~~~~~~~");
+        strings.add("wb.tanglongwei@mesg.corp.netease.com");
+        iEmailService.sendEmail1("yxqc_release_flow","{\n" +
+                "    \"flowId\":\"工单ID\",\n" +
+                "    \"releaseId\":\"发起人账号\",\n" +
+                "    \"releaseName\":\"发起人姓名\",\n" +
+                "    \"abnormalTitle\":\"异常标题\",\n" +
+                "    \"flowLink\":\"工单链接\",\n" +
+                "    \"findTime\":\"findTime\",\n" +
+                "    \"findDes\":\"findDes\"\n" +
                 "\n" +
                 "}",        strings,null,null);
     }