Commit ba84f3c70b9644400deecdc2b29792105fc465ec

Authored by zhouhaihai
1 parent ca128b32

签名回调地址由客户端上传

Showing 2 changed files with 3 additions and 6 deletions   Show diff stats
config/develop.lua
@@ -15,5 +15,3 @@ redis_host = "127.0.0.1" @@ -15,5 +15,3 @@ redis_host = "127.0.0.1"
15 redis_port = 6100 15 redis_port = 6100
16 redis_db = 1 16 redis_db = 1
17 redis_auth = nil 17 redis_auth = nil
18 -  
19 -pay_url = ""  
20 \ No newline at end of file 18 \ No newline at end of file
src/actions/StoreAction.lua
@@ -2,7 +2,6 @@ local _M = {} @@ -2,7 +2,6 @@ local _M = {}
2 2
3 local serverId = tonumber(skynet.getenv("servId")) 3 local serverId = tonumber(skynet.getenv("servId"))
4 local md5 = require "md5" 4 local md5 = require "md5"
5 -local pay_url = skynet.getenv("pay_url") or ""  
6 5
7 local function makeOrder(roleId, rechargeId) 6 local function makeOrder(roleId, rechargeId)
8 local orderId = redisproxy:hincrby("autoincrement_set", "order", 1) 7 local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
@@ -86,7 +85,7 @@ function _M.googleRechargeRpc(agent, data) @@ -86,7 +85,7 @@ function _M.googleRechargeRpc(agent, data)
86 money = dataSet.rmb * 100, 85 money = dataSet.rmb * 100,
87 game_money = dataSet.diamond, 86 game_money = dataSet.diamond,
88 product_id = dataSet.productId, 87 product_id = dataSet.productId,
89 - notify_url = pay_url .. "/pay/google" 88 + notify_url = msg.notifyUrl
90 } 89 }
91 local sign = signPms(need, secret_key) 90 local sign = signPms(need, secret_key)
92 91
@@ -112,7 +111,7 @@ function _M.myCardRechargeRpc(agent, data) @@ -112,7 +111,7 @@ function _M.myCardRechargeRpc(agent, data)
112 out_trade_no = partnerOrderId, 111 out_trade_no = partnerOrderId,
113 money = dataSet.rmb * 100, 112 money = dataSet.rmb * 100,
114 game_money = dataSet.diamond, 113 game_money = dataSet.diamond,
115 - notify_url = pay_url .. "/pay/mycard" 114 + notify_url = msg.notifyUrl
116 } 115 }
117 local sign = signPms(need, secret_key) 116 local sign = signPms(need, secret_key)
118 117
@@ -139,7 +138,7 @@ function _M.iosRechargeRpc(agent, data) @@ -139,7 +138,7 @@ function _M.iosRechargeRpc(agent, data)
139 money = dataSet.rmb * 100, 138 money = dataSet.rmb * 100,
140 game_money = dataSet.diamond, 139 game_money = dataSet.diamond,
141 product_id = dataSet.iap_product_id, 140 product_id = dataSet.iap_product_id,
142 - notify_url = pay_url .. "/pay/ios" 141 + notify_url = msg.notifyUrl
143 } 142 }
144 local sign = signPms(need, secret_key) 143 local sign = signPms(need, secret_key)
145 144