Merge branch 'cn/develop' into cn/publish/preview

熊润斐
2 parents d86cc4d7 3a0c3140
Showing 2 changed files with 17 additions and 1 deletions Show diff stats
src/utils/CommonFunc.lua
src/utils/MysqlUtil.lua
@@ -349,4 +349,15 @@ function httpGetFormatData(params)
 	end
 	return table.concat(body, "&")
-end
 \ No newline at end of file
+end
+
+function logdump(obj, prefix)
+	for k,v in pairs(obj) do
+        local vt = type(v)
+		if vt == "table" then
+			logdump(v, prefix..':'..k)
+        elseif vt == 'string' or vt == 'number' then
+            skynet.error(prefix..':'..k..'='..v)
+		end
+	end
+end
 local skynet = require "skynet"
 local mysqlproxy = require "shared.mysqlproxy"
+require "utils.CommonFunc"
 function getDbCfgVal(tbName, keyName, fieldName)
@@ -29,20 +30,24 @@ end
 function addFriend(roleId, friendId)
 	local stmt_csp = mysqlproxy:prepare("call add_friends(?, ?, ?)")
+    --logdump(stmt_csp, '')
     local r = mysqlproxy:execute(stmt_csp, roleId, friendId, skynet.timex())
     if r[1][1]["t_error"] == 0 then
 		rpcRole(roleId, "addFriend", friendId)
 		rpcRole(friendId, "addFriend", roleId)
     end
+    mysqlproxy:stmt_close(stmt_csp)
 end
 function delFriend(roleId, friendId)
 	local stmt_csp = mysqlproxy:prepare("call del_friends(?, ?)")
+    --logdump(stmt_csp, '')
     local r = mysqlproxy:execute(stmt_csp, roleId, friendId)
     if r[1][1]["t_error"] == 0 then
 		rpcRole(roleId, "delFriend", friendId)
 		rpcRole(friendId, "delFriend", roleId)
     end
+    mysqlproxy:stmt_close(stmt_csp)
 end
 function roleExists(roleId)