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

+ 4 - 46
logs/combined.log

@@ -1,46 +1,4 @@
-<<<<<<< HEAD
-2025-02-22T00:04:08: 
-2025-02-22T00:04:08: > heiyan@1.0.0 start
-2025-02-22T00:04:08: > node tg_factory_main.js
-2025-02-22T00:04:08: 
-2025-03-03T19:56:49: 
-2025-03-03T19:56:49: > heiyan@1.0.0 start
-2025-03-03T19:56:49: > node tg_factory_main.js
-2025-03-03T19:56:49: 
-=======
-2025-03-04T12:20:07: 
-2025-03-04T12:20:07: > heiyan@1.0.0 start
-2025-03-04T12:20:07: > node tg_factory_main.js
-2025-03-04T12:20:07: 
->>>>>>> 07e8f53676caeb78027a73892a848b0a762b8130
-<<<<<<< HEAD
-2025-03-05T08:16:05: 
-2025-03-05T08:16:05: > heiyan@1.0.0 start
-2025-03-05T08:16:05: > node tg_factory_main.js
-2025-03-05T08:16:05: 
-2025-03-05T08:16:28: 
-2025-03-05T08:16:28: > heiyan@1.0.0 start
-2025-03-05T08:16:28: > node tg_factory_main.js
-2025-03-05T08:16:28: 
-2025-03-05T08:16:31: Connected to Redis
-2025-03-05T14:06:51: 
-2025-03-05T14:06:51: > heiyan@1.0.0 start
-2025-03-05T14:06:51: > node tg_factory_main.js
-2025-03-05T14:06:51: 
-2025-03-05T14:07:22: Connected to Redis
-2025-03-05T14:07:55: 
-2025-03-05T14:07:55: > heiyan@1.0.0 start
-2025-03-05T14:07:55: > node tg_factory_main.js
-2025-03-05T14:07:55: 
-2025-03-05T14:07:58: Connected to Redis
-2025-03-05T14:55:00: 
-2025-03-05T14:55:00: > heiyan@1.0.0 start
-2025-03-05T14:55:00: > node tg_factory_main.js
-2025-03-05T14:55:00: 
-2025-03-05T14:55:03: Connected to Redis
-=======
-2025-03-04T12:24:30: 
-2025-03-04T12:24:30: > heiyan@1.0.0 start
-2025-03-04T12:24:30: > node tg_factory_main.js
-2025-03-04T12:24:30: 
->>>>>>> c09f1125263e1b2f2def747b6ceab98be0764974
+2025-03-05T15:11:48: 
+2025-03-05T15:11:48: > heiyan@1.0.0 start
+2025-03-05T15:11:48: > node tg_factory_main.js
+2025-03-05T15:11:48: 

+ 4 - 46
logs/out.log

@@ -1,46 +1,4 @@
-<<<<<<< HEAD
-2025-02-22T00:04:08: 
-2025-02-22T00:04:08: > heiyan@1.0.0 start
-2025-02-22T00:04:08: > node tg_factory_main.js
-2025-02-22T00:04:08: 
-2025-03-03T19:56:49: 
-2025-03-03T19:56:49: > heiyan@1.0.0 start
-2025-03-03T19:56:49: > node tg_factory_main.js
-2025-03-03T19:56:49: 
-=======
-2025-03-04T12:20:07: 
-2025-03-04T12:20:07: > heiyan@1.0.0 start
-2025-03-04T12:20:07: > node tg_factory_main.js
-2025-03-04T12:20:07: 
->>>>>>> 07e8f53676caeb78027a73892a848b0a762b8130
-<<<<<<< HEAD
-2025-03-05T08:16:05: 
-2025-03-05T08:16:05: > heiyan@1.0.0 start
-2025-03-05T08:16:05: > node tg_factory_main.js
-2025-03-05T08:16:05: 
-2025-03-05T08:16:28: 
-2025-03-05T08:16:28: > heiyan@1.0.0 start
-2025-03-05T08:16:28: > node tg_factory_main.js
-2025-03-05T08:16:28: 
-2025-03-05T08:16:31: Connected to Redis
-2025-03-05T14:06:51: 
-2025-03-05T14:06:51: > heiyan@1.0.0 start
-2025-03-05T14:06:51: > node tg_factory_main.js
-2025-03-05T14:06:51: 
-2025-03-05T14:07:22: Connected to Redis
-2025-03-05T14:07:55: 
-2025-03-05T14:07:55: > heiyan@1.0.0 start
-2025-03-05T14:07:55: > node tg_factory_main.js
-2025-03-05T14:07:55: 
-2025-03-05T14:07:58: Connected to Redis
-2025-03-05T14:55:00: 
-2025-03-05T14:55:00: > heiyan@1.0.0 start
-2025-03-05T14:55:00: > node tg_factory_main.js
-2025-03-05T14:55:00: 
-2025-03-05T14:55:03: Connected to Redis
-=======
-2025-03-04T12:24:30: 
-2025-03-04T12:24:30: > heiyan@1.0.0 start
-2025-03-04T12:24:30: > node tg_factory_main.js
-2025-03-04T12:24:30: 
->>>>>>> c09f1125263e1b2f2def747b6ceab98be0764974
+2025-03-05T15:11:48: 
+2025-03-05T15:11:48: > heiyan@1.0.0 start
+2025-03-05T15:11:48: > node tg_factory_main.js
+2025-03-05T15:11:48: 

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


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