coresync/ads-marketing
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
romantarkin 2025-08-18 15:35:09 +05:00
parent 500e6f5725
commit a1a67843c8
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mail-service/src/index.js
View File

@ -7,13 +7,12 @@ import { processScheduledCampaigns } from './service/queueFillerJob.js';
import { dynamicConsumer } from './service/dynamicConsumer.js'; import { dynamicConsumer } from './service/dynamicConsumer.js';
import { topicManager } from './service/topicManager.js'; import { topicManager } from './service/topicManager.js';
import { topicRegistry } from './service/topicRegistry.js'; import { topicRegistry } from './service/topicRegistry.js';
import authMiddleware from './middleware/auth.js';
const app = express(); const app = express();
app.use(express.json()); app.use(express.json());
// Middleware // Middleware
app.use('/api/mail', authMiddleware); app.use('/api/mail');
// Routes // Routes
app.use('/api/mail', routes); app.use('/api/mail', routes);

19
mail-service/src/routes/index.js
View File

@ -9,18 +9,19 @@ import deliveryLogRoutes from './deliveryLog.js';
import smtpServerRoutes from './smtpServer.js'; import smtpServerRoutes from './smtpServer.js';
import topicRoutes from './topic.js'; import topicRoutes from './topic.js';
import trackingRoutes from './tracking.js'; import trackingRoutes from './tracking.js';
import authMiddleware from '../middleware/auth.js';
const router = Router(); const router = Router();
router.use('/subscribers', subscriberRoutes); router.use('/subscribers', authMiddleware, subscriberRoutes);
router.use('/mailing-groups', mailingGroupRoutes); router.use('/mailing-groups', authMiddleware, mailingGroupRoutes);
router.use('/group-subscribers', groupSubscriberRoutes); router.use('/group-subscribers', authMiddleware, groupSubscriberRoutes);
router.use('/email-templates', emailTemplateRoutes); router.use('/email-templates', authMiddleware, emailTemplateRoutes);
router.use('/email-template-versions', emailTemplateVersionRoutes); router.use('/email-template-versions', authMiddleware, emailTemplateVersionRoutes);
router.use('/campaigns', campaignRoutes); router.use('/campaigns', authMiddleware, campaignRoutes);
router.use('/delivery-logs', deliveryLogRoutes); router.use('/delivery-logs', authMiddleware, deliveryLogRoutes);
router.use('/smtp-servers', smtpServerRoutes); router.use('/smtp-servers', authMiddleware, smtpServerRoutes);
router.use('/topics', topicRoutes); router.use('/topics', authMiddleware, topicRoutes);
router.use('/track', trackingRoutes); router.use('/track', trackingRoutes);
export default router; export default router;

4
mail-service/src/service/dynamicConsumer.js
View File

@ -263,13 +263,13 @@ async function processEmailTask(task, topic) {
const domain = smtp.from_email.split('@')[1]; const domain = smtp.from_email.split('@')[1];
// Добавляем трекинг-пиксель для отслеживания открытия письма // Добавляем трекинг-пиксель для отслеживания открытия письма
const trackingPixel = `<img src="http://${domain}/api/mail/track/open/${deliveryLog.id}" width="1" height="1" style="display:none;" />`; const trackingPixel = `<img src="https://${domain}/api/mail/track/open/${deliveryLog.id}" width="1" height="1" style="display:none;" />`;
// Обрабатываем ссылки для отслеживания кликов // Обрабатываем ссылки для отслеживания кликов
const htmlWithClickTracking = task.html.replace( const htmlWithClickTracking = task.html.replace(
/<a\s+href=["']([^"']+)["']/gi, /<a\s+href=["']([^"']+)["']/gi,
(match, url) => { (match, url) => {
const trackingUrl = `http://${domain}/api/mail/track/click/${deliveryLog.id}?url=${encodeURIComponent(url)}`; const trackingUrl = `https://${domain}/api/mail/track/click/${deliveryLog.id}?url=${encodeURIComponent(url)}`;
return `<a href="${trackingUrl}"`; return `<a href="${trackingUrl}"`;
} }
); );