904118851 5 mesi fa
parent
commit
d5fa7a72b7
4 ha cambiato i file con 8 aggiunte e 42 eliminazioni
  1. 4 21
      logs/combined.log
  2. 4 21
      logs/out.log
  3. BIN
      src/api/hy/qr.gif
  4. BIN
      src/api/hy/qr_resized.gif

+ 4 - 21
logs/combined.log

@@ -1,21 +1,4 @@
-<<<<<<< HEAD
-2025-03-28T15:53:19: 
-2025-03-28T15:53:19: > heiyan@1.0.0 start
-2025-03-28T15:53:19: > node tg_factory_main.js
-2025-03-28T15:53:19: 
-2025-03-28T17:21:32: 
-2025-03-28T17:21:32: > heiyan@1.0.0 start
-2025-03-28T17:21:32: > node tg_factory_main.js
-2025-03-28T17:21:32: 
-=======
-2025-03-30T13:27:00: 
-2025-03-30T13:27:00: > heiyan@1.0.0 start
-2025-03-30T13:27:00: > node tg_factory_main.js
-2025-03-30T13:27:00: 
-2025-03-30T13:27:04: Connected to Redis
-2025-03-30T13:30:03: 
-2025-03-30T13:30:03: > heiyan@1.0.0 start
-2025-03-30T13:30:03: > node tg_factory_main.js
-2025-03-30T13:30:03: 
-2025-03-30T13:30:07: Connected to Redis
->>>>>>> bacd4a3b3e93d2e643b17dd48755d0a4bea31d5e
+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: 

+ 4 - 21
logs/out.log

@@ -1,21 +1,4 @@
-<<<<<<< HEAD
-2025-03-28T15:53:19: 
-2025-03-28T15:53:19: > heiyan@1.0.0 start
-2025-03-28T15:53:19: > node tg_factory_main.js
-2025-03-28T15:53:19: 
-2025-03-28T17:21:32: 
-2025-03-28T17:21:32: > heiyan@1.0.0 start
-2025-03-28T17:21:32: > node tg_factory_main.js
-2025-03-28T17:21:32: 
-=======
-2025-03-30T13:27:00: 
-2025-03-30T13:27:00: > heiyan@1.0.0 start
-2025-03-30T13:27:00: > node tg_factory_main.js
-2025-03-30T13:27:00: 
-2025-03-30T13:27:04: Connected to Redis
-2025-03-30T13:30:03: 
-2025-03-30T13:30:03: > heiyan@1.0.0 start
-2025-03-30T13:30:03: > node tg_factory_main.js
-2025-03-30T13:30:03: 
-2025-03-30T13:30:07: Connected to Redis
->>>>>>> bacd4a3b3e93d2e643b17dd48755d0a4bea31d5e
+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: 

BIN
src/api/hy/qr.gif


BIN
src/api/hy/qr_resized.gif