12

1_FILTER_FACTORY/FILTER_FACTORY.js

@@ -1,5 +1,5 @@
 const CMD = {}
-const time_count = 500;
+const time_count = 100;
 const redis_help = require('../src/use_redis');
 const origin_data_controllers = require('../src/data_manager/Controllers/origin_data_controllers');
 const filter_data_controllers = require('../src/data_manager/Controllers/filter_data_controllers');

logs/combined.log

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 2024-12-18T10:46:46: 
 2024-12-18T10:46:46: > heiyan@1.0.0 start
 2024-12-18T10:46:46: > node tg_factory_main.js
@@ -125,3 +126,5 @@
 2024-12-18T16:20:53: > node tg_factory_main.js
 2024-12-18T16:20:53: 
 2024-12-18T16:20:55: Connected to Redis
+=======
+>>>>>>> 5aa41645674172f447b1847f8a9b8bb9f1aea972

logs/out.log

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 2024-12-18T11:22:42: 
 2024-12-18T11:22:42: > heiyan@1.0.0 start
 2024-12-18T11:22:42: > node tg_factory_main.js
@@ -79,3 +80,5 @@
 2024-12-18T16:20:53: > node tg_factory_main.js
 2024-12-18T16:20:53: 
 2024-12-18T16:20:55: Connected to Redis
+=======
+>>>>>>> 5aa41645674172f447b1847f8a9b8bb9f1aea972