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

+ 4 - 77
logs/combined.log

@@ -1,77 +1,4 @@
-<<<<<<< HEAD
-2025-04-01T19:46:08: 
-2025-04-01T19:46:08: > heiyan@1.0.0 start
-2025-04-01T19:46:08: > node tg_factory_main.js
-2025-04-01T19:46:08: 
-2025-04-01T19:46:12: Connected to Redis
-2025-04-01T19:50:52: 
-2025-04-01T19:50:52: > heiyan@1.0.0 start
-2025-04-01T19:50:52: > node tg_factory_main.js
-2025-04-01T19:50:52: 
-2025-04-01T19:50:56: Connected to Redis
-2025-04-01T20:02:48: 
-2025-04-01T20:02:48: > heiyan@1.0.0 start
-2025-04-01T20:02:48: > node tg_factory_main.js
-2025-04-01T20:02:48: 
-2025-04-01T20:02:52: Connected to Redis
-2025-04-01T20:08:06: 
-2025-04-01T20:08:06: > heiyan@1.0.0 start
-2025-04-01T20:08:06: > node tg_factory_main.js
-2025-04-01T20:08:06: 
-2025-04-01T20:08:11: Connected to Redis
-2025-04-01T20:11:28: 
-2025-04-01T20:11:28: > heiyan@1.0.0 start
-2025-04-01T20:11:28: > node tg_factory_main.js
-2025-04-01T20:11:28: 
-2025-04-01T20:11:32: Connected to Redis
-=======
-<<<<<<< HEAD
-2025-04-01T12:31:54: 
-2025-04-01T12:31:54: > heiyan@1.0.0 start
-2025-04-01T12:31:54: > node tg_factory_main.js
-2025-04-01T12:31:54: 
-=======
-<<<<<<< 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
-2025-04-01T12:07:31: 
-2025-04-01T12:07:36: Connected to Redis
-=======
-2025-03-31T18:45:09: 
-2025-03-31T18:45:09: > heiyan@1.0.0 start
-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
-2025-04-01T16:07:58: 
-2025-04-01T16:08:28: Connected to Redis
-2025-04-01T16:08:51: 
-2025-04-01T16:08:51: > heiyan@1.0.0 start
-2025-04-01T16:08:51: > node tg_factory_main.js
-2025-04-01T16:08:51: 
-2025-04-01T16:08:56: Connected to Redis
-2025-04-01T16:30:09: 
-2025-04-01T16:30:09: > heiyan@1.0.0 start
-2025-04-01T16:30:09: > node tg_factory_main.js
-2025-04-01T16:30:09: 
-2025-04-01T16:30:13: Connected to Redis
-2025-04-01T16:43:39: 
-2025-04-01T16:43:39: > heiyan@1.0.0 start
-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
->>>>>>> 0280b3f3f0d4ca48b3e2a028d936d1f4cf9340e1
->>>>>>> ec705c0b9acd111e07942516d483981390d90967
+2025-04-02T11:24:58: 
+2025-04-02T11:24:58: > heiyan@1.0.0 start
+2025-04-02T11:24:58: > node tg_factory_main.js
+2025-04-02T11:24:58: 

+ 4 - 77
logs/out.log

@@ -1,77 +1,4 @@
-<<<<<<< HEAD
-2025-04-01T19:46:08: 
-2025-04-01T19:46:08: > heiyan@1.0.0 start
-2025-04-01T19:46:08: > node tg_factory_main.js
-2025-04-01T19:46:08: 
-2025-04-01T19:46:12: Connected to Redis
-2025-04-01T19:50:52: 
-2025-04-01T19:50:52: > heiyan@1.0.0 start
-2025-04-01T19:50:52: > node tg_factory_main.js
-2025-04-01T19:50:52: 
-2025-04-01T19:50:56: Connected to Redis
-2025-04-01T20:02:48: 
-2025-04-01T20:02:48: > heiyan@1.0.0 start
-2025-04-01T20:02:48: > node tg_factory_main.js
-2025-04-01T20:02:48: 
-2025-04-01T20:02:52: Connected to Redis
-2025-04-01T20:08:06: 
-2025-04-01T20:08:06: > heiyan@1.0.0 start
-2025-04-01T20:08:06: > node tg_factory_main.js
-2025-04-01T20:08:06: 
-2025-04-01T20:08:11: Connected to Redis
-2025-04-01T20:11:28: 
-2025-04-01T20:11:28: > heiyan@1.0.0 start
-2025-04-01T20:11:28: > node tg_factory_main.js
-2025-04-01T20:11:28: 
-2025-04-01T20:11:32: Connected to Redis
-=======
-<<<<<<< HEAD
-2025-04-01T12:31:54: 
-2025-04-01T12:31:54: > heiyan@1.0.0 start
-2025-04-01T12:31:54: > node tg_factory_main.js
-2025-04-01T12:31:54: 
-=======
-<<<<<<< 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
-2025-04-01T12:07:31: 
-2025-04-01T12:07:36: Connected to Redis
-=======
-2025-03-31T18:45:09: 
-2025-03-31T18:45:09: > heiyan@1.0.0 start
-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
-2025-04-01T16:07:58: 
-2025-04-01T16:08:28: Connected to Redis
-2025-04-01T16:08:51: 
-2025-04-01T16:08:51: > heiyan@1.0.0 start
-2025-04-01T16:08:51: > node tg_factory_main.js
-2025-04-01T16:08:51: 
-2025-04-01T16:08:56: Connected to Redis
-2025-04-01T16:30:09: 
-2025-04-01T16:30:09: > heiyan@1.0.0 start
-2025-04-01T16:30:09: > node tg_factory_main.js
-2025-04-01T16:30:09: 
-2025-04-01T16:30:13: Connected to Redis
-2025-04-01T16:43:39: 
-2025-04-01T16:43:39: > heiyan@1.0.0 start
-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
->>>>>>> 0280b3f3f0d4ca48b3e2a028d936d1f4cf9340e1
->>>>>>> ec705c0b9acd111e07942516d483981390d90967
+2025-04-02T11:24:58: 
+2025-04-02T11:24:58: > heiyan@1.0.0 start
+2025-04-02T11:24:58: > node tg_factory_main.js
+2025-04-02T11:24:58: 

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


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