123

etc/config.json

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

logs/combined.log

@@ -1,4 +1,10 @@
 <<<<<<< HEAD
+2025-03-31T18:47:31: 
+2025-03-31T18:47:31: > heiyan@1.0.0 start
+2025-03-31T18:47:31: > node tg_factory_main.js
+2025-03-31T18:47:31: 
+=======
+<<<<<<< HEAD
 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
@@ -10,6 +16,7 @@
 2025-03-31T18:45:09: > node tg_factory_main.js
 2025-03-31T18:45:09: 
 >>>>>>> 6da56973c02dbd310b4a46ee7e9dc05ec52361fd
+<<<<<<< HEAD
 2025-04-01T16:07:58: 
 2025-04-01T16:07:58: > heiyan@1.0.0 start
 2025-04-01T16:07:58: > node tg_factory_main.js
@@ -30,3 +37,6 @@
 2025-04-01T16:43:39: > node tg_factory_main.js
 2025-04-01T16:43:39: 
 2025-04-01T16:43:43: Connected to Redis
+=======
+>>>>>>> c216686b3b1856135976414e6ad0541a7079584f
+>>>>>>> 5491a80d9b7e1dcea0e9052510698793ad6e784e

logs/out.log

@@ -1,4 +1,10 @@
 <<<<<<< HEAD
+2025-03-31T18:47:31: 
+2025-03-31T18:47:31: > heiyan@1.0.0 start
+2025-03-31T18:47:31: > node tg_factory_main.js
+2025-03-31T18:47:31: 
+=======
+<<<<<<< HEAD
 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
@@ -10,6 +16,7 @@
 2025-03-31T18:45:09: > node tg_factory_main.js
 2025-03-31T18:45:09: 
 >>>>>>> 6da56973c02dbd310b4a46ee7e9dc05ec52361fd
+<<<<<<< HEAD
 2025-04-01T16:07:58: 
 2025-04-01T16:07:58: > heiyan@1.0.0 start
 2025-04-01T16:07:58: > node tg_factory_main.js
@@ -30,3 +37,6 @@
 2025-04-01T16:43:39: > node tg_factory_main.js
 2025-04-01T16:43:39: 
 2025-04-01T16:43:43: Connected to Redis
+=======
+>>>>>>> c216686b3b1856135976414e6ad0541a7079584f
+>>>>>>> 5491a80d9b7e1dcea0e9052510698793ad6e784e