Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

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

@@ -35,13 +35,14 @@ public class UasClientServiceImpl implements UasClientService {
     */
 
     public void sendEmail(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");
+            //params.put("topic", "qc");
             if (!CollectionUtils.isEmpty(ccList)) {
                 params.put("cc", StringUtils.join(ccList, ","));
             }

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

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

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

@@ -7,6 +7,8 @@ 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.UasClientService;
 import com.netease.mail.yanxuan.change.integration.flow.ius.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.ArrayList;
@@ -108,7 +110,7 @@ public class ChangeConfigController {
     private IusRpcService iusRpcService;
 
 
-    //private static Logger logger = LoggerFactory.getLogger(ChangeConfigController.class);
+    private static Logger logger = LoggerFactory.getLogger(ChangeConfigController.class);
 
     @Autowired
     private UasClientService iEmailService;
@@ -116,6 +118,7 @@ public class ChangeConfigController {
     @GetMapping("/test")
     public void queryCommanderInfo(){
         ArrayList<String> strings = new ArrayList<>();
+        logger.info("调用接口~~~~~~~~~~~~~~~~~~~~~~~~");
         strings.add("wb.tanglongwei@mesg.corp.netease.com");
         iEmailService.sendEmail("测试标题","{\n" +
                 "  \"headline\" : \"测试标题\",\n" +