904118851 6 kuukautta sitten
vanhempi
sitoutus
f9bde9a16c

+ 8 - 6
2_PRODUCT_FACTORY/collect_hy_book.js

@@ -18,16 +18,18 @@ CMD.runTask = async function(data){
     let typeDesc = book_info.rows[0].typeDesc; //'中篇',
     let words = book_info.rows[0].words;  //多少字
     data.genre = 0
-    if(typeDesc=="中篇"){
-        data.genre = 2;
-    }
+    // if(typeDesc=="中篇"){
+    //     data.genre = 2;
+    // }
     if(typeDesc=="长篇"){
         data.genre = 1;
-    }
-
-    if(typeDesc=="短篇"){
+    }else{
         data.genre = 3;
     }
+
+    // if(typeDesc=="短篇"){
+    //     data.genre = 3;
+    // }
     if(data.genre==0){
         console.log("获取黑岩书籍信息错误:",book_info)
     }

+ 9 - 5
2_PRODUCT_FACTORY/dz_batch_factory.js

@@ -103,9 +103,10 @@ async function processCreateTask(){
                         result.data.genre = 999
                     }else{
                         dz_book_data.tg_platform_id = result.data.tg_platform_id
-                        if(CMD.isGenre(FilterConfig,dz_book_data.genre)){
-                            await CMD.insert_product(dz_book_data)
-                        }
+                        // if(CMD.isGenre(FilterConfig,dz_book_data.genre)){
+                        //     await CMD.insert_product(dz_book_data)
+                        // }
+                        await CMD.insert_product(dz_book_data)
                         result.data.words = dz_book_data.words
                         result.data.genre = dz_book_data.genre
                         result.data.book_id = dz_book_data.book_id
@@ -205,7 +206,8 @@ CMD.getSharedPlatform = function(PlatformShared,platform_shared_id){
 }
 
 CMD.update_filter_data = async function(FilterConfig,data) {
-    let isGenre = CMD.isGenre(FilterConfig,data.genre)
+    // let isGenre = CMD.isGenre(FilterConfig,data.genre)
+    let isGenre = true
     if(isGenre){
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
@@ -269,7 +271,9 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误:",main_info)
                     }else{
-                        if(!CMD.isBlackBook(black_books,data.book_id)){
+                        let mian_genre = main_info.genre
+                        let book_genre = data.genre
+                        if(!CMD.isBlackBook(black_books,data.book_id)&&mian_genre==book_genre){
                             //符合标准进行创建表
                             const result = await video_applet_product_controllers.getAppletProductData({book_id:data.book_id,main_id:data.main_id})
                             if(!result.success){

+ 8 - 5
2_PRODUCT_FACTORY/fq_batch_factory.js

@@ -126,10 +126,12 @@ async function processCreateTask(){
                     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(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)
+                        // }
+                        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
@@ -217,7 +219,8 @@ CMD.isGenre = function(FilterConfig,genre){
 }
 
 CMD.update_filter_data = async function(FilterConfig,data) {
-    let isGenre = CMD.isGenre(FilterConfig,data.genre)
+    // let isGenre = CMD.isGenre(FilterConfig,data.genre)
+    let isGenre = true
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})

+ 13 - 8
2_PRODUCT_FACTORY/fq_factory.js

@@ -42,9 +42,10 @@ async function processTask(){
                     if(!product_result.success){ //如果只是 get_fq_book 有, 书库里没有
                         fq_book_result.data.tg_platform_id = result.data.tg_platform_id
                         //如果是长篇短篇符合
-                        if(CMD.isGenre(FilterConfig,result.data.genre)){
-                            await CMD.insert_product(result.data)
-                        }
+                        // if(CMD.isGenre(FilterConfig,result.data.genre)){
+                        //     await CMD.insert_product(result.data)
+                        // }
+                        await CMD.insert_product(result.data)
                     }
                 }else{
                     isInsertTask = true
@@ -109,10 +110,12 @@ async function processCreateTask(){
                         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(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)
+                            // }
+                            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
@@ -286,7 +289,9 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误:",main_info)
                     }else{
-                        if(!CMD.isBlackBook(black_books,data.book_id)){
+                        let mian_genre = main_info.genre
+                        let book_genre = data.genre
+                        if(!CMD.isBlackBook(black_books,data.book_id)&&mian_genre==book_genre){
                             //符合标准进行创建表
                             const result = await video_applet_product_controllers.getAppletProductData({book_id:data.book_id,main_id:data.main_id})
                             if(!result.success){

+ 3 - 1
2_PRODUCT_FACTORY/fq_mf_factory.js

@@ -236,7 +236,9 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                 if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                     console.error("主体配置推广链接错误:",main_info)
                 }else{
-                    if(!CMD.isBlackBook(black_books,data.book_id)){
+                    let mian_genre = main_info.genre
+                    let book_genre = data.genre
+                    if(!CMD.isBlackBook(black_books,data.book_id)&&mian_genre==book_genre){
                         //符合标准进行创建表
                         const result = await video_applet_product_controllers.getAppletProductData({book_id:data.book_id,main_id:data.main_id})
                         if(!result.success){

+ 9 - 5
2_PRODUCT_FACTORY/hy_batch_factory.js

@@ -156,9 +156,10 @@ async function processCreateTask(){
                 if(tg_platform_id==config.platform_heiyan){
                     let hy_book_data = await require('./collect_hy_book').runTask(result.data)
                     if(hy_book_data!=null){
-                        if(CMD.isGenre(FilterConfig,hy_book_data.genre)){
-                            await CMD.insert_product(hy_book_data)
-                        }
+                        // if(CMD.isGenre(FilterConfig,hy_book_data.genre)){
+                        //     await CMD.insert_product(hy_book_data)
+                        // }
+                        await CMD.insert_product(hy_book_data)
                         result.data.words = hy_book_data.words
                         result.data.genre = hy_book_data.genre
                         result.data.book_id = hy_book_data.book_id
@@ -260,7 +261,8 @@ CMD.getSharedPlatform = function(PlatformShared,platform_shared_id){
 
 
 CMD.update_filter_data = async function(FilterConfig,data) {
-    let isGenre = CMD.isGenre(FilterConfig,data.genre)
+    // let isGenre = CMD.isGenre(FilterConfig,data.genre)
+    let isGenre = true
     // console.log("data.genre:",data.genre,data,isGenre)
     if(isGenre){
 
@@ -322,7 +324,9 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误:",main_info)
                     }else{
-                        if(!CMD.isBlackBook(black_books,data.book_id)){
+                        let mian_genre = main_info.genre
+                        let book_genre = data.genre
+                        if(!CMD.isBlackBook(black_books,data.book_id)&&mian_genre==book_genre){
                             //符合标准进行创建表
                             const result = await video_applet_product_controllers.getAppletProductData({book_id:data.book_id,main_id:data.main_id})
                             if(!result.success){

+ 4 - 3
2_PRODUCT_FACTORY/hy_factory.js

@@ -64,9 +64,10 @@ async function processCreateTask(){
                 let tg_platform_id = result.data.tg_platform_id
                 if(tg_platform_id==1){
                     let hy_book_data = await require('./collect_hy_book').runTask(result.data)
-                    if(CMD.isGenre(FilterConfig,hy_book_data.genre)){
-                        await CMD.insert_product(hy_book_data)
-                    }
+                    // if(CMD.isGenre(FilterConfig,hy_book_data.genre)){
+                    //     await CMD.insert_product(hy_book_data)
+                    // }
+                    await CMD.insert_product(hy_book_data)
                     result.data.words = hy_book_data.words
                     result.data.genre = hy_book_data.genre
                     result.data.book_id = hy_book_data.book_id

+ 10 - 5
2_PRODUCT_FACTORY/qm_batch_factory.js

@@ -117,9 +117,10 @@ async function processCreateTask(){
                         result.data.genre = 999
                     }else{
                         qm_book_data.tg_platform_id = result.data.tg_platform_id
-                        if(CMD.isGenre(FilterConfig,qm_book_data.genre)){
-                            await CMD.insert_product(qm_book_data)
-                        }
+                        // if(CMD.isGenre(FilterConfig,qm_book_data.genre)){
+                        //     await CMD.insert_product(qm_book_data)
+                        // }
+                        await CMD.insert_product(qm_book_data)
                         result.data.words = qm_book_data.words
                         result.data.genre = qm_book_data.genre
                         result.data.book_id = qm_book_data.book_id
@@ -219,8 +220,10 @@ CMD.getSharedPlatform = function(PlatformShared,platform_shared_id){
 }
 
 CMD.update_filter_data = async function(FilterConfig,data) {
-    let isGenre = CMD.isGenre(FilterConfig,data.genre)
+    // let isGenre = CMD.isGenre(FilterConfig,data.genre)
+    let isGenre = true
     if(isGenre){
+        console.log("data:",data)
         await filter_data_controllers.updateFilterData({id:data.id},{status:1,book_id:data.book_id,book_name:data.book_name,genre:data.genre,words:data.words})
         //创建一个小程序    
 
@@ -275,7 +278,9 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误:",main_info)
                     }else{
-                        if(!CMD.isBlackBook(black_books,data.book_id)){
+                        let mian_genre = main_info.genre
+                        let book_genre = data.genre
+                        if(!CMD.isBlackBook(black_books,data.book_id)&&mian_genre==book_genre){
                             //符合标准进行创建表
                             const result = await video_applet_product_controllers.getAppletProductData({book_id:data.book_id,main_id:data.main_id})
                             if(!result.success){

+ 4 - 3
2_PRODUCT_FACTORY/qm_factory.js

@@ -72,9 +72,10 @@ async function processCreateTask(){
                         result.data.genre = 999
                     }else{
                         qm_book_data.tg_platform_id = result.data.tg_platform_id
-                        if(CMD.isGenre(FilterConfig,qm_book_data.genre)){
-                            await CMD.insert_product(qm_book_data)
-                        }
+                        // if(CMD.isGenre(FilterConfig,qm_book_data.genre)){
+                        //     await CMD.insert_product(qm_book_data)
+                        // }
+                        await CMD.insert_product(qm_book_data)
                         result.data.words = qm_book_data.words
                         result.data.genre = qm_book_data.genre
                         result.data.book_id = qm_book_data.book_id

+ 3 - 1
2_PRODUCT_FACTORY/yw_batch_factory.js

@@ -281,7 +281,9 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误:",main_info)
                     }else{
-                        if(!CMD.isBlackBook(black_books,data.book_id)){
+                        let mian_genre = main_info.genre
+                        let book_genre = data.genre
+                        if(!CMD.isBlackBook(black_books,data.book_id)&&mian_genre==book_genre){
                             //符合标准进行创建表
                             const result = await video_applet_product_controllers.getAppletProductData({book_id:data.book_id,main_id:data.main_id})
                             if(!result.success){

+ 7 - 4
2_PRODUCT_FACTORY/zh_batch_factory.js

@@ -117,9 +117,10 @@ async function processCreateTask(){
                         result.data.genre = 999
                     }else{
                         zh_book_data.tg_platform_id = result.data.tg_platform_id
-                        if(CMD.isGenre(FilterConfig,zh_book_data.genre)){
-                            await CMD.insert_product(zh_book_data)
-                        }
+                        // if(CMD.isGenre(FilterConfig,zh_book_data.genre)){
+                        //     await CMD.insert_product(zh_book_data)
+                        // }
+                        await CMD.insert_product(zh_book_data)
                         result.data.words = zh_book_data.words
                         result.data.genre = zh_book_data.genre
                         result.data.book_id = zh_book_data.book_id
@@ -272,7 +273,9 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                     if(main_info.tg_link_config==undefined||main_info.tg_link_config==null){
                         console.error("主体配置推广链接错误:",main_info)
                     }else{
-                        if(!CMD.isBlackBook(black_books,data.book_id)){
+                        let mian_genre = main_info.genre
+                        let book_genre = data.genre
+                        if(!CMD.isBlackBook(black_books,data.book_id)&&mian_genre==book_genre){
                             //符合标准进行创建表
                             const result = await video_applet_product_controllers.getAppletProductData({book_id:data.book_id,main_id:data.main_id})
                             if(!result.success){

+ 5 - 1
7_CHECK_AND_CREATE_URL_FACTORY/CHECK_AND_CREATE_URL_FACTORY.js

@@ -52,7 +52,7 @@ async function processTask() {
                 let promotion_id = video_applet_product_item.promotion_id
                 let dy_small_program_start = video_applet_product_item.dy_small_program_start
                 let dy_small_program_start_data = video_applet_product_item.dy_small_program_start_data
-                if(main_info==null&&result.data.is_close_execution==1){
+                if(main_info==null&&video_applet_product_item.is_close_execution==1){
                     let CloseMainConfig = await redis_help.getKeyValue("CloseMainConfig")
                     CloseMainConfig = JSON.parse(CloseMainConfig)
                     main_info = CMD.getMainInfoById(CloseMainConfig,main_id)
@@ -118,11 +118,15 @@ async function processTask() {
                         })
                         await new Promise(resolve => setTimeout(resolve,100));
                     }
+                }else{
+                       throw `主体是空的 !:${main_id}` 
                 }
     
 
             }
 
+       }else{
+            throw "查询表格失败!"
        }
     } catch (e) {
         console.log("暂无监测链接创建",e)

+ 1 - 1
MAIN_SERVE_FACTORY/MAIN_SERVE_FACTORY.js

@@ -154,7 +154,7 @@ CMD.syncMain = async function(tg_platform_id, main_info) {
                 "page_number": cur_page,
                 "is_auto": "",
                 "is_store": "",
-                "genre": "",
+                "genre": main_info.genre,
                 "alias_name": ""
             }
         };

BIN
dump.rdb


+ 5 - 4
logs/combined.log

@@ -1,4 +1,5 @@
-2025-02-13T14:58:40: 
-2025-02-13T14:58:40: > heiyan@1.0.0 start
-2025-02-13T14:58:40: > node tg_factory_main.js
-2025-02-13T14:58:40: 
+2025-02-14T11:27:59: 
+2025-02-14T11:27:59: > heiyan@1.0.0 start
+2025-02-14T11:27:59: > node tg_factory_main.js
+2025-02-14T11:27:59: 
+2025-02-14T11:28:03: Connected to Redis

+ 5 - 4
logs/out.log

@@ -1,4 +1,5 @@
-2025-02-13T14:58:40: 
-2025-02-13T14:58:40: > heiyan@1.0.0 start
-2025-02-13T14:58:40: > node tg_factory_main.js
-2025-02-13T14:58:40: 
+2025-02-14T11:27:59: 
+2025-02-14T11:27:59: > heiyan@1.0.0 start
+2025-02-14T11:27:59: > node tg_factory_main.js
+2025-02-14T11:27:59: 
+2025-02-14T11:28:03: Connected to Redis

BIN
src/api/hy/qr.gif


BIN
src/api/hy/qr_resized.gif


+ 6 - 1
src/api/zh/zh_search_book.js

@@ -39,8 +39,13 @@ CMD.search_id = async function(bookId) {
         info.words =  book_info.word_count
         info.book_name =  book_info.work_title
         info.book_id =  book_info.work_id
+        if(book_info.word_count<100000){
+            info.genre = 3;
+        }else{
+            info.genre = 1;
+        }
         // info.genre = 999;
-        info.genre = 3;
+        // info.genre = 3;
         return info;
     }catch(error){
         console.error('知乎书籍::请求错误:', error);