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

pom.xml

@@ -100,6 +100,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.netease.yanxuan</groupId>
+                <artifactId>yanxuan-qc-service-client</artifactId>
+                <version>2.0.0-SNAPSHOT</version>
+            </dependency>
+
             <!-- spring -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -229,6 +235,11 @@
             <version>${org.aspectj.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.netease.yanxuan</groupId>
+            <artifactId>yanxuan-qc-service-client</artifactId>
+        </dependency>
+
         <!-- yanxuan -->
         <!--默认引入apollo配置-->
         <dependency>

yanxuan-qc-change-system-assembly/src/main/java/com/netease/mail/yanxuan/change/assembly/Application.java

@@ -13,7 +13,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 /**
  * 项目启动类
  */
-@ComponentScan(basePackages = {"com.netease.mail.yanxuan.change", "com.netease.yanxuan.user"})
+@ComponentScan(basePackages = {"com.netease.mail.yanxuan.change", "com.netease.yanxuan.user", "com.netease.mail.yanxuan.qc"})
 @MapperScan("com.netease.mail.yanxuan.change.dal.mapper")
 @EnableApolloConfig
 @EnableMissaClients(basePackages = "com.netease.mail.yanxuan.change")

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

@@ -4,12 +4,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.netease.mail.yanxuan.change.integration.email.service.UasClientService;
 import com.netease.mail.yanxuan.change.integration.flow.email.EmailRpcService;
+import com.netease.mail.yanxuan.qc.service.client.remote.UasClient;
+import com.netease.mail.yanxuan.qc.service.client.utils.http.HttpClientExecutor;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
 import java.io.File;
 import java.util.Collection;
 import java.util.HashMap;
@@ -28,19 +31,28 @@ public class UasClientServiceImpl implements UasClientService {
     @Autowired
     private EmailRpcService service;
 
+    @Autowired
+    private HttpClientExecutor httpClientExecutor;
+
     @Override
     public void sendEmail(String subject, String content, Collection<String> toList, Collection<String> ccList, List<File> fileList) {
         if (!CollectionUtils.isEmpty(toList)) {
             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("邮箱接口入参 subject={},content={},toList={},ccList={}"),subject,content,StringUtils.join(toList, ","),params.get("cc"));
-            String res = service.sendEmail(subject,content,StringUtils.join(toList, ","),params.get("cc"));
-            this.logger.info("[op:sendEmail] res={} ", res);
+            logger.info(JSONObject.toJSONString("邮箱接口入参 subject={},content={},toList={},ccList={}"), subject, content, StringUtils.join(toList, ","), params.get("cc"));
+            //String res = service.sendEmail(subject,content,StringUtils.join(toList, ","),params.get("cc"));
+            String url = "http://127.0.0.1:8550/proxy/test.logistics-uas.service.mailsaas/push/email/qc";
+            String res = this.httpClientExecutor.doPost(url, 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)});
+                logger.error("send email has ex: {}", res);
             }
         }
     }