新增手机号登录

dev/data/user.lua

@@ -29,15 +29,19 @@ function root:user_init_register_info(uid, info)
     moduleData:hset(uid, MODULE_NAME, "deviceId", info.deviceId or "")
     moduleData:hset(uid, MODULE_NAME, "channel", info.channel)
 
-    moduleData:hset(uid, MODULE_NAME, "nickname", string.format("玩家%06d", uid))
+    moduleData:hset(uid, MODULE_NAME, "nickname", info.nickname or string.format("玩家%06d", uid))
     -- 非测试环境随机密码
-    local password = "123456"
-    if not IS_TEST then
-        local r = {}
-        for i = 1, 8 do
-            table.insert(r, string.char(math.random(97, 122)))
+    local password = info.password
+    if is_nil(password) then
+        if not IS_TEST then
+            local r = {}
+            for i = 1, 8 do
+                table.insert(r, string.char(math.random(97, 122)))
+            end
+            password = table.concat(r)
+        else
+            password = "123456"
         end
-        password = table.concat(r)
     end
     moduleData:hset(uid, MODULE_NAME, "password", password)
     return true

dev/modules/account.lua

@@ -1,8 +1,9 @@
 -- 账号
 local root = class("moduleAccount", require("base.baseModule"))
 
-function root:ctor()
-    root.super.ctor(self, nil, "account", "account")
+function root:ctor(account)
+    root.super.ctor(self, nil, "account", "account", true)
+    self.account = account
 end
 
 function root:mysql_get_init_columns()

nodes/login/controllers/usr.lua

@@ -1,17 +1,14 @@
 local code = require "code"
 local tokenUtil = require "utils.tokenUtil"
-local nodeUtil = require("utils.nodeUtil")
 local serverLogUtil = require("utils.serverLogUtil")
+local util_user = require("utils.util_user")
+local accountModule = require("modules.accountModule")
 
 local lib_game_mysql = require("lib_game_mysql")
 local lib_game_redis = require("lib_game_redis")
 local moduleData = require("data.module")
 local userData = require("data.user")
 
-local lib_logger = require("log.lib_logger")
-local logRegister = lib_logger:new("register")
-local logLogin = lib_logger:new("login")
-
 local root = {}
 
 -- uuid注册
@@ -110,7 +107,7 @@ function root.login(msg)
         return code.USR.FORCE_OUT
     end
     -- 分配网关服务器
-    local nodeInfo = nodeUtil:user_dispatch_gate_node_and_agent(uid)
+    local nodeInfo = util_user:user_dispatch_gate_node(uid)
     if is_empty(nodeInfo) or is_empty(nodeInfo.ip) or is_empty(nodeInfo.wsPort) then
         return code.NOT_FOUND_SERVER
     end
@@ -150,4 +147,95 @@ function root.login(msg)
     return code.OK, ret
 end
 
+-- 注册 - 手机号
+function root.registerByPhone(msg)
+    local errCode, ret = l_uuid_register(msg)
+    if errCode then
+        return errCode, ret
+    end
+    local account = msg.phone
+    local password = msg.password
+    -- 账号信息
+    local accountObj = accountModule.new(account)
+    -- 已注册
+    if accountObj:get_data_from_db() then
+        -- return code.USR.ALREADY_REGISTER
+        return root.loginByPhone(msg)
+    end
+    local uid = l_get_register_uid()
+    -- 注册账号
+    moduleData:hset(account, "account", "account", account)
+    moduleData:hset(account, "account", "password", password)
+    moduleData:hset(account, "account", "uid", uid)
+    accountObj:backup_to_db()
+
+    -- 正常注册
+    userData:user_init_register_info(uid, msg)
+    -- 注册埋点
+    serverLogUtil.logRegister(uid, msg.channel, msg.version, msg.sysVer or "", msg.uuid, msg.udid, msg.ip)
+
+    return root.loginByPhone(msg)
+end
+-- 登录 - 手机号
+function root.loginByPhone(msg)
+    log.info("loginByPhone msg[%s]", tostring(msg))
+    local account, password = msg.account, msg.accountPassword
+    if not account or not password then
+        return code.PARAMTER_ERROR
+    end
+
+    local accountObj = accountModule.new(account)
+    if not accountObj:get_data_from_db() then
+        return code.USR.NOT_EXIST_USER
+    end
+
+    local psw = moduleData:hget(account, "account", "password")
+    if psw ~= password then
+        return code.USR.LOGIN_PASSWORD_ERROR
+    end
+
+    local uid = moduleData:hget(account, "account", "uid")
+    -- 状态
+    local status = moduleData:hget_int(uid, "user", "status")
+    if status > 0 then
+        return code.USR.FORCE_OUT
+    end
+    -- 分配网关服务器
+    local nodeInfo = util_user:user_dispatch_gate_node(uid)
+    if is_empty(nodeInfo) or is_empty(nodeInfo.ip) or is_empty(nodeInfo.wsPort) then
+        return code.NOT_FOUND_SERVER
+    end
+
+    -- 暂存登陆数据
+
+    -- 登陆埋点
+    serverLogUtil.logLogin(
+        uid,
+        msg.channel or "",
+        msg.version or "",
+        msg.sysVer or "",
+        msg.operator or "",
+        msg.network or "",
+        msg.uuid or "",
+        msg.udid or "",
+        msg.ip
+    )
+
+    local registerTime = moduleData:hget_int(uid, "user", "registerTime")
+    local password = moduleData:hget_int(uid, "user", "password")
+    local token = tokenUtil.create(uid, password)
+    local ret = {
+        sysTime = skynet_time(),
+        ip = nodeInfo.ip,
+        port = nodeInfo.port,
+        wsPort = nodeInfo.wsPort,
+        token = token,
+        uid = uid,
+        registerTime = registerTime
+    }
+
+    log.info("loginByPhone uid[%d] ret[%s]", tostring(uid), tostring(ret))
+    return code.OK, ret
+end
+
 return root