9 месяцев назад · c8f868bf02
--- a/oms/dist/src/scripts/active-user-daily-notify.js
+++ b/oms/dist/src/scripts/active-user-daily-notify.js
@@ -222,9 +222,9 @@ async function run() {
 
				         const activeUsers = await userModel_1.User.find({
			
 
				             lastActiveAt: { $gte: sevenDaysAgo },
			
 
				             fmToken: { $nin: [null, ""] },
			
 
				-            //   versionName: { $in: ["5.8.0-debug"] },
			
 
				+            versionName: { $in: ["5.8.0-debug"] },
			
 
				             // versionName: { $in: ["5.8.0", "5.8.0-debug"] },
			
 
				-            versionCode: { $gte: 347 },
			
 
				+            // versionCode: { $gte: 347 },
			
 
				         })
			
 
				             .select("_id uid fmToken lang cc")
			
 
				             .lean();
			
@@ -271,7 +271,7 @@ async function run() {
 
				             const userLang = getUserLanguage(user);
			
 
				             const fcmToken = user.fmToken;
			
 
				             const data1 = getMessageDataFromTemplate(messageData.template1, userLang);
			
 
				-            data1.image = `https://d1e6q48ob2nxw1.cloudfront.net/thumbs/v2/page/640/${artwork1Id}.png`;
			
 
				+            data1.image = `https://d1e6q48ob2nxw1.cloudfront.net/thumbs/v2/fcm/640/${artwork1Id}.png`;
			
 
				             data1.bigger = "true";
			
 
				             data1.action = "go/art";
			
 
				             data1.param = artwork1Id;
			
--- a/oms/public/app/index.html
+++ b/oms/public/app/index.html
@@ -9,5 +9,5 @@
 
				   <style>body,html{width:100%;height:100%}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}@-ms-viewport{width:device-width}body{margin:0;color:#000000d9;font-size:14px;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji";font-variant:tabular-nums;line-height:1.5715;background-color:#fff;font-feature-settings:"tnum"}html{--antd-wave-shadow-color:#1890ff;--scroll-bar:0}</style><link rel="stylesheet" href="styles-LXBSU6DF.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles-LXBSU6DF.css"></noscript></head>
			
 
				   <body>
			
 
				     <app-root></app-root>
			
 
				-  <script src="polyfills-B6TNHZQ6.js" type="module"></script><script src="main-HNOLMC6P.js" type="module"></script></body>
			
 
				+  <script src="polyfills-B6TNHZQ6.js" type="module"></script><script src="main-HFF3XDC3.js" type="module"></script></body>
			
 
				 </html>
			
--- a/oms/public/app/main-HFF3XDC3.js
+++ b/oms/public/app/main-HFF3XDC3.js
--- a/oms/src/scripts/active-user-daily-notify.ts
+++ b/oms/src/scripts/active-user-daily-notify.ts
@@ -211,9 +211,9 @@ export async function run(): Promise<void> {
 
				     const activeUsers = await User.find({
			
 
				       lastActiveAt: { $gte: sevenDaysAgo },
			
 
				       fmToken: { $nin: [null, ""] },
			
 
				-      //   versionName: { $in: ["5.8.0-debug"] },
			
 
				+      versionName: { $in: ["5.8.0-debug"] },
			
 
				       // versionName: { $in: ["5.8.0", "5.8.0-debug"] },
			
 
				-      versionCode: { $gte: 347 },
			
 
				+      // versionCode: { $gte: 347 },
			
 
				     })
			
 
				       .select("_id uid fmToken lang cc")
			
 
				       .lean<IUser[]>();
			
@@ -266,7 +266,7 @@ export async function run(): Promise<void> {
 
				       const fcmToken = user.fmToken as string;
			
 
				 
			
 
				       const data1 = getMessageDataFromTemplate(messageData.template1, userLang);
			
 
				-      data1.image = `https://d1e6q48ob2nxw1.cloudfront.net/thumbs/v2/page/640/${artwork1Id}.png`;
			
 
				+      data1.image = `https://d1e6q48ob2nxw1.cloudfront.net/thumbs/v2/fcm/640/${artwork1Id}.png`;
			
 
				       data1.bigger = "true";
			
 
				       data1.action = "go/art";
			
 
				       data1.param = artwork1Id;
			
--- a/omsapp/src/app/pages/message-dashboard.component.ts
+++ b/omsapp/src/app/pages/message-dashboard.component.ts
@@ -98,15 +98,15 @@ export class MessageDashboardComponent implements OnInit {
 
				         yAxisID: 'y',
			
 
				       },
			
 
				       {
			
 
				-        label: '已打开',
			
 
				+        label: '展示数',
			
 
				         data: [],
			
 
				-        backgroundColor: '#722ed1',
			
 
				+        backgroundColor: '#faad14',
			
 
				         yAxisID: 'y',
			
 
				       },
			
 
				       {
			
 
				-        label: '展示数',
			
 
				+        label: '点击数',
			
 
				         data: [],
			
 
				-        backgroundColor: '#faad14',
			
 
				+        backgroundColor: '#722ed1',
			
 
				         yAxisID: 'y',
			
 
				       },
			
 
				       {
			
@@ -306,14 +306,14 @@ export class MessageDashboardComponent implements OnInit {
 
				           ...this.combinedChartData.datasets[2],
			
 
				           data: this.dailyTrends.map((t) => t.delivered || 0),
			
 
				         },
			
 
				-        {
			
 
				-          ...this.combinedChartData.datasets[3],
			
 
				-          data: this.dailyTrends.map((t) => t.opened || 0),
			
 
				-        },
			
 
				         {
			
 
				           ...this.combinedChartData.datasets[4],
			
 
				           data: this.dailyTrends.map((t) => t.displayCount || 0),
			
 
				         },
			
 
				+        {
			
 
				+          ...this.combinedChartData.datasets[3],
			
 
				+          data: this.dailyTrends.map((t) => t.opened || 0),
			
 
				+        },
			
 
				         {
			
 
				           ...this.combinedChartData.datasets[5],
			
 
				           data: this.dailyTrends.map((t) => t.failed || 0),