904118851 há 7 meses atrás
pai
commit
f168e15f9d

+ 45 - 8
5_CREATE_LINK_FACTORY/dz_create_link_factory.js

@@ -39,6 +39,24 @@ CMD.isBlackBook = function(all_black_books,book_id){
     }
     return false
 }
+
+CMD.getPlatformInfo = function(PlatformConfig,tg_platform_id){
+    for (let index = 0; index < PlatformConfig.length; index++) {
+        const element = PlatformConfig[index];
+        if(element.tg_platform_id==tg_platform_id){
+            return element
+        }
+    }
+}
+CMD.getSharedPlatform = function(PlatformShared,platform_shared_id){
+    for (let index = 0; index < PlatformShared.length; index++) {
+        const element = PlatformShared[index];
+        if(element.id==platform_shared_id){
+            return JSON.parse(element.info)
+        }
+    }
+}
+
 async function processTask(){
     try{
         let MainConfig = await redis_help.getKeyValue("MainConfig")
@@ -53,7 +71,28 @@ async function processTask(){
             black_books = JSON.parse(black_books)
         }
        
-        let result = await video_applet_product_controllers.getAppletProductDataByStatus({status:0,wait_status:0,book_platform:config.platform_dianzhong})
+        let PlatformShared = await redis_help.getKeyValue("PlatformShared")
+
+        PlatformShared = JSON.parse(PlatformShared)
+
+        let platform_fanqie_info = CMD.getPlatformInfo(PlatformConfig,config.platform_dianzhong)
+
+        let all_platform_list = CMD.getSharedPlatform(PlatformShared,platform_fanqie_info.platform_shared_id)
+
+        let result = null
+        
+        for (let index = 0; index < all_platform_list.length; index++) {
+            const tg_platform_id = all_platform_list[index];
+            let temp_result = await video_applet_product_controllers.getAppletProductDataByStatus({status:0,wait_status:0,book_platform:tg_platform_id})
+            if(temp_result.success){
+                result = temp_result
+                break
+            }
+        }
+
+        if(result==null){
+            return
+        }
 
         if(result.success){
 
@@ -97,13 +136,11 @@ async function processTask(){
                 throw "主体配置错误:"
             }
           
-            if(result.data.book_platform==config.platform_dianzhong){
-                dz_create_link_task_list.push({
-                    n_data:result.data,
-                    main_info:main_info,
-                    PlatformInfo:PlatformInfo
-                })
-            }
+            dz_create_link_task_list.push({
+                n_data:result.data,
+                main_info:main_info,
+                PlatformInfo:PlatformInfo
+            })
         }
         if(dz_create_link_task_list.length>0){
             let dz_create_link_task = dz_create_link_task_list.pop()

+ 45 - 8
5_CREATE_LINK_FACTORY/fq_create_link_factory.js

@@ -39,6 +39,24 @@ CMD.isBlackBook = function(all_black_books,book_id){
     }
     return false
 }
+
+CMD.getPlatformInfo = function(PlatformConfig,tg_platform_id){
+    for (let index = 0; index < PlatformConfig.length; index++) {
+        const element = PlatformConfig[index];
+        if(element.tg_platform_id==tg_platform_id){
+            return element
+        }
+    }
+}
+CMD.getSharedPlatform = function(PlatformShared,platform_shared_id){
+    for (let index = 0; index < PlatformShared.length; index++) {
+        const element = PlatformShared[index];
+        if(element.id==platform_shared_id){
+            return JSON.parse(element.info)
+        }
+    }
+}
+
 async function processTask(){
     try{
         let MainConfig = await redis_help.getKeyValue("MainConfig")
@@ -53,7 +71,28 @@ async function processTask(){
             black_books = JSON.parse(black_books)
         }
        
-        let result = await video_applet_product_controllers.getAppletProductDataByStatus({status:0,wait_status:0,book_platform:config.platform_fanqie})
+        let PlatformShared = await redis_help.getKeyValue("PlatformShared")
+
+        PlatformShared = JSON.parse(PlatformShared)
+
+        let platform_fanqie_info = CMD.getPlatformInfo(PlatformConfig,config.platform_fanqie)
+
+        let all_platform_list = CMD.getSharedPlatform(PlatformShared,platform_fanqie_info.platform_shared_id)
+
+        let result = null
+        
+        for (let index = 0; index < all_platform_list.length; index++) {
+            const tg_platform_id = all_platform_list[index];
+            let temp_result = await video_applet_product_controllers.getAppletProductDataByStatus({status:0,wait_status:0,book_platform:tg_platform_id})
+            if(temp_result.success){
+                result = temp_result
+                break
+            }
+        }
+
+        if(result==null){
+            return
+        }
 
         if(result.success){
 
@@ -97,13 +136,11 @@ async function processTask(){
                 throw "主体配置错误:"
             }
 
-            if(result.data.book_platform==config.platform_fanqie){
-                fq_create_link_task_list.push({
-                    n_data:result.data,
-                    main_info:main_info,
-                    PlatformInfo:PlatformInfo
-                })
-            }
+            fq_create_link_task_list.push({
+                n_data:result.data,
+                main_info:main_info,
+                PlatformInfo:PlatformInfo
+            })
          
         }
 

+ 4 - 1
5_CREATE_LINK_FACTORY/hy_create_link.js

@@ -7,6 +7,7 @@ let get_hy_call_back_template = require('../src/api/hy/get_hy_call_back_template
 const tools = require('../tools');
 const HttpClient = require('../src/HttpClient');
 const helper = require('../src/helper');
+const config = require('../etc/config.json')
 //卡点
 function get_paid_point(book_id,kadian_name,call_back){
   let chapter_num = parseInt(kadian_name)
@@ -135,8 +136,9 @@ CMD.runTask = function(data,main_info,PlatformInfo,call_back){
           "mediaChannel": "1",
           "group": group_id, 
           "paidPoint": postData.paidPoint,
-          "site": "5" 
+          "site": PlatformInfo.mini_program_platform_id==config.wx?"7": "5" 
         }
+
         let res =  await clinet.otherPost( helper.getHyCreateLinkOpt(postData.token) ,t_data)
         if(res['code']==500){
             throw res
@@ -149,6 +151,7 @@ CMD.runTask = function(data,main_info,PlatformInfo,call_back){
         if(res['code']!=200){
             throw res
         }
+
         let response = {
             "message": "create_link successfully",
             "received_data":{

+ 44 - 9
5_CREATE_LINK_FACTORY/hy_create_link_factory.js

@@ -39,6 +39,23 @@ CMD.isBlackBook = function(all_black_books,book_id){
     }
     return false
 }
+
+CMD.getPlatformInfo = function(PlatformConfig,tg_platform_id){
+    for (let index = 0; index < PlatformConfig.length; index++) {
+        const element = PlatformConfig[index];
+        if(element.tg_platform_id==tg_platform_id){
+            return element
+        }
+    }
+}
+CMD.getSharedPlatform = function(PlatformShared,platform_shared_id){
+    for (let index = 0; index < PlatformShared.length; index++) {
+        const element = PlatformShared[index];
+        if(element.id==platform_shared_id){
+            return JSON.parse(element.info)
+        }
+    }
+}
 async function processTask(){
     try{
         let MainConfig = await redis_help.getKeyValue("MainConfig")
@@ -53,7 +70,28 @@ async function processTask(){
             black_books = JSON.parse(black_books)
         }
        
-        let result = await video_applet_product_controllers.getAppletProductDataByStatus({status:0,wait_status:0,book_platform:config.platform_heiyan})
+        let PlatformShared = await redis_help.getKeyValue("PlatformShared")
+
+        PlatformShared = JSON.parse(PlatformShared)
+
+        let platform_heiyan_info = CMD.getPlatformInfo(PlatformConfig,config.platform_heiyan)
+
+        let all_platform_list = CMD.getSharedPlatform(PlatformShared,platform_heiyan_info.platform_shared_id)
+
+        let result = null
+        
+        for (let index = 0; index < all_platform_list.length; index++) {
+            const tg_platform_id = all_platform_list[index];
+            let temp_result = await video_applet_product_controllers.getAppletProductDataByStatus({status:0,wait_status:0,book_platform:tg_platform_id})
+            if(temp_result.success){
+                result = temp_result
+                break
+            }
+        }
+
+        if(result==null){
+            return
+        }
 
         if(result.success){
 
@@ -96,14 +134,11 @@ async function processTask(){
                 console.error("主体配置错误:",result)
                 throw "主体配置错误:"
             }
-            if(result.data.book_platform==config.platform_heiyan){
-                hy_create_link_task_list.push({
-                    n_data:result.data,
-                    main_info:main_info,
-                    PlatformInfo:PlatformInfo
-                })
-            }
-         
+            hy_create_link_task_list.push({
+                n_data:result.data,
+                main_info:main_info,
+                PlatformInfo:PlatformInfo
+            })
            
         }
 

+ 50 - 8
5_CREATE_LINK_FACTORY/qm_create_link_factory.js

@@ -39,6 +39,24 @@ CMD.isBlackBook = function(all_black_books,book_id){
     }
     return false
 }
+
+CMD.getPlatformInfo = function(PlatformConfig,tg_platform_id){
+    for (let index = 0; index < PlatformConfig.length; index++) {
+        const element = PlatformConfig[index];
+        if(element.tg_platform_id==tg_platform_id){
+            return element
+        }
+    }
+}
+CMD.getSharedPlatform = function(PlatformShared,platform_shared_id){
+    for (let index = 0; index < PlatformShared.length; index++) {
+        const element = PlatformShared[index];
+        if(element.id==platform_shared_id){
+            return JSON.parse(element.info)
+        }
+    }
+}
+
 async function processTask(){
     try{
         let MainConfig = await redis_help.getKeyValue("MainConfig")
@@ -49,7 +67,30 @@ async function processTask(){
         if(black_books!=null){
             black_books = JSON.parse(black_books)
         }
-        let result = await video_applet_product_controllers.getAppletProductDataByStatus({status:0,wait_status:0,book_platform:config.platform_qimao})
+
+        let PlatformShared = await redis_help.getKeyValue("PlatformShared")
+
+        PlatformShared = JSON.parse(PlatformShared)
+
+        let platform_qimao_info = CMD.getPlatformInfo(PlatformConfig,config.platform_qimao)
+
+        let all_platform_list = CMD.getSharedPlatform(PlatformShared,platform_qimao_info.platform_shared_id)
+
+        let result = null
+        
+        for (let index = 0; index < all_platform_list.length; index++) {
+            const tg_platform_id = all_platform_list[index];
+            let temp_result = await video_applet_product_controllers.getAppletProductDataByStatus({status:0,wait_status:0,book_platform:tg_platform_id})
+            if(temp_result.success){
+                result = temp_result
+                break
+            }
+        }
+
+        if(result==null){
+            return
+        }
+
         if(result.success){
             if(CMD.isBlackBook(black_books,result.data.product_id)){
                 await video_applet_product_controllers.updateData({id:result.data.id},{
@@ -64,6 +105,7 @@ async function processTask(){
             let PlatformInfo = null
             
             PlatformInfo = CMD.getPlatformInfoById(PlatformConfig,main_info.tg_platform_id)
+
             if(PlatformInfo==null){
                 await video_applet_product_controllers.updateData({id:result.data.id},{
                     status:2,
@@ -91,16 +133,16 @@ async function processTask(){
                 throw "主体配置错误:"
             }
 
-            if(result.data.book_platform==config.platform_qimao){
-                qm_create_link_task_list.push({
-                    n_data:result.data,
-                    main_info:main_info,
-                    PlatformInfo:PlatformInfo
-                })
-            }
 
+            qm_create_link_task_list.push({
+                n_data:result.data,
+                main_info:main_info,
+                PlatformInfo:PlatformInfo
+            })
         }
 
+        console.log("qm_create_link_task_list:",qm_create_link_task_list)
+
         if(qm_create_link_task_list.length>0){
             let qm_create_link_task = qm_create_link_task_list.pop()
             require('./qm_create_link').runTask(qm_create_link_task.n_data

+ 1 - 0
delete_all.sh

@@ -0,0 +1 @@
+/home/node/node-v20.17.0-linux-x64/lib/node_modules/pm2/bin/pm2 delete all

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

+ 5 - 38
logs/combined.log

@@ -1,38 +1,5 @@
-<<<<<<< HEAD
-2025-01-09T10:50:57: 
-2025-01-09T10:50:57: > heiyan@1.0.0 start
-2025-01-09T10:50:57: > node tg_factory_main.js
-2025-01-09T10:50:57: 
-2025-01-09T10:50:59: Connected to Redis
-=======
-2025-01-02T21:36:04: 
-2025-01-02T21:36:04: > heiyan@1.0.0 start
-2025-01-02T21:36:04: > node tg_factory_main.js
-2025-01-02T21:36:04: 
-2025-01-02T21:38:15: 
-2025-01-02T21:38:15: > heiyan@1.0.0 start
-2025-01-02T21:38:15: > node tg_factory_main.js
-2025-01-02T21:38:15: 
->>>>>>> 58a557cc5df587d3b3b926d70c3e0eccf0d469b4
-<<<<<<< HEAD
-2025-01-09T15:34:18: 
-2025-01-09T15:34:18: > heiyan@1.0.0 start
-2025-01-09T15:34:18: > node tg_factory_main.js
-2025-01-09T15:34:18: 
-2025-01-09T15:34:21: Connected to Redis
-2025-01-09T15:37:27: 
-2025-01-09T15:37:27: > heiyan@1.0.0 start
-2025-01-09T15:37:27: > node tg_factory_main.js
-2025-01-09T15:37:27: 
-2025-01-09T15:37:31: Connected to Redis
-2025-01-09T15:42:50: 
-2025-01-09T15:42:50: > heiyan@1.0.0 start
-2025-01-09T15:42:50: > node tg_factory_main.js
-2025-01-09T15:42:50: 
-2025-01-09T15:42:53: Connected to Redis
-=======
-2025-01-09T14:46:43: 
-2025-01-09T14:46:43: > heiyan@1.0.0 start
-2025-01-09T14:46:43: > node tg_factory_main.js
-2025-01-09T14:46:43: 
->>>>>>> b1c267102f4071b50bc2ee9af107e44f185e43dd
+2025-01-09T18:31:11: 
+2025-01-09T18:31:11: > heiyan@1.0.0 start
+2025-01-09T18:31:11: > node tg_factory_main.js
+2025-01-09T18:31:11: 
+2025-01-09T18:31:14: Connected to Redis

+ 5 - 38
logs/out.log

@@ -1,38 +1,5 @@
-<<<<<<< HEAD
-2025-01-09T10:50:57: 
-2025-01-09T10:50:57: > heiyan@1.0.0 start
-2025-01-09T10:50:57: > node tg_factory_main.js
-2025-01-09T10:50:57: 
-2025-01-09T10:50:59: Connected to Redis
-=======
-2025-01-02T21:36:04: 
-2025-01-02T21:36:04: > heiyan@1.0.0 start
-2025-01-02T21:36:04: > node tg_factory_main.js
-2025-01-02T21:36:04: 
-2025-01-02T21:38:15: 
-2025-01-02T21:38:15: > heiyan@1.0.0 start
-2025-01-02T21:38:15: > node tg_factory_main.js
-2025-01-02T21:38:15: 
->>>>>>> 58a557cc5df587d3b3b926d70c3e0eccf0d469b4
-<<<<<<< HEAD
-2025-01-09T15:34:18: 
-2025-01-09T15:34:18: > heiyan@1.0.0 start
-2025-01-09T15:34:18: > node tg_factory_main.js
-2025-01-09T15:34:18: 
-2025-01-09T15:34:21: Connected to Redis
-2025-01-09T15:37:27: 
-2025-01-09T15:37:27: > heiyan@1.0.0 start
-2025-01-09T15:37:27: > node tg_factory_main.js
-2025-01-09T15:37:27: 
-2025-01-09T15:37:31: Connected to Redis
-2025-01-09T15:42:50: 
-2025-01-09T15:42:50: > heiyan@1.0.0 start
-2025-01-09T15:42:50: > node tg_factory_main.js
-2025-01-09T15:42:50: 
-2025-01-09T15:42:53: Connected to Redis
-=======
-2025-01-09T14:46:43: 
-2025-01-09T14:46:43: > heiyan@1.0.0 start
-2025-01-09T14:46:43: > node tg_factory_main.js
-2025-01-09T14:46:43: 
->>>>>>> b1c267102f4071b50bc2ee9af107e44f185e43dd
+2025-01-09T18:31:11: 
+2025-01-09T18:31:11: > heiyan@1.0.0 start
+2025-01-09T18:31:11: > node tg_factory_main.js
+2025-01-09T18:31:11: 
+2025-01-09T18:31:14: Connected to Redis

BIN
src/api/hy/qr.gif


BIN
src/api/hy/qr_resized.gif


+ 1 - 1
src/data_manager/Controllers/video_applet_product_controllers.js

@@ -35,7 +35,7 @@ class video_applet_product_controllers {
             //     throw  'video_applet_product_controllers:book_id ID is required';
             // }
 
-            const filterData = await video_applet_product_model.findOne({ status: params.status,wait_status:params.wait_status });
+            const filterData = await video_applet_product_model.findOne({ status: params.status,wait_status:params.wait_status,book_platform:params.book_platform });
 
             if (!filterData) {
                 return {