123

check_hy_info.js

@@ -25,9 +25,9 @@ async function processTask(){
                 let words = hy_book_data.rows[0].words; //,
 
                 if(words>100000){
-                    data.genre = 1;
+                    genre = 1;
                 }else{
-                    data.genre = 3;
+                    genre = 3;
                 }
                 await video_product_controllers.updateData({id:product_item.id},{
                      genre:genre,

logs/combined.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-02-22T00:04:08: 
 2025-02-22T00:04:08: > heiyan@1.0.0 start
 2025-02-22T00:04:08: > node tg_factory_main.js
@@ -6,3 +7,9 @@
 2025-03-03T19:56:49: > heiyan@1.0.0 start
 2025-03-03T19:56:49: > node tg_factory_main.js
 2025-03-03T19:56:49: 
+=======
+2025-03-04T12:20:07: 
+2025-03-04T12:20:07: > heiyan@1.0.0 start
+2025-03-04T12:20:07: > node tg_factory_main.js
+2025-03-04T12:20:07: 
+>>>>>>> 07e8f53676caeb78027a73892a848b0a762b8130

logs/out.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-02-22T00:04:08: 
 2025-02-22T00:04:08: > heiyan@1.0.0 start
 2025-02-22T00:04:08: > node tg_factory_main.js
@@ -6,3 +7,9 @@
 2025-03-03T19:56:49: > heiyan@1.0.0 start
 2025-03-03T19:56:49: > node tg_factory_main.js
 2025-03-03T19:56:49: 
+=======
+2025-03-04T12:20:07: 
+2025-03-04T12:20:07: > heiyan@1.0.0 start
+2025-03-04T12:20:07: > node tg_factory_main.js
+2025-03-04T12:20:07: 
+>>>>>>> 07e8f53676caeb78027a73892a848b0a762b8130