123

0_RECEIVE_FACTORY/RECEIVE_FACTORY.js

@@ -324,6 +324,15 @@ CMD.get_dz_callback_template = async function(channelId,res) {
     })
 }
 
+CMD.get_dz_channel_Info_list = async function(is_wx,res) {
+    console.log("get_dz_channel_Info_list!")
+    require('../src/api/dz/get_channel_Info_list').get_channel_Info_list(is_wx,(data)=>{
+        console.log('get_dz_channel_Info_list:', data);
+        res.writeHead(200, {'Content-Type': 'application/json'});
+        res.end(JSON.stringify({ message:"成功！",data:data,code:10000}));
+    })
+}
+
 CMD.get_dz_recharge_template = async function(channelId,res) {
     await require('../src/api/dz/get_dz_recharge_template').get_recharge_template(channelId,(data)=>{
         console.log('get_dz_recharge_template:', data);
@@ -594,6 +603,9 @@ var server = http.createServer(function(req,res){
                     }else if(jsonData['fun']=="get_dz_recharge_template"&&jsonData['cmd']=="dz_link"){
                         let channelId = jsonData['data']['channelId']
                         CMD.get_dz_recharge_template(channelId,res) 
+                    }else if(jsonData['fun']=="get_dz_channel_Info_list"&&jsonData['cmd']=="dz_link"){
+                        let is_wx = jsonData['data']['is_wx']
+                        CMD.get_dz_channel_Info_list(is_wx,res) 
                     }else if(jsonData['fun']=="get_qm_recharge_template"&&jsonData['cmd']=="qm_link"){
                         let category = jsonData['data']['category']
                         let qm_id = jsonData['data']['qm_id']

etc/config.json

@@ -49,6 +49,12 @@
         "type":"dy",
         "channelId":"61921"
     },
+    "dianzhong_channel_config": {
+        "clientId": 10002270,
+        "token":"J6ppCvkd3eC4CCtQvK",
+        "channelInfoList": "https://routine.wqxsw.com/flames/channel/query/channelInfoList",
+        "channelId":"63010"
+    },
     "qimao_config":{
         "admin_account_name":"zhuoyue",
         "access_key":"09ba094d2f70e0e5bc340cca365fabe3",

logs/combined.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-03-24T16:30:58: 
 2025-03-24T16:30:58: > heiyan@1.0.0 start
 2025-03-24T16:30:58: > node tg_factory_main.js
@@ -10,3 +11,15 @@
 2025-03-24T16:44:26: > heiyan@1.0.0 start
 2025-03-24T16:44:26: > node tg_factory_main.js
 2025-03-24T16:44:26: 
+=======
+2025-03-24T18:43:35: 
+2025-03-24T18:43:35: > heiyan@1.0.0 start
+2025-03-24T18:43:35: > node tg_factory_main.js
+2025-03-24T18:43:35: 
+2025-03-24T18:43:40: Connected to Redis
+2025-03-24T18:45:00: 
+2025-03-24T18:45:00: > heiyan@1.0.0 start
+2025-03-24T18:45:00: > node tg_factory_main.js
+2025-03-24T18:45:00: 
+2025-03-24T18:45:04: Connected to Redis
+>>>>>>> 1eb8cc4754906a72eaa3e6ed8b0bfdad8a0582d9

logs/out.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2025-03-24T16:30:58: 
 2025-03-24T16:30:58: > heiyan@1.0.0 start
 2025-03-24T16:30:58: > node tg_factory_main.js
@@ -10,3 +11,15 @@
 2025-03-24T16:44:26: > heiyan@1.0.0 start
 2025-03-24T16:44:26: > node tg_factory_main.js
 2025-03-24T16:44:26: 
+=======
+2025-03-24T18:43:35: 
+2025-03-24T18:43:35: > heiyan@1.0.0 start
+2025-03-24T18:43:35: > node tg_factory_main.js
+2025-03-24T18:43:35: 
+2025-03-24T18:43:40: Connected to Redis
+2025-03-24T18:45:00: 
+2025-03-24T18:45:00: > heiyan@1.0.0 start
+2025-03-24T18:45:00: > node tg_factory_main.js
+2025-03-24T18:45:00: 
+2025-03-24T18:45:04: Connected to Redis
+>>>>>>> 1eb8cc4754906a72eaa3e6ed8b0bfdad8a0582d9

src/HttpClient.js

@@ -38,6 +38,7 @@ class HttpClient {
                 ...config
             });
 
+            console.log("dianzhong_channel_config:",response)
             return response.data;
         } catch (error) {
             this.handleError(error);

src/api/dz/get_channel_Info_list.js

@@ -0,0 +1,30 @@
+const CMD = {}
+const HttpClient = require('../../../src/HttpClient')
+const config = require('../../../etc/config.json')
+const helper = require('../../helper')
+
+// 渠道列表查询接口(新)
+CMD.get_channel_Info_list = async function(is_wx,call_back){
+    let clinet = new HttpClient()
+    let timestamp = Date.now()
+    let response = null
+    let signKey  = null
+    if(is_wx){
+        signKey = helper.md5(config.dianzhong_channel_config.clientId+config.dianzhong_channel_config.token+timestamp)
+        response = await clinet.post(config.dianzhong_channel_config.channelInfoList,{
+            clientId:config.dianzhong_channel_config.clientId,
+            timestamp:timestamp,
+            signKey:signKey
+        })
+    }else{
+        signKey = helper.md5(config.dianzhong_config.clientId+config.dianzhong_config.token+timestamp)
+        response = await clinet.post(config.dianzhong_channel_config.channelInfoList,{
+            clientId:config.dianzhong_config.clientId,
+            timestamp:timestamp,
+            signKey:signKey
+        })
+    }
+
+    call_back(response)
+}
+module.exports = CMD;