904118851 4 meses atrás
pai
commit
77c9919aee

+ 41 - 1
2_PRODUCT_FACTORY/hy_batch_factory.js

@@ -6,6 +6,8 @@ const redis_help = require('../src/use_redis');
 const config = require('../etc/config.json');
 const other_book_controllers = require('../src/data_manager/Controllers/other_book_controllers');
 const tools = require('../tools');
+const helper = require('../src/helper');
+const { default: axios } = require('axios');
 const time_count = 1000;
 const task_queue = []
 
@@ -382,8 +384,9 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     
                                     if(main_info.pay_type==0){
                                         table_data.book_platform = config.platform_heiyanmf
-                                        table_data.product_parent_id = data.product_parent_id
+                                        table_data.product_parent_id =  await CMD.get_product_parent_id(data.book_id)
                                     }
+                                    console.log("table_data:",table_data)
                                     //没有找到 可以创建
                                     await video_applet_product_controllers.createAppletProductData(table_data)
                                 }
@@ -400,6 +403,43 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     }
 }
 
+CMD.get_product_parent_id = async function(product_id) {
+    try{
+        let bookIds = []
+        bookIds.push(product_id)
+        if(bookIds.length>0){
+            let timestamp = helper.getCurrentUnixTimestamp()
+            let sign = helper.generateSign({
+                "pid":config.heiyan_config.pid,
+                "timestamp":timestamp,
+                "sign":"",
+                "bookIds":bookIds.join(',')
+            },config.heiyan_config.key)
+            var url = config.heiyan_config.copyBooks
+            var base_params = `/?sign=${sign}&pid=${config.heiyan_config.pid}&timestamp=${timestamp}`
+            var other_params = `&bookIds=${bookIds.join(',')}`
+            url = `${url}${base_params}${other_params}`
+            // console.log("url:",url)
+            let response = await axios.get(url)
+            let data  = response.data
+            if(data.code==1){
+                let list = data.data
+                console.log("get_hy_origin_books:",list)
+                for (let index = 0; index < list.length; index++) {
+                    const element = list[index];
+                    let parent_id = element.bookId
+                    return parent_id
+                }
+            }
+        }
+    }catch(e){
+        console.error("get_product_parent_id err::",e)
+        return ""
+    }
+    return ""
+
+}
+
 CMD.insert_product = async function(data){
     return await video_product_controllers.createProductData({
         book_platform:data.tg_platform_id,

+ 21 - 3
2_PRODUCT_FACTORY/qm_mf_batch_factory.js

@@ -308,7 +308,8 @@ CMD.update_filter_data = async function(FilterConfig,data) {
                                         promotion_id:"",
                                         wait_status:0,
                                         material_platform_id:material_platform_id,
-                                        butler_id:butler_id
+                                        butler_id:butler_id,
+                                        product_parent_id: await CMD.get_product_parent_id(data.book_id)
                                     })
                                 }
                             }
@@ -323,6 +324,21 @@ CMD.update_filter_data = async function(FilterConfig,data) {
     }
 }
 
+CMD.get_product_parent_id = async function(product_id) {
+    try{
+        let product_parent_id = product_id
+        let iap_book_info = await CMD.getIAPInfo(product_id)
+        if(iap_book_info!=null){
+            product_parent_id = iap_book_info.book_id
+        }
+        return product_parent_id
+    }catch(e){
+        console.error("get_product_parent_id err::",e)
+        return ""
+    }
+    return ""
+
+}
 
 CMD.insert_product = async function(data){
 
@@ -332,14 +348,16 @@ CMD.insert_product = async function(data){
     if(iap_book_info!=null){
         product_parent_id = iap_book_info.book_id
     }
-    return await video_product_controllers.createProductData({
+    let table_data = {
         book_platform:data.tg_platform_id,
         product_name:data.book_name,
         genre:data.genre,
         product_id:data.book_id,
         words:data.words,
         product_parent_id:product_parent_id
-    })
+    }
+    console.log("table_data:",table_data)
+    return await video_product_controllers.createProductData(table_data)
 }
 
 CMD.getIAPInfo = async function(iaa_book_id){

+ 5 - 32
logs/combined.log

@@ -1,32 +1,5 @@
-<<<<<<< HEAD
-2025-03-31T17:17:37: 
-2025-03-31T17:17:37: > heiyan@1.0.0 start
-2025-03-31T17:17:37: > node tg_factory_main.js
-2025-03-31T17:17:37: 
-=======
-<<<<<<< HEAD
-2025-03-30T13:34:46: 
-2025-03-30T13:34:46: > heiyan@1.0.0 start
-2025-03-30T13:34:46: > node tg_factory_main.js
-2025-03-30T13:34:46: 
-=======
-2025-03-31T16:33:10: 
-2025-03-31T16:33:10: > heiyan@1.0.0 start
-2025-03-31T16:33:10: > node tg_factory_main.js
-2025-03-31T16:33:10: 
-2025-03-31T16:33:15: Connected to Redis
-2025-03-31T16:40:27: 
-2025-03-31T16:40:27: > heiyan@1.0.0 start
-2025-03-31T16:40:27: > node tg_factory_main.js
-2025-03-31T16:40:27: 
-2025-03-31T16:40:31: Connected to Redis
-<<<<<<< HEAD
-2025-03-31T17:18:41: 
-2025-03-31T17:18:41: > heiyan@1.0.0 start
-2025-03-31T17:18:41: > node tg_factory_main.js
-2025-03-31T17:18:41: 
-2025-03-31T17:18:45: Connected to Redis
-=======
->>>>>>> 598ad81756fb6af3eb5e57791415f9a36f81b297
->>>>>>> 422e26ceb7529f5711ca10c2c8456e1864f8d8f7
->>>>>>> bd05a8ec537d4fcb1f73f52778c510b908b1526d
+2025-04-01T12:07:31: 
+2025-04-01T12:07:31: > heiyan@1.0.0 start
+2025-04-01T12:07:31: > node tg_factory_main.js
+2025-04-01T12:07:31: 
+2025-04-01T12:07:36: Connected to Redis

+ 5 - 32
logs/out.log

@@ -1,32 +1,5 @@
-<<<<<<< HEAD
-2025-03-31T17:17:37: 
-2025-03-31T17:17:37: > heiyan@1.0.0 start
-2025-03-31T17:17:37: > node tg_factory_main.js
-2025-03-31T17:17:37: 
-=======
-<<<<<<< HEAD
-2025-03-30T13:34:46: 
-2025-03-30T13:34:46: > heiyan@1.0.0 start
-2025-03-30T13:34:46: > node tg_factory_main.js
-2025-03-30T13:34:46: 
-=======
-2025-03-31T16:33:10: 
-2025-03-31T16:33:10: > heiyan@1.0.0 start
-2025-03-31T16:33:10: > node tg_factory_main.js
-2025-03-31T16:33:10: 
-2025-03-31T16:33:15: Connected to Redis
-2025-03-31T16:40:27: 
-2025-03-31T16:40:27: > heiyan@1.0.0 start
-2025-03-31T16:40:27: > node tg_factory_main.js
-2025-03-31T16:40:27: 
-2025-03-31T16:40:31: Connected to Redis
-<<<<<<< HEAD
-2025-03-31T17:18:41: 
-2025-03-31T17:18:41: > heiyan@1.0.0 start
-2025-03-31T17:18:41: > node tg_factory_main.js
-2025-03-31T17:18:41: 
-2025-03-31T17:18:45: Connected to Redis
-=======
->>>>>>> 598ad81756fb6af3eb5e57791415f9a36f81b297
->>>>>>> 422e26ceb7529f5711ca10c2c8456e1864f8d8f7
->>>>>>> bd05a8ec537d4fcb1f73f52778c510b908b1526d
+2025-04-01T12:07:31: 
+2025-04-01T12:07:31: > heiyan@1.0.0 start
+2025-04-01T12:07:31: > node tg_factory_main.js
+2025-04-01T12:07:31: 
+2025-04-01T12:07:36: Connected to Redis

BIN
src/api/hy/qr.gif


BIN
src/api/hy/qr_resized.gif


+ 25 - 0
test_1.js

@@ -0,0 +1,25 @@
+const helper = require('./src/helper');
+const config = require('./etc/config.json');
+const HttpClient = require('./src/HttpClient');
+const CMD = {}
+CMD.test = async function(){
+    var secretKey = config.fanqie_config.secretKey;
+    var url = "https://www.changdunovel.com/novelsale/openapi/user/recharge/v1"
+    var base_params = `/?distributor_id=${config.fanqie_config.distributorId}&ts=${helper.getCurrentUnixTimestamp()}&sign=${helper.getSign(config.fanqie_config.distributorId,secretKey)}`
+    let clinet = new HttpClient()
+    try{
+        console.log("url::",`${url}${base_params}`)
+        let response = await clinet.request(`${url}${base_params}`)
+        // 检查响应是否存在
+        if (!response) {
+            throw new Error('No response received');
+        }
+        console.log("response::",response)
+    }catch(e){
+        console.log("test error:",e)
+    }
+
+}
+CMD.test()
+
+module.exports = CMD;