wasteland / server

Commit 45bf6f3d780ac7ced855a0b8700ac09e2aa78197

Authored by zhouhaihai
2 parents ff72c84a ba84f3c7

Merge branch 'develop' into tr/publish

Showing 3 changed files with 7 additions and 10 deletions   Show diff stats
Inline Side-by-side
config/develop.lua
  Show/Hide comments   View file @45bf6f3
... ... @@ -15,5 +15,3 @@ redis_host = "127.0.0.1"
15 15 redis_port = 6100
16 16 redis_db = 1
17 17 redis_auth = nil
18   -
19   -pay_url = ""
20 18 \ No newline at end of file
... ...
src/actions/StoreAction.lua
  Show/Hide comments   View file @45bf6f3
... ... @@ -2,7 +2,6 @@ local _M = {}
2 2  
3 3 local serverId = tonumber(skynet.getenv("servId"))
4 4 local md5 = require "md5"
5   -local pay_url = skynet.getenv("pay_url") or ""
6 5  
7 6 local function makeOrder(roleId, rechargeId)
8 7 local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
... ... @@ -86,7 +85,7 @@ function _M.googleRechargeRpc(agent, data)
86 85 money = dataSet.rmb * 100,
87 86 game_money = dataSet.diamond,
88 87 product_id = dataSet.productId,
89   - notify_url = pay_url .. "/pay/google"
  88 + notify_url = msg.notifyUrl
90 89 }
91 90 local sign = signPms(need, secret_key)
92 91  
... ... @@ -112,7 +111,7 @@ function _M.myCardRechargeRpc(agent, data)
112 111 out_trade_no = partnerOrderId,
113 112 money = dataSet.rmb * 100,
114 113 game_money = dataSet.diamond,
115   - notify_url = pay_url .. "/pay/mycard"
  114 + notify_url = msg.notifyUrl
116 115 }
117 116 local sign = signPms(need, secret_key)
118 117  
... ... @@ -139,7 +138,7 @@ function _M.iosRechargeRpc(agent, data)
139 138 money = dataSet.rmb * 100,
140 139 game_money = dataSet.diamond,
141 140 product_id = dataSet.iap_product_id,
142   - notify_url = pay_url .. "/pay/ios"
  141 + notify_url = msg.notifyUrl
143 142 }
144 143 local sign = signPms(need, secret_key)
145 144  
... ...
src/services/globald.lua
  Show/Hide comments   View file @45bf6f3
... ... @@ -60,25 +60,25 @@ local function mailQuene()
60 60 if email.mid then
61 61 redisproxy:hmset(string_format("globalEmail:%s", gid),
62 62 "id", gid,
63   - "createtime", email.endTime,
  63 + "createtime", email.startTime,
64 64 "title", email.title,
65 65 "stitle", email.stitle,
66 66 "content", email.content,
67 67 "attachments", email.attachments,
68 68 "endtime", email.endTime,
69 69 "mid", email.mid,
70   - "timestamp", email.startTime
  70 + "timestamp", now
71 71 )
72 72 else
73 73 redisproxy:hmset(string_format("globalEmail:%s", gid),
74 74 "id", gid,
75   - "createtime", email.endTime,
  75 + "createtime", email.startTime,
76 76 "title", email.title,
77 77 "stitle", email.stitle,
78 78 "content", email.content,
79 79 "attachments", email.attachments,
80 80 "endtime", email.endTime,
81   - "timestamp", email.startTime
  81 + "timestamp", now
82 82 )
83 83 end
84 84 end
... ...