chenkq 3 долоо хоног өмнө
parent
commit
4eef9b7ff3

+ 4 - 4
storlead-framework/storlead-common/src/main/java/com/storlead/framework/common/properties/UrlChainDefinitionPorperties.java

@@ -81,10 +81,10 @@ public class UrlChainDefinitionPorperties {
 			"/mail/v1/file/content",
 			"/ram/oss/get_post_signature_for_oss_upload",
 			"/sys/permission/getUserAccessResourceTest",
-			"/mail/draft_download_url",
-			"/mail/download_url",
-			"/mail/mkt/track/**",
-			"/**/mail/mkt/track/**",
+			"/crm/draft_download_url",
+			"/crm/download_url",
+			"/mkt/track/**",
+			"/mkt/track/**",
 			"/wxapi/wxclientmenu/**",
 			"/wxapi/wxclientmenu/*",
 			"/wxapi/getauth",

+ 1 - 1
storlead-framework/storlead-web/src/main/java/com/storlead/framework/web/filter/AuthRequestFilter.java

@@ -125,7 +125,7 @@ public class AuthRequestFilter implements Filter, Ordered {
         // 获取URL
         String url = req.getRequestURI();
         // 营销打开追踪像素:必须免登录(邮件客户端无法带 token)
-        if (StrUtil.isNotBlank(url) && url.contains("/mail/mkt/track/")) {
+        if (StrUtil.isNotBlank(url) && url.contains("/mkt/track/")) {
             return true;
         }
         Boolean isNeedLogin = chainBlackAndWhiteUtil.IsWhiteUri(url);

+ 6 - 1
storlead-mail-api/src/main/resources/application-dev.yml

@@ -147,7 +147,7 @@ logging:
 environment: test
 
 # 站内消息、邮件模板中的前端站点根地址(覆盖 application.yml 默认值)
-domainname: https://test1.storlead.com
+domainname: http://localhost:10010/router/rest
 
 file:
   mode: 1
@@ -166,3 +166,8 @@ file:
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5
+
+
+storlead:
+  mail:
+    track-base-url: ${domainname:}

+ 2 - 2
storlead-mail/storlead-mail-mkt/src/main/java/com/storlead/sales/mail/mkt/service/impl/MktMailMessageServiceImpl.java

@@ -581,11 +581,11 @@ public class MktMailMessageServiceImpl extends MyBaseServiceImpl<MktMailMessageM
         }
         String body = html == null ? "" : html;
         // 正文已含追踪像素则不再重复注入(直接插库可能已写过)
-        if (body.contains("/mail/mkt/track/")) {
+        if (body.contains("/mkt/track/")) {
             return body;
         }
         String base = trackBaseUrl.endsWith("/") ? trackBaseUrl.substring(0, trackBaseUrl.length() - 1) : trackBaseUrl;
-        String pixelUrl = base + "/mail/mkt/track/" + entity.getTrackToken();
+        String pixelUrl = base + "/mkt/track/" + entity.getTrackToken();
         String pixel = "<img src=\"" + pixelUrl
                 + "\" width=\"1\" height=\"1\" style=\"display:none!important;width:1px;height:1px;border:0;\" alt=\"\"/>";
         log.info("mkt inject track pixel, mailId={}, url={}", entity.getId(), pixelUrl);