瀏覽代碼

Merge branch 'master' of http://120.79.128.142:3000/904118851/tg_factory

904118851 8 月之前
父節點
當前提交
de53e314d0
共有 4 個文件被更改,包括 30 次插入0 次删除
  1. 15 0
      logs/combined.log
  2. 15 0
      logs/out.log
  3. 二進制
      src/api/hy/qr.gif
  4. 二進制
      src/api/hy/qr_resized.gif

+ 15 - 0
logs/combined.log

@@ -367,9 +367,24 @@
 2024-12-09T22:16:51: 
 2024-12-09T22:16:53: Connected to Redis
 2024-12-09T22:16:53: results: null
+<<<<<<< HEAD
+2024-12-09T22:41:17: 
+2024-12-09T22:41:17: > heiyan@1.0.0 start
+2024-12-09T22:41:17: > node tg_factory_main.js
+2024-12-09T22:41:17: 
+2024-12-09T22:41:19: Connected to Redis
+2024-12-09T22:41:19: results: null
+2024-12-09T22:46:10: 
+2024-12-09T22:46:10: > heiyan@1.0.0 start
+2024-12-09T22:46:10: > node tg_factory_main.js
+2024-12-09T22:46:10: 
+2024-12-09T22:46:12: Connected to Redis
+2024-12-09T22:46:12: results: null
+=======
 2024-12-09T22:44:31: 
 2024-12-09T22:44:31: > heiyan@1.0.0 start
 2024-12-09T22:44:31: > node tg_factory_main.js
 2024-12-09T22:44:31: 
 2024-12-09T22:44:34: Connected to Redis
 2024-12-09T22:44:34: results: false
+>>>>>>> ccc1a5991f5ae276ca7ab303d1c71e66ec3a5d6a

+ 15 - 0
logs/out.log

@@ -829,9 +829,24 @@
 2024-12-09T22:16:51: 
 2024-12-09T22:16:53: Connected to Redis
 2024-12-09T22:16:53: results: null
+<<<<<<< HEAD
+2024-12-09T22:41:17: 
+2024-12-09T22:41:17: > heiyan@1.0.0 start
+2024-12-09T22:41:17: > node tg_factory_main.js
+2024-12-09T22:41:17: 
+2024-12-09T22:41:19: Connected to Redis
+2024-12-09T22:41:19: results: null
+2024-12-09T22:46:10: 
+2024-12-09T22:46:10: > heiyan@1.0.0 start
+2024-12-09T22:46:10: > node tg_factory_main.js
+2024-12-09T22:46:10: 
+2024-12-09T22:46:12: Connected to Redis
+2024-12-09T22:46:12: results: null
+=======
 2024-12-09T22:44:31: 
 2024-12-09T22:44:31: > heiyan@1.0.0 start
 2024-12-09T22:44:31: > node tg_factory_main.js
 2024-12-09T22:44:31: 
 2024-12-09T22:44:34: Connected to Redis
 2024-12-09T22:44:34: results: false
+>>>>>>> ccc1a5991f5ae276ca7ab303d1c71e66ec3a5d6a

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


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