修正分支合并

2020-12-03 21:38:17 +08:00
parent 37d7dd5fe0
commit 391b2a95d3
9 changed files with 72 additions and 87 deletions
--- a/Zframework/toolfunc.lua
+++ b/Zframework/toolfunc.lua
@@ -542,7 +542,7 @@ do--urlencode
 		return out
 	end
 end
-do--httpRequest
+do--httpRequest & wsConnect
 	client=LOADLIB("NETlib")
 	httpRequest=
 	client and function(tick,path,method,header,body)