904118851 8 сар өмнө
parent
commit
4b03b65894

+ 1 - 0
0_RECEIVE_FACTORY/RECEIVE_FACTORY.js

@@ -90,6 +90,7 @@ CMD.test_fq_book_sid_tt = async function(book_id,sid_tt){
     try{
         let client =new HttpClient()
         let response =  await client.proxyRequest( helper.getFqRequestOpt(book_id,sid_tt))
+        console.log("response:",response)
         let obj = response['data']
         return obj['novel_data']
     }catch(e){

+ 29 - 21
2_PRODUCT_FACTORY/fq_factory.js

@@ -85,33 +85,41 @@ async function processCreateTask(){
             FilterConfig = JSON.parse(FilterConfig)
             if(!product.success){
                 let tg_platform_id = result.data.tg_platform_id
-                if(tg_platform_id==2){
+                if(tg_platform_id==config.platform_fanqie){
                     let client =  new HttpClient()
                     let sid_tt = await tools.getFqSidtt()
                     let response =  await client.proxyRequest( helper.getFqRequestOpt(result.data.book_id,sid_tt))
                     let obj = response['data']
-                    let book_name =  obj['novel_data'].book_name
-                    let book_id = obj['novel_data'].book_id
-                    let genre = CMD.getFqGenre(obj['novel_data'].genre)
-                    let words = obj['novel_data'].word_number
-                    let fq_book_data = {book_name:book_name,book_id:book_id,genre:genre,words:words,info:JSON.stringify(obj['novel_data'])}
-                    let fq_book = {} 
-                    fq_book.key = result.data.book_id
-                    // console.log("response:",obj,sid_tt)
-                    await CMD.add_fq_book(fq_book,fq_book_data)
-                    let product_result = await video_product_controllers.getProductData({ book_id: fq_book_data.book_id });
-                    if(!product_result.success){ //如果书库也没有
-                        fq_book.tg_platform_id = result.data.tg_platform_id
-                    
-                        if(CMD.isGenre(FilterConfig,fq_book_data.genre)){
-                            fq_book_data.tg_platform_id = result.data.tg_platform_id
-                            await CMD.insert_product(fq_book_data)
+                    if (Object.keys(obj['novel_data']).length === 0) {
+                        result.data.words = 0
+                        result.data.genre = 999
+                        result.data.book_id = result.data.book_id
+                        result.data.book_name = "没有找到这本书"
+                    }else{
+                        let book_name =  obj['novel_data'].book_name
+                        let book_id = obj['novel_data'].book_id
+                        let genre = CMD.getFqGenre(obj['novel_data'].genre)
+                        let words = obj['novel_data'].word_number
+                        let fq_book_data = {book_name:book_name,book_id:book_id,genre:genre,words:words,info:JSON.stringify(obj['novel_data'])}
+                        let fq_book = {} 
+                        fq_book.key = result.data.book_id
+                        // console.log("response:",obj,sid_tt)
+                        await CMD.add_fq_book(fq_book,fq_book_data)
+                        let product_result = await video_product_controllers.getProductData({ book_id: fq_book_data.book_id });
+                        if(!product_result.success){ //如果书库也没有
+                            fq_book.tg_platform_id = result.data.tg_platform_id
+                        
+                            if(CMD.isGenre(FilterConfig,fq_book_data.genre)){
+                                fq_book_data.tg_platform_id = result.data.tg_platform_id
+                                await CMD.insert_product(fq_book_data)
+                            }
                         }
+                        result.data.words = words
+                        result.data.genre = fq_book_data.genre
+                        result.data.book_id = fq_book_data.book_id
+                        result.data.book_name = fq_book_data.book_name
                     }
-                    result.data.words = words
-                    result.data.genre = fq_book_data.genre
-                    result.data.book_id = fq_book_data.book_id
-                    result.data.book_name = fq_book_data.book_name
+              
                 }
             }
             await CMD.update_filter_data(FilterConfig,result.data)

+ 1 - 0
2_PRODUCT_FACTORY/hy_batch_factory.js

@@ -168,6 +168,7 @@ async function processCreateTask(){
                         result.data.genre = 999
                         result.data.book_id = result.data.book_id
                         result.data.book_name = "没有找到这本书"
+                        
                     }
                 }
             }else{

BIN
dump.rdb


+ 32 - 0
logs/combined.log

@@ -185,11 +185,43 @@
 2024-12-21T16:22:54: > heiyan@1.0.0 start
 2024-12-21T16:22:54: > node tg_factory_main.js
 2024-12-21T16:22:54: 
+<<<<<<< HEAD
+2024-12-21T18:09:00: 
+2024-12-21T18:09:00: > heiyan@1.0.0 start
+2024-12-21T18:09:00: > node tg_factory_main.js
+2024-12-21T18:09:00: 
+2024-12-21T18:09:03: Connected to Redis
+2024-12-21T18:15:05: 
+2024-12-21T18:15:05: > heiyan@1.0.0 start
+2024-12-21T18:15:05: > node tg_factory_main.js
+2024-12-21T18:15:05: 
+2024-12-21T18:15:08: Connected to Redis
+2024-12-21T18:15:50: 
+2024-12-21T18:15:50: > heiyan@1.0.0 start
+2024-12-21T18:15:50: > node tg_factory_main.js
+2024-12-21T18:15:50: 
+2024-12-21T18:15:52: Connected to Redis
+2024-12-21T18:17:17: 
+2024-12-21T18:17:17: > heiyan@1.0.0 start
+2024-12-21T18:17:17: > node tg_factory_main.js
+2024-12-21T18:17:17: 
+2024-12-21T18:17:19: Connected to Redis
+2024-12-21T18:17:19: 
+2024-12-21T18:17:19: Trying DNS server: 8.8.8.8
+2024-12-21T18:17:19: response: Promise { <pending> }
+2024-12-21T18:17:19: Success with DNS server 8.8.8.8:
+2024-12-21T18:17:19: IP Addresses: [ '114.111.0.85' ]
+2024-12-21T18:17:19: Testing connectivity to IP: 114.111.0.85
+=======
 2024-12-21T16:39:56: 
 2024-12-21T16:39:56: > heiyan@1.0.0 start
 2024-12-21T16:39:56: > node tg_factory_main.js
 2024-12-21T16:39:56: 
+<<<<<<< HEAD
 2024-12-21T16:57:11: 
 2024-12-21T16:57:11: > heiyan@1.0.0 start
 2024-12-21T16:57:11: > node tg_factory_main.js
 2024-12-21T16:57:11: 
+=======
+>>>>>>> 821707c8911e25613e0511b08e42e7a07c815131
+>>>>>>> 3239f73fba6cda6e57799f8bdae5994813046a42

+ 32 - 0
logs/out.log

@@ -185,11 +185,43 @@
 2024-12-21T16:22:54: > heiyan@1.0.0 start
 2024-12-21T16:22:54: > node tg_factory_main.js
 2024-12-21T16:22:54: 
+<<<<<<< HEAD
+2024-12-21T18:09:00: 
+2024-12-21T18:09:00: > heiyan@1.0.0 start
+2024-12-21T18:09:00: > node tg_factory_main.js
+2024-12-21T18:09:00: 
+2024-12-21T18:09:03: Connected to Redis
+2024-12-21T18:15:05: 
+2024-12-21T18:15:05: > heiyan@1.0.0 start
+2024-12-21T18:15:05: > node tg_factory_main.js
+2024-12-21T18:15:05: 
+2024-12-21T18:15:08: Connected to Redis
+2024-12-21T18:15:50: 
+2024-12-21T18:15:50: > heiyan@1.0.0 start
+2024-12-21T18:15:50: > node tg_factory_main.js
+2024-12-21T18:15:50: 
+2024-12-21T18:15:52: Connected to Redis
+2024-12-21T18:17:17: 
+2024-12-21T18:17:17: > heiyan@1.0.0 start
+2024-12-21T18:17:17: > node tg_factory_main.js
+2024-12-21T18:17:17: 
+2024-12-21T18:17:19: Connected to Redis
+2024-12-21T18:17:19: 
+2024-12-21T18:17:19: Trying DNS server: 8.8.8.8
+2024-12-21T18:17:19: response: Promise { <pending> }
+2024-12-21T18:17:19: Success with DNS server 8.8.8.8:
+2024-12-21T18:17:19: IP Addresses: [ '114.111.0.85' ]
+2024-12-21T18:17:19: Testing connectivity to IP: 114.111.0.85
+=======
 2024-12-21T16:39:56: 
 2024-12-21T16:39:56: > heiyan@1.0.0 start
 2024-12-21T16:39:56: > node tg_factory_main.js
 2024-12-21T16:39:56: 
+<<<<<<< HEAD
 2024-12-21T16:57:11: 
 2024-12-21T16:57:11: > heiyan@1.0.0 start
 2024-12-21T16:57:11: > node tg_factory_main.js
 2024-12-21T16:57:11: 
+=======
+>>>>>>> 821707c8911e25613e0511b08e42e7a07c815131
+>>>>>>> 3239f73fba6cda6e57799f8bdae5994813046a42