Эх сурвалжийг харах

1、修复飞书发送链接bug。

wanghaiwu 1 долоо хоног өмнө
parent
commit
969aa49ed2

+ 18 - 17
main/java/kd/cosmic/jkjt/msg/feishu/FeiShuDaiBanServiceHandler.java

@@ -538,27 +538,28 @@ public class FeiShuDaiBanServiceHandler extends AbstractMessageServiceHandler {
         String node = " ";
         String pcurl  = message.getContentUrl();
         String moburl  = message.getMobContentUrl();
-        if("".equals(pcurl)||pcurl==null){
+
+        if(StringUtils.isEmpty(pcurl)){
             pcurl = System.getProperty("domain.contextUrl")+"/index.html?formId=wf_msg_center";
         }
-        if("".equals(moburl)||moburl==null){
+
+        if(StringUtils.isEmpty(moburl)){
             moburl = System.getProperty("domain.contextUrl")+"/mobile.html?form=er_mainpage_daily";
-            moburl = changeDanDianSrc(moburl+"&apptype=feishu");
-        }else{
-            moburl = changeDanDianSrc(moburl+"&apptype=feishu");
         }
+
+        //替换PC端域名
+        pcurl = replacePcUrlDomain(pcurl);
+        //移动端替换域名
+        moburl = replaceMobUrlDomain(moburl);
+
         pcurl =changeDanDianSrc(pcurl+"&apptype=feishu");
+        moburl = changeDanDianSrc(moburl+"&apptype=feishu");
 
         String content = message.getContent();
         if("".equals(content)||content==null){
             content = message.getTitle();
         }
 
-        //替换PC端域名
-        pcurl = replacePcUrlDomain(pcurl);
-        //移动端替换域名
-        moburl = replaceMobUrlDomain(moburl);
-
         /*************处理消息格式*****************/
 //            String nodename = toDoInfo.getCategory();
         Long taskId = 0L;
@@ -1735,12 +1736,12 @@ public class FeiShuDaiBanServiceHandler extends AbstractMessageServiceHandler {
                 List<Long> userIds = message.getUserIds();
 
                 String linkUrl = message.getContentUrl();
-                String linkMobileUrl = message.getMobContentUrl();
-
-                //替换PC端域名
-                linkUrl = replacePcUrlDomain(linkUrl);
-                //移动端替换域名
-                linkMobileUrl = replaceMobUrlDomain(linkMobileUrl);
+//                String linkMobileUrl = message.getMobContentUrl();
+//
+//                //替换PC端域名
+//                linkUrl = replacePcUrlDomain(linkUrl);
+//                //移动端替换域名
+//                linkMobileUrl = replaceMobUrlDomain(linkMobileUrl);
 
                 //发送消息
                 for (int i = 0; i < userIds.size() ; i++) {
@@ -1812,7 +1813,7 @@ public class FeiShuDaiBanServiceHandler extends AbstractMessageServiceHandler {
 
         pcUrl = pcUrl.replace(mobileDomain, curUrl);
 
-        log.info("替换后地址: pcUrl:" + pcUrl);
+        log.info("替换后PC地址: pcUrl:" + pcUrl);
 
         return pcUrl;
     }