904118851 5 月之前
父节点
当前提交
4903f7e5b6
共有 4 个文件被更改,包括 8 次插入50 次删除
  1. 4 25
      logs/combined.log
  2. 4 25
      logs/out.log
  3. 二进制
      src/api/hy/qr.gif
  4. 二进制
      src/api/hy/qr_resized.gif

+ 4 - 25
logs/combined.log

@@ -1,25 +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
-2025-03-24T16:30:58: 
-2025-03-24T16:32:30: 
-2025-03-24T16:32:30: > heiyan@1.0.0 start
-2025-03-24T16:32:30: > node tg_factory_main.js
-2025-03-24T16:32:30: 
-2025-03-24T16:44:26: 
-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
+2025-03-24T18:53:58: 
+2025-03-24T18:53:58: > heiyan@1.0.0 start
+2025-03-24T18:53:58: > node tg_factory_main.js
+2025-03-24T18:53:58: 

+ 4 - 25
logs/out.log

@@ -1,25 +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
-2025-03-24T16:30:58: 
-2025-03-24T16:32:30: 
-2025-03-24T16:32:30: > heiyan@1.0.0 start
-2025-03-24T16:32:30: > node tg_factory_main.js
-2025-03-24T16:32:30: 
-2025-03-24T16:44:26: 
-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
+2025-03-24T18:53:58: 
+2025-03-24T18:53:58: > heiyan@1.0.0 start
+2025-03-24T18:53:58: > node tg_factory_main.js
+2025-03-24T18:53:58: 

二进制
src/api/hy/qr.gif


二进制
src/api/hy/qr_resized.gif