Merge remote-tracking branch 'origin/cn/develop' into cn/develop

zhangqijia
2 parents 8f49e40e c0290d89
Showing 1 changed file with 15 additions and 2 deletions Show diff stats
src/actions/StoreAction.lua
@@ -52,6 +52,19 @@ local function signPms(params, secret_key)
 	return md5.sumhexa(urlCode .. secret_key):lower()
 end
+local function signDyhPms(params, secret_key)
+    local keys = table_keys(params)
+    table.sort(keys)
+    local str2Sign = ""
+    for index, key in ipairs(keys) do
+        if str2Sign ~= "" then
+            str2Sign = str2Sign .. '&'
+        end
+        str2Sign = str2Sign .. string.format("%s=%s", key, params[key])
+    end
+	return md5.sumhexa(str2Sign .. secret_key):lower()
+end
+
 -- bili android 充值 入口
 function _M.biliAndroidRechargeRpc(agent, data)
 	local role = agent.role
@@ -226,7 +239,7 @@ function _M.iosRechargeRpc(agent, data)
 	--创建订单号
 	local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
 	-- 签名
-	local secret_key = "1916d62251dd4a8aa5e452121eefc9a1"
+	local secret_key = "2b2036e1f44640a59168c92462714870"
 	local need = {
 		out_trade_no = partnerOrderId,
 		money = dataSet.rmb * 100,
@@ -234,7 +247,7 @@ function _M.iosRechargeRpc(agent, data)
 		product_id = dataSet.iap_product_id,
 		notify_url = msg.notifyUrl
 	}
-	local sign = signPms(need, secret_key)
+	local sign = signDyhPms(need, secret_key)
 	SendPacket(actionCodes.Store_iosRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
 	return true