guoziyun 9 tháng trước cách đây
mục cha
commit
e0fdb3c37b

+ 6 - 40
oms/dist/services/cron-jobs/active-user-daily-notify.js

@@ -1,40 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = run;
-const mongoose_1 = __importStar(require("mongoose"));
+const mongoose_1 = __importDefault(require("mongoose"));
 const userModel_1 = require("../../src/models/userModel");
 // 确保先导入并注册 MessageTemplate 模型
 const messageTemplateModel_1 = require("../../src/models/messageTemplateModel");
@@ -44,13 +14,9 @@ mongoose_1.default.model("MessageTemplate", messageTemplateModel_1.MessageTempla
 const messageStrategyModel_1 = require("../../src/models/messageStrategyModel");
 const messageRecordModel_1 = require("../../src/models/messageRecordModel");
 const fcmService_1 = require("../../src/services/fcmService");
+const artModel_1 = __importDefault(require("../../src/models/artModel"));
 const strategyName = "active_new_content_notify";
 const fcmService = fcmService_1.FCMService.getInstance();
-const ArtSchema = new mongoose_1.Schema({
-    tags: [{ type: String }],
-    publishTime: { type: Date, required: true },
-});
-const Art = mongoose_1.default.model("Art", ArtSchema, "arts");
 // 国家代码到语言的映射表,包含您提供的 top10 国家,可根据需求扩展
 const countryCodeToLanguageMap = {
     CN: "zh-cn",
@@ -110,7 +76,7 @@ function getMessageDataFromTemplate(template, userLang) {
  */
 async function getTodaysArtworksForFCM() {
     try {
-        const artworks = await Art.find({ tags: "fcm" })
+        const artworks = await artModel_1.default.find({ tags: "fcm" })
             // const artworks = await Art.find({})
             .sort({ publishTime: -1 }) // 倒序排序
             .limit(2) // 限制为2个

+ 1 - 12
oms/services/cron-jobs/active-user-daily-notify.ts

@@ -11,22 +11,11 @@ import { MessageStrategy, IMessageStrategy } from "../../src/models/messageStrat
 
 import { MessageRecord, IMessageRecord } from "../../src/models/messageRecordModel";
 import { FCMService } from "../../src/services/fcmService";
+import Art, { IArt } from "../../src/models/artModel";
 
 const strategyName = "active_new_content_notify";
 const fcmService = FCMService.getInstance();
 
-// 定义一个简单的 Art 接口和模型,用于查询
-interface IArt extends Document {
-  tags: string[];
-  publishTime: Date;
-  _id: mongoose.Types.ObjectId;
-}
-const ArtSchema: Schema = new Schema({
-  tags: [{ type: String }],
-  publishTime: { type: Date, required: true },
-});
-const Art = mongoose.model<IArt>("Art", ArtSchema, "arts");
-
 // 国家代码到语言的映射表,包含您提供的 top10 国家,可根据需求扩展
 const countryCodeToLanguageMap: { [key: string]: string } = {
   CN: "zh-cn",