904118851 7 miesięcy temu
rodzic
commit
68ce8a4dab

+ 41 - 16
1_FILTER_FACTORY/FILTER_FACTORY.js

@@ -5,7 +5,12 @@ const origin_data_controllers = require('../src/data_manager/Controllers/origin_
 const filter_data_controllers = require('../src/data_manager/Controllers/filter_data_controllers');
 const helper = require('../src/helper');
 async function createFilterData(result,FilterConfig) {
-    let filter_data = filter_and_insert(result.data,FilterConfig)
+    
+    let PlatformConfig = await redis_help.getKeyValue("PlatformConfig")
+
+    PlatformConfig = JSON.parse(PlatformConfig)
+
+    let filter_data = filter_and_insert(result.data,FilterConfig,PlatformConfig)
     if(filter_data!=null){
         filter_data.status = 0; //设置筛选的这个状态未定义
         let res =  await filter_data_controllers.createFilterData({
@@ -91,18 +96,18 @@ CMD.init = function(){
 }
 
 
-function filter_and_insert(origin_data,tg_config){
-
+function filter_and_insert(origin_data,tg_config,PlatformConfig){
     if(origin_data.guajian_link.length<=0){
         return null
     }
 
-    let obj = parsePromotion(origin_data.guajian_link,tg_config.source_filter,tg_config.platform_select)
+    let obj = parsePromotion(origin_data.guajian_link,tg_config.source_filter,tg_config.platform_select,PlatformConfig)
     // console.log("obj::",obj)
     if(obj==null){
         console.log("xml[挂件地址] error 2:",obj)
         return null
     }
+    console.log(JSON.stringify(obj))
     // console.log("挂件地址正确")
     if(origin_data.like_num < tg_config.like_num){
         return null
@@ -120,15 +125,15 @@ function filter_and_insert(origin_data,tg_config){
         return null
     }
     let tg_platform_id = 0
-    if(obj.channel=="番茄"){
+    if(obj.channel==2){ //"番茄"
         tg_platform_id = 2
         obj.book_id = obj.key
-    }else if(obj.channel=="黑岩"){
+    }else if(obj.channel==1){ //"黑岩"
         tg_platform_id = 1
-    }else if(obj.channel=="七猫"){
+    }else if(obj.channel==3){ //"七猫"
         tg_platform_id = 3
         obj.book_id = obj.id
-    }else if(obj.channel=="点众"){
+    }else if(obj.channel==4){ //"点众"
         tg_platform_id = 4
         obj.book_id = obj.book_id
     }
@@ -137,42 +142,62 @@ function filter_and_insert(origin_data,tg_config){
         like_num:origin_data.like_num,kepp_num:origin_data.kepp_num ,shared_num:origin_data.shared_num,comment_num:origin_data.comment_num,tg_platform_id:tg_platform_id}
 }
 
-function getChannel(start_page,platform_select,promotion){
+function getChannel(start_page,platform_select,promotion,PlatformConfig){
     let isOpenHeiYan = false
     let isOpenFanQie = false
     let isOpenQiMao = false
     let isOpenDianZhong = false
+    let kv = new Map()
+
+
+    for (let index = 0; index < PlatformConfig.length; index++) {
+        const platform_info = PlatformConfig[index];
+        kv.set(platform_info.tg_platform_id,false)
+    }
+
     for (let index = 0; index < platform_select.length; index++) {
         const element = platform_select[index];
         if(element==1){
             isOpenHeiYan = true
+            kv.set(element,true)
         }
         if(element==2){
             isOpenFanQie = true
+            kv.set(element,true)
         }
         if(element==3){
             isOpenQiMao = true
+            kv.set(element,true)
         }
         if(element==4){
             isOpenDianZhong = true
+            kv.set(element,true)
+        }
+    }
+
+    // console.log("PlatformConfig:",PlatformConfig,kv)
+    for (let index = 0; index < PlatformConfig.length; index++) {
+        const platform_info = PlatformConfig[index];
+        if(helper.checkChannel(promotion,platform_info.filter_guajian_logic)&&kv.get(platform_info.tg_platform_id)){
+            return platform_info.tg_platform_id
         }
     }
+    return null
     // console.log("start_page:",isOpenHeiYan,isOpenFanQie,start_page)
-    if(start_page=="pages/readPage/chapter?bookId"&&isOpenHeiYan){
+    if(helper.checkChannel(promotion,'pages/readPage/chapter')&&isOpenHeiYan){ //start_page=="pages/readPage/chapter?bookId"
         return "黑岩"
-    }else if(start_page=="pages/bookstore/index?aid"&&isOpenFanQie){
+    }else if(helper.checkChannel(promotion,'pages/bookstore/index')&&isOpenFanQie){   //start_page=="pages/bookstore/index?aid"
         return "番茄"
-    }
-    else if(start_page=="pages/reader/index?bookId"&&isOpenDianZhong){ //点众
+    }else if(helper.checkChannel(promotion,'pages/reader/index?bookId=')&&isOpenDianZhong){ //点众  //start_page=="pages/reader/index?bookId"
         return "点众"
-    }else if(helper.checkChannel(promotion,'&channel=rd')&&isOpenQiMao){ //七猫
+    }else if(helper.checkChannel(promotion,'channel=rd')&&isOpenQiMao){ //七猫
         return "七猫"
     }
     return null
 }
 
 //解析挂件
-function parsePromotion(promotion,source_list,platform_select){
+function parsePromotion(promotion,source_list,platform_select,PlatformConfig){
     let list = promotion.split('&')
     if(list.length!=undefined){
         if(list.length>2){
@@ -187,7 +212,7 @@ function parsePromotion(promotion,source_list,platform_select){
                     params[obj.key] = obj.value
                 }
             }
-            let channel = getChannel(params['start_page'],platform_select,promotion)
+            let channel = getChannel(params['start_page'],platform_select,promotion,PlatformConfig)
             // console.log("source_list:",source_list,platform_select,channel,params['start_page'])
             if(channel!=null){
                 let item_info = {}

BIN
dump.rdb


+ 1 - 1
etc/config.json

@@ -1,5 +1,5 @@
 {
-    "isDebug":false,
+    "isDebug":true,
     "redis_config": {
         "host": "127.0.0.1",
         "port": 6379

+ 35 - 0
logs/combined.log

@@ -53,3 +53,38 @@
 2024-12-31T12:26:02: > heiyan@1.0.0 start
 2024-12-31T12:26:02: > node tg_factory_main.js
 2024-12-31T12:26:02: 
+2024-12-31T16:29:38: 
+2024-12-31T16:29:38: > heiyan@1.0.0 start
+2024-12-31T16:29:38: > node tg_factory_main.js
+2024-12-31T16:29:38: 
+2024-12-31T16:29:41: Connected to Redis
+2024-12-31T17:02:44: 
+2024-12-31T17:02:44: > heiyan@1.0.0 start
+2024-12-31T17:02:44: > node tg_factory_main.js
+2024-12-31T17:02:44: 
+2024-12-31T17:02:47: Connected to Redis
+2024-12-31T17:04:46: 
+2024-12-31T17:04:46: > heiyan@1.0.0 start
+2024-12-31T17:04:46: > node tg_factory_main.js
+2024-12-31T17:04:46: 
+2024-12-31T17:04:49: Connected to Redis
+2024-12-31T17:15:57: 
+2024-12-31T17:15:57: > heiyan@1.0.0 start
+2024-12-31T17:15:57: > node tg_factory_main.js
+2024-12-31T17:15:57: 
+2024-12-31T17:16:00: Connected to Redis
+2024-12-31T17:21:26: 
+2024-12-31T17:21:26: > heiyan@1.0.0 start
+2024-12-31T17:21:26: > node tg_factory_main.js
+2024-12-31T17:21:26: 
+2024-12-31T17:21:28: Connected to Redis
+2024-12-31T17:30:03: 
+2024-12-31T17:30:03: > heiyan@1.0.0 start
+2024-12-31T17:30:03: > node tg_factory_main.js
+2024-12-31T17:30:03: 
+2024-12-31T17:30:06: Connected to Redis
+2024-12-31T17:31:16: 
+2024-12-31T17:31:16: > heiyan@1.0.0 start
+2024-12-31T17:31:16: > node tg_factory_main.js
+2024-12-31T17:31:16: 
+2024-12-31T17:31:19: Connected to Redis

+ 10 - 25
logs/out.log

@@ -1,25 +1,10 @@
-<<<<<<< HEAD
-2024-12-31T12:05:51: 
-2024-12-31T12:05:51: > heiyan@1.0.0 start
-2024-12-31T12:05:51: > node tg_factory_main.js
-2024-12-31T12:05:51: 
-=======
-2024-12-31T12:07:34: 
-2024-12-31T12:07:34: > heiyan@1.0.0 start
-2024-12-31T12:07:34: > node tg_factory_main.js
-2024-12-31T12:07:34: 
-2024-12-31T12:07:37: Connected to Redis
-2024-12-31T12:07:37: res: { words: 0, book_name: '朝暮与共至春晚', book_id: '11010292075', genre: 3 }
->>>>>>> 4a7895b7e7ffe863376ef2e54d32bd99102859d5
-2024-12-31T12:10:06: 
-2024-12-31T12:10:06: > heiyan@1.0.0 start
-2024-12-31T12:10:06: > node tg_factory_main.js
-2024-12-31T12:10:06: 
-2024-12-31T12:12:28: 
-2024-12-31T12:12:28: > heiyan@1.0.0 start
-2024-12-31T12:12:28: > node tg_factory_main.js
-2024-12-31T12:12:28: 
-2024-12-31T12:26:02: 
-2024-12-31T12:26:02: > heiyan@1.0.0 start
-2024-12-31T12:26:02: > node tg_factory_main.js
-2024-12-31T12:26:02: 
+2024-12-31T17:30:03: 
+2024-12-31T17:30:03: > heiyan@1.0.0 start
+2024-12-31T17:30:03: > node tg_factory_main.js
+2024-12-31T17:30:03: 
+2024-12-31T17:30:06: Connected to Redis
+2024-12-31T17:31:16: 
+2024-12-31T17:31:16: > heiyan@1.0.0 start
+2024-12-31T17:31:16: > node tg_factory_main.js
+2024-12-31T17:31:16: 
+2024-12-31T17:31:19: Connected to Redis

BIN
src/api/hy/qr.gif


BIN
src/api/hy/qr_resized.gif


+ 2 - 2
tg_factory_main.js

@@ -36,8 +36,8 @@ if(config.isDebug){
     redis_help.connect( async (results)=>{
         if(results){
             isInit = true
-            let res = await require('./src/api/dz/dz_new_search_book').search_id("11010292075")
-            console.log("res:",res)
+            // let res = await require('./src/api/dz/dz_new_search_book').search_id("11010292075")
+            // console.log("res:",res)
                 // let response =  helper.resolveDomain("sdksaleapi.hubeidehuic.com")
                 // console.log("response:",response)
             // try {