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

chenyueqi
2 parents 51ab9871 fe41ea5d
Showing 8 changed files with 304 additions and 18 deletions Show diff stats
src/GlobalVar.lua
src/actions/GmAction.lua
src/actions/RoleAction.lua
src/models/Order.lua
src/models/Role.lua
src/models/RolePlugin.lua
src/shared/base64.lua
src/shared/init.lua
@@ -18,6 +18,9 @@ START_RESET_TIME = START_RESET_TIME_BASE - TIME_ZONE * 3600
  
 STRUCT_VERSION = 3 -- 数据结构版本
  
+IOS_SID = 4 -- 判断是不是ios设备
+UO_SID = 6 -- 判断是不是联运渠道
+
 MAX_ROLE_NUM = 1000000
 -- 属性枚举
 AttsEnum = {
@@ -669,6 +669,7 @@ end
  
 function _M.cz(role, pms)
 	local id = tonum(pms.pm1)
+	local sid = tonum(pms.pm2) or 0
 	local csvData = csvdb["shop_rechargeCsv"][id]
 	if not csvData then
 		return "充值id错误, 查看shop_recharge.csv"
@@ -678,6 +679,7 @@ function _M.cz(role, pms)
 		transactionId = "GM",
 		order = "GM",
 		pay_time = skynet.timex(),
+		sid = sid == 1 and IOS_SID or 0,
 	})
 	role:mylog("gm_action", {desc = "recharge", int1 = id, key1 = pms.sender})
 	return "指令成功"
@@ -1020,8 +1020,6 @@ function _M.achiveRpc(agent, data)
 	return true
 end
  
-
-
 function _M.chatRpc(agent, data)
 	local role = agent.role
 	local roleId = role:getProperty("id")
@@ -1036,10 +1034,21 @@ function _M.chatRpc(agent, data)
 	-- 判断禁言
 	local result = nil
  
-	local SERV = string_format(".chated%d", math.random(1, 5))
-	local legal, mod = skynet.call(SERV, "lua", "check", content)
-	if not legal then
-		content = mod or ""
+	local sdkResult
+	if role:getProperty("sid") == UO_SID then
+		sdkResult = role:uoChatSDK(content)
+	else
+		sdkResult = role:biliChatSDK(content)
+	end
+
+	if sdkResult then
+		content = sdkResult
+	else
+		local SERV = string_format(".chated%d", math.random(1, 5))
+		local legal, mod = skynet.call(SERV, "lua", "check", content)
+		if not legal then
+			content = mod or ""
+		end
 	end
  
 	if content == "" then
@@ -12,6 +12,7 @@ Order.schema = {
     createTime  = {"number", skynet.timex()},       -- 订单创建时间
     finishTime 	= {"number", 0},	-- 服务端验证完成时间
     status 		= {"string", "create"},
+    sid 		= {"number",0}, 	-- 创建单号的设备的sid
 }
  
 Order.fields = {
@@ -21,6 +22,7 @@ Order.fields = {
 	createTime = true,
 	finishTime = true,
 	status = true,
+	sid = true,
 }
  
 return Order
 \ No newline at end of file
@@ -59,8 +59,9 @@ Role.schema = {
 	ignoreMt			= {"number", 0},  -- 忽略维护拦截
 	sversion			= {"number", STRUCT_VERSION or 0}, -- 重整数据版本
 	timeReset			= {"table", {}}, --重置轮回记录
-	diamond				= {"number", 0},
-	reDiamond			= {"number", 0},
+	diamond				= {"number", 0}, -- 免费钻
+	reDiamond			= {"number", 0}, -- android充值钻
+	reDiamondIos		= {"number", 0}, -- ios充值钻
 	setting				= {"table", {}}, --设置
 	codeStr				= {"string", ""}, --已经领过的礼包码
 	-- roleInfo
+local httpc = require("http.httpc")
+local md5 = require "md5"
+local cjson = require "shared.json"
  
 local serverId = tonumber(skynet.getenv("servId"))
 local RolePlugin = {}
@@ -442,7 +445,8 @@ function RolePlugin.bind(Role)
 	end
  
 	function Role:getAllDiamond()
-		return self:getProperty("diamond") + self:getProperty("reDiamond")
+		local diamond = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
+		return self:getProperty("diamond") + diamond
 	end
  
 	function Role:gainDiamond(params)
@@ -452,10 +456,14 @@ function RolePlugin.bind(Role)
 			return false
 		end
 		local origind = self:getProperty("diamond")
-		local originr = self:getProperty("reDiamond")
+		local originr = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
 		local origin = origind + originr
 		if params.isRecharge then
-			self:incrProperty("reDiamond", count)
+			if params.sid == IOS_SID then
+				self:incrProperty("reDiamondIos", count)
+			else
+				self:incrProperty("reDiamond", count)
+			end
 		else
 			self:incrProperty("diamond", count)
 		end
@@ -486,8 +494,9 @@ function RolePlugin.bind(Role)
 		if count <= 0 then
 			return false
 		end
+		local isIos = self:getProperty("sid") == IOS_SID
 		local origind = self:getProperty("diamond")
-		local originr = self:getProperty("reDiamond")
+		local originr = isIos and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
 		local origin = origind + originr
  
 		if origin < 0 then
@@ -497,9 +506,9 @@ function RolePlugin.bind(Role)
 			return false
 		end
 		local last = count
-		local costFirst = {"diamond", "reDiamond"}
+		local costFirst = isIos and {"diamond", "reDiamondIos"} or {"diamond", "reDiamond"}
 		if params.isRecharge then
-			costFirst = {"reDiamond", "diamond"}
+			costFirst = isIos and {"reDiamondIos", "diamond"} or {"reDiamond", "diamond"}
 		end
 		last  = math.max(last - self:getProperty(costFirst[1]), 0)
 		if last < count then
@@ -1750,6 +1759,7 @@ function RolePlugin.bind(Role)
 			rechargeId = rechargeId, 
 			createTime = skynet.timex(),
 			transactionId = transactionId,
+			sid = self:getProperty("sid"),
 		})
 		order:create()
 		-- 正在进行中的订单 缓存
@@ -1780,6 +1790,7 @@ function RolePlugin.bind(Role)
  
 		local rechargeId = orderObject:getProperty("rechargeId")
 		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
+		local sid = orderObject:getProperty("sid")
  
 		if orderObject:getProperty("finishTime") > 0 then
 			skynet.error(string.format("[recharge] is a finish order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
@@ -1817,7 +1828,7 @@ function RolePlugin.bind(Role)
 			})
 		end
  
-		return true, rechargeId
+		return true, rechargeId, sid
 	end
  
 	-- 充值 --
@@ -1835,7 +1846,7 @@ function RolePlugin.bind(Role)
 		local roleId = self:getProperty("id")
 		local partnerOrderStr = params.order
  
-		local status, back = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
+		local status, back, sid = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
 		if not status then
 			if back == "finsh" then
 				-- 订单已经处理
@@ -1857,6 +1868,7 @@ function RolePlugin.bind(Role)
 			transactionId = params.transactionId,
 			pay_time = params.pay_time,
 			order = partnerOrderStr,
+			sid = sid,
 		})
  
 		if not status then
@@ -1893,7 +1905,7 @@ function RolePlugin.bind(Role)
 				rechargeF[id] = 1
 				self:updateProperty({field = "rechargeF", value = rechargeF})
 			end
-			self:gainDiamond({count = diamondCount, isRecharge = true, log = {desc = "recharge", int1 = id}})
+			self:gainDiamond({count = diamondCount, isRecharge = true, sid = params.sid, log = {desc = "recharge", int1 = id}})
 		elseif rechargeData.shop == 2 then  --通行证商店
 			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
 			self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
@@ -2146,6 +2158,107 @@ function RolePlugin.bind(Role)
 		return hero:getProperty("faith")
 	end
  
+	local function table_keys( t )
+	    local keys = {}
+	    for k, _ in pairs( t ) do
+	        keys[#keys + 1] = k
+	    end
+	    return keys
+	end
+
+	local function makeStr(params, key, urlsign)
+		local keys = table_keys(params)
+		table.sort(keys)
+		local sign2Str, requestStr = "", ""
+		for _, key in ipairs(keys) do
+			sign2Str = sign2Str .. (urlsign and urlencode(params[key]) or params[key])
+			requestStr = requestStr .. string.format("%s=%s&",key,urlencode(params[key]))
+		end
+		local sign = md5.sumhexa(sign2Str .. key):lower()
+		requestStr = requestStr .. string.format("sign=%s",sign)
+
+		return requestStr
+	end
+
+	function Role:biliChatSDK(content)
+		if content == "" then return end
+		local base64Content = base64.encode(content)
+		local uids = self:getProperty("uid"):split2("_")
+		local uid = uids[2] or self:getProperty("uid")
+
+		local urls = {
+			"http://pnew.biligame.net",
+			"http://pserver.bilibiligame.net"
+		}
+		local secret = "8920e9dcf0cb4ebca87393ce48021ead"
+
+		local headers = {
+			["User-Agent"] = 'Mozilla/5.0 GameServer',
+			["Content-Type"] = "application/x-www-form-urlencoded",
+		}
+
+		local send = {
+			game_id = 4818,
+			uid = uid,
+			merchant_id = 1,
+			server_id = 3957,
+			version = "1",
+			timestamp = math.floor(skynet.timex() * 1000),
+			content = base64Content,
+		}
+
+		local params = makeStr(send, secret)
+		httpc.timeout = 100
+		local status, body = httpc.request("POST", urls[1], "/api/server/censor", {}, headers, params)
+	    if tonumber(status) ~= 200 then
+	        status, body = httpc.request("POST", urls[2], "/api/server/censor", {}, headers, params)
+	    end
+	    if tonumber(status) ~= 200 then
+	    	return
+	    end
+	    local result = json.decode(body)
+	    if not result or result.code ~= 0 then
+	    	return
+	    end
+		return result.data.content
+	end
+
+	function Role:uoChatSDK(content)
+		if content == "" then return end
+		local base64Content = base64.encode(content)
+		local uids = self:getProperty("uid"):split2("_")
+		local uid = uids[2] or self:getProperty("uid")
+
+		local urls = {
+			"http://uosdk.biligame.com",
+		}
+		local secret = "4243b5fb44b64175a20a53dcfb1346eb"
+
+		local headers = {
+			["User-Agent"] = 'Mozilla/5.0 CP-Game-Server',
+			["Content-Type"] = "application/x-www-form-urlencoded",
+		}
+
+		local send = {
+			app_id = 4821,
+			user_id = uid,
+			timestamp = math.floor(skynet.timex() * 1000),
+			content = base64Content,
+		}
+
+		local params = makeStr(send, secret, true)
+		httpc.timeout = 100
+		local status, body = httpc.request("POST", urls[1], "/api/server/censor", {}, headers, params)
+	    if tonumber(status) ~= 200 then
+	    	return
+	    end
+	    local result = json.decode(body)
+	    if not result or result.code ~= 0 then
+	    	return
+	    end
+		return result.data.content
+	end
+
 end
  
 return RolePlugin
 \ No newline at end of file
@@ -0,0 +1,155 @@
+local base64 = {}
+local string = string
+
+base64.__code = {
+           'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+           'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+           'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+           'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/',
+       };
+base64.__decode = {}
+for k,v in pairs(base64.__code) do
+   base64.__decode[string.byte(v,1)] = k - 1
+end
+
+function base64.encode(text)
+    local len = string.len(text)
+    local left = len % 3
+    len = len - left
+    local res = {}
+    local index  = 1
+    for i = 1, len, 3 do
+       local a = string.byte(text, i )
+       local b = string.byte(text, i + 1)
+       local c = string.byte(text, i + 2)
+       -- num = a<<16 + b<<8 + c
+       local num = a * 65536 + b * 256 + c 
+       for j = 1, 4 do
+           --tmp = num >> ((4 -j) * 6)
+           local tmp = math.floor(num / (2 ^ ((4-j) * 6)))
+           --curPos = tmp&0x3f
+           local curPos = tmp % 64 + 1
+           res[index] = base64.__code[curPos]
+           index = index + 1
+       end
+    end
+
+    if left == 1 then
+       base64.__left1(res, index, text, len)
+    elseif left == 2 then
+       base64.__left2(res, index, text, len)       
+    end
+    return table.concat(res)
+end
+
+function base64.__left2(res, index, text, len)
+    local num1 = string.byte(text, len + 1)
+    num1 = num1 * 1024 --lshift 10 
+    local num2 = string.byte(text, len + 2)
+    num2 = num2 * 4 --lshift 2 
+    local num = num1 + num2
+   
+    local tmp1 = math.floor(num / 4096) --rShift 12
+    local curPos = tmp1 % 64 + 1
+    res[index] = base64.__code[curPos]
+    
+    local tmp2 = math.floor(num / 64)
+    curPos = tmp2 % 64 + 1
+    res[index + 1] = base64.__code[curPos]
+
+    curPos = num % 64 + 1
+    res[index + 2] = base64.__code[curPos]
+    
+    res[index + 3] = "=" 
+end
+
+function base64.__left1(res, index,text, len)
+    local num = string.byte(text, len + 1)
+    num = num * 16 
+    
+    tmp = math.floor(num / 64)
+    local curPos = tmp % 64 + 1
+    res[index ] = base64.__code[curPos]
+    
+    curPos = num % 64 + 1
+    res[index + 1] = base64.__code[curPos]
+    
+    res[index + 2] = "=" 
+    res[index + 3] = "=" 
+end
+
+function base64.decode(text)
+    local len = string.len(text)
+    local left = 0 
+    if string.sub(text, len - 1) == "==" then
+       left = 2 
+       len = len - 4
+    elseif string.sub(text, len) == "=" then
+       left = 1
+       len = len - 4
+    end
+
+    local res = {}
+    local index = 1
+    local decode = base64.__decode
+    for i =1, len, 4 do
+       local a = decode[string.byte(text,i    )] 
+       local b = decode[string.byte(text,i + 1)] 
+       local c = decode[string.byte(text,i + 2)] 
+       local d = decode[string.byte(text,i + 3)]
+
+       --num = a<<18 + b<<12 + c<<6 + d
+       local num = a * 262144 + b * 4096 + c * 64 + d
+       
+       local e = string.char(num % 256)
+       num = math.floor(num / 256)
+       local f = string.char(num % 256)
+       num = math.floor(num / 256)
+       res[index ] = string.char(num % 256)
+       res[index + 1] = f
+       res[index + 2] = e
+       index = index + 3
+    end
+
+    if left == 1 then
+       base64.__decodeLeft1(res, index, text, len)
+    elseif left == 2 then
+       base64.__decodeLeft2(res, index, text, len)
+    end
+    return table.concat(res)
+end
+
+function base64.__decodeLeft1(res, index, text, len)
+    local decode = base64.__decode
+    local a = decode[string.byte(text, len + 1)] 
+    local b = decode[string.byte(text, len + 2)] 
+    local c = decode[string.byte(text, len + 3)] 
+    local num = a * 4096 + b * 64 + c
+    
+    local num1 = math.floor(num / 1024) % 256
+    local num2 = math.floor(num / 4) % 256
+    res[index] = string.char(num1)
+    res[index + 1] = string.char(num2)
+end
+
+function base64.__decodeLeft2(res, index, text, len)
+    local decode = base64.__decode
+    local a = decode[string.byte(text, len + 1)] 
+    local b = decode[string.byte(text, len + 2)]
+    local num = a * 64 + b
+    num = math.floor(num / 16)
+    res[index] = string.char(num)
+end
+
+function base64.test()
+    local data = "a\193\207="
+    local abc = base64.encode(data)
+    print(abc)
+
+    def = base64.decode(abc)
+    if def == data then
+       print("yes")
+    end
+end
+
+return base64
 \ No newline at end of file
@@ -2,4 +2,5 @@ require(&quot;shared.functions&quot;)
 require("shared.debug")
  
 json = require("shared.json")
-MsgPack = require "cmsgpack"
 \ No newline at end of file
+MsgPack = require "cmsgpack"
+base64 = require("shared.base64")
 \ No newline at end of file