123

5_CREATE_LINK_FACTORY/CREATE_LINK_FACTORY.js

@@ -8,7 +8,7 @@ var dz_create_link_task_list = []
 var qm_create_link_task_list = []
 let finish_call_back = async function(new_data,error_info=null){
     try{
-        if(new_data != null && error_info==null){
+        if(new_data.start_page != null && error_info==null){
             const result = await video_applet_product_controllers.updateData({id:new_data.id},{
                 dy_small_program_start:new_data.start_page,
                 dy_small_program_start_data:new_data.start_param,
@@ -152,7 +152,6 @@ async function processTask(){
                 ,qm_create_link_task.main_info,
                 qm_create_link_task.PlatformInfo,finish_call_back)
         }
-        
     }catch(e){
         console.log("CREATE_LINK_FACTORY error:",e)
         finish_call_back(null,{"MESSAGE":"CREATE_LINK_FACTORY error:"})

5_CREATE_LINK_FACTORY/hy_create_link.js

@@ -146,7 +146,9 @@ CMD.runTask = function(data,main_info,PlatformInfo,call_back){
             console.log("作品不存在：",data)
             throw res
         }
-        console.log("create_hy_link:",res)
+        if(res['code']!=200){
+            throw res
+        }
         let response = {
             "message": "create_link successfully",
             "received_data":{

logs/combined.log

@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+=======
 2024-12-20T18:52:38: 
 2024-12-20T18:52:38: > heiyan@1.0.0 start
 2024-12-20T18:52:38: > node tg_factory_main.js
@@ -46,7 +48,11 @@
 2024-12-20T23:13:54: > heiyan@1.0.0 start
 2024-12-20T23:13:54: > node tg_factory_main.js
 2024-12-20T23:13:54: 
+<<<<<<< HEAD
 2024-12-20T23:34:12: 
 2024-12-20T23:34:12: > heiyan@1.0.0 start
 2024-12-20T23:34:12: > node tg_factory_main.js
 2024-12-20T23:34:12: 
+=======
+>>>>>>> 8a8374dcc5bb558d5f5ca1c0d81b8660b9d7b1bb
+>>>>>>> a93412936a2daed0e6486c9d2c47c6f98aa118e7

logs/out.log

@@ -1,3 +1,5 @@
+<<<<<<< HEAD
+=======
 2024-12-20T18:52:38: 
 2024-12-20T18:52:38: > heiyan@1.0.0 start
 2024-12-20T18:52:38: > node tg_factory_main.js
@@ -46,7 +48,11 @@
 2024-12-20T23:13:54: > heiyan@1.0.0 start
 2024-12-20T23:13:54: > node tg_factory_main.js
 2024-12-20T23:13:54: 
+<<<<<<< HEAD
 2024-12-20T23:34:12: 
 2024-12-20T23:34:12: > heiyan@1.0.0 start
 2024-12-20T23:34:12: > node tg_factory_main.js
 2024-12-20T23:34:12: 
+=======
+>>>>>>> 8a8374dcc5bb558d5f5ca1c0d81b8660b9d7b1bb
+>>>>>>> a93412936a2daed0e6486c9d2c47c6f98aa118e7

src/PullDataService.js

@@ -45,15 +45,21 @@ class PullDataService {
     async get_novel_material_list(cur_timeRange,page,size=500) {
         let maxRetries = 3
         let delay = 1000;
+
+        let otherStr = null
+
+        if(cur_timeRange.pull_day!=null&&cur_timeRange.pull_day!=""&&cur_timeRange.pull_day!=undefined){
+            otherStr = cur_timeRange.pull_day
+        }
         for (let i = 0; i < maxRetries; i++) {
             try {
                 var now = new Date(); // 当前时间
 
                 if(cur_timeRange!=null){
                     if(cur_timeRange.start_time==null||cur_timeRange.start_time==""||cur_timeRange.start_time==undefined){
-                        now = helper.getTimeStampByHourMinute(cur_timeRange.start)
+                        now = helper.getTimeStampByHourMinute(cur_timeRange.start,otherStr)
                     }else{
-                        now = helper.getTimeStampByHourMinute(cur_timeRange.start_time)
+                        now = helper.getTimeStampByHourMinute(cur_timeRange.start_time,otherStr)
                     }
                 }
                 let interval_minute = 60;

src/helper.js

@@ -255,12 +255,22 @@ helper.getHyCreateLinkOpt = function(token){
     return options
 }
 
-helper.getTimeStampByHourMinute = function(timeStr) {
-    const [hours, minutes] = timeStr.split(':').map(Number);
-    const today = new Date();
-    today.setHours(hours, minutes, 0, 0);
-    // return today.getTime();
-    return today;
+helper.getTimeStampByHourMinute = function(timeStr,otherStr=null) {
+   // 解析时间字符串
+   const [hours, minutes] = timeStr.split(':').map(Number);
+    
+   let date;
+   if (otherStr) {
+       // 如果提供了日期字符串，解析完整的日期时间
+       date = new Date(otherStr);
+       // 设置时分秒
+       date.setHours(hours, minutes, 0, 0);
+   } else {
+       // 如果没有提供日期，使用今天的日期
+       date = new Date();
+       date.setHours(hours, minutes, 0, 0);
+   }
+   return date;
 }
 
 helper.getLocalDate = function() {