修改注册/登录

dev/base/baseAdapt.lua

@@ -11,13 +11,13 @@ local sharetable = require "skynet.sharetable"
 
 local dir = skynet.getenv("config_path")
 
-local baseAdapt = {}
+local root = {}
 
-function baseAdapt:getConfig(name)
+function root:getConfig(name)
     return sharetable.query(dir .. name .. ".lua")
 end
 
-function baseAdapt:getOneConfig(name, value, key)
+function root:getOneConfig(name, value, key)
     local conf = self:getConfig(name)
     if not conf then
         return
@@ -31,4 +31,4 @@ function baseAdapt:getOneConfig(name, value, key)
     end
 end
 
-return baseAdapt
+return root

nodes/login/controllers/usr.lua

@@ -82,8 +82,7 @@ function root.register(msg)
         msg.sysVer or "",
         msg.uuid,
         msg.udid,
-        msg.ip,
-        msg.idfa
+        msg.ip
     }
     logRegister:raw(table.concat(cntDatas, ";"))
 
@@ -160,74 +159,4 @@ function root.login(msg)
     return code.OK, ret
 end
 
-local function l_get_account_uid(account)
-    if is_empty(account) then
-        return
-    end
-    local sql = string.format("select max(uid) as uid from mdl_account where account = '%s';", account)
-    local result = lib_game_mysql:query(sql)
-    log.info("l_is_account_registed account[%s] result[%s]", tostring(account), tostring(result))
-    if is_empty(result) then
-        return
-    end
-
-    local uid = result[1]["uid"]
-    if is_nil(uid) then
-        return
-    end
-    return tonumber(uid)
-end
-function root.account_register(msg)
-    local account, password = msg.account, msg.password
-    if is_empty(account) or is_empty(password) then
-        return code.PARAMTER_ERROR
-    end
-
-    msg.password = nil
-    -- 重置uuid
-    local errCode, ret = root.register(msg)
-    if not code.is_ok(errCode) then
-        return errCode
-    end
-
-    -- 账号信息
-    local uid = l_get_account_uid(account)
-    if uid then
-        return code.USR.ALREADY_REGISTER
-    end
-    -- 新增账号
-    local sql =
-        string.format(
-        "replace into `mdl_account` (`uid`, `account`, `password`) VALUE (%s, '%s', '%s');",
-        tostring(uid),
-        account,
-        password
-    )
-    lib_game_mysql:query(sql)
-
-    return code.OK, {uid = ret.uid, password = ret.password}
-end
-function root.account_login(msg)
-    local account, password = msg.account, msg.password
-    if is_empty(account) or is_empty(password) then
-        return code.PARAMTER_ERROR
-    end
-
-    local uid = l_get_account_uid(account)
-    if is_empty(uid) then
-        return code.USR.NOT_EXIST_USER
-    end
-
-    -- 密码检验
-    if not userData:user_is_match_password(password) then
-        return code.USR.LOGIN_PASSWORD_ERROR
-    end
-
-    msg.password = password
-    return root.login(msg)
-end
-
 return root