wasteland / server

Commit 5bd12066131946d62fa35d6492a0cd77d498f750

Authored by zhouhaihai
1 parent 5132bac1

增加pay_url

Showing 2 changed files with 6 additions and 3 deletions   Show diff stats
Inline Side-by-side
config/develop.lua
  Show/Hide comments   View file @5bd1206
@@ -15,3 +15,5 @@ redis_host = "127.0.0.1" @@ -15,3 +15,5 @@ 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 = ""
18 \ No newline at end of file 20 \ No newline at end of file
src/actions/StoreAction.lua
  Show/Hide comments   View file @5bd1206
@@ -2,6 +2,7 @@ local _M = {} @@ -2,6 +2,7 @@ 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 ""
5 6
6 local function makeOrder(roleId, rechargeId) 7 local function makeOrder(roleId, rechargeId)
7 local orderId = redisproxy:hincrby("autoincrement_set", "order", 1) 8 local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
@@ -85,7 +86,7 @@ function _M.googleRechargeRpc(agent, data) @@ -85,7 +86,7 @@ function _M.googleRechargeRpc(agent, data)
85 money = dataSet.rmb * 100, 86 money = dataSet.rmb * 100,
86 game_money = dataSet.diamond, 87 game_money = dataSet.diamond,
87 product_id = dataSet.productId, 88 product_id = dataSet.productId,
88 - notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/google" 89 + notify_url = pay_url .. "/pay/google"
89 } 90 }
90 local sign = signPms(need, secret_key) 91 local sign = signPms(need, secret_key)
91 92
@@ -111,7 +112,7 @@ function _M.myCardRechargeRpc(agent, data) @@ -111,7 +112,7 @@ function _M.myCardRechargeRpc(agent, data)
111 out_trade_no = partnerOrderId, 112 out_trade_no = partnerOrderId,
112 money = dataSet.rmb * 100, 113 money = dataSet.rmb * 100,
113 game_money = dataSet.diamond, 114 game_money = dataSet.diamond,
114 - notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/mycard" 115 + notify_url = pay_url .. "/pay/mycard"
115 } 116 }
116 local sign = signPms(need, secret_key) 117 local sign = signPms(need, secret_key)
117 118
@@ -138,7 +139,7 @@ function _M.iosRechargeRpc(agent, data) @@ -138,7 +139,7 @@ function _M.iosRechargeRpc(agent, data)
138 money = dataSet.rmb * 100, 139 money = dataSet.rmb * 100,
139 game_money = dataSet.diamond, 140 game_money = dataSet.diamond,
140 product_id = dataSet.iap_product_id, 141 product_id = dataSet.iap_product_id,
141 - notify_url = "http://l11-ts-pub-all-wasteland.komoejoy.com/pay/ios" 142 + notify_url = pay_url .. "/pay/ios"
142 } 143 }
143 local sign = signPms(need, secret_key) 144 local sign = signPms(need, secret_key)
144 145