Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java

@@ -254,6 +254,10 @@
               TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert(adzoneId,

                     activityid, relationId);

               String link = dto.getShort_click_url();

               if (StringUtil.isNullOrEmpty(link)) {

                  link = dto.getClick_url();

               }



               String token = TaoKeApiUtil.getTKToken("http://", "淘宝官方活动", link);

               newText = newText.replace(st, TaoBaoUtil.filterTaoToken(token));

            }