Skip to content

Commit 2317c9d

Browse files
committed
modify:user register level is 20
modify:level choice range for management app
1 parent c82da3f commit 2317c9d

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

XEngine_Source/XAuth_Protocol.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#define ERROR_AUTHORIZE_PROTOCOL_NOTSUPPORT 0x113 //不支持
5151
#define ERROR_AUTHORIZE_PROTOCOL_NOTMATCH 0x114 //数据不匹配
5252
#define ERROR_AUTHORIZE_PROTOCOL_TIMEOUT 0x115 //超时
53+
#define ERROR_AUTHORIZE_PROTOCOL_PERMISSION 0x116 //用户权限错误
5354

5455
#define ERROR_AUTHORIZE_PROTOCOL_SERVER 0x201 //服务端内部错误
5556
#define ERROR_AUTHORIZE_PROTOCOL_LIMIT 0x202 //服务端内部限制,数据过大后者过小

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Modify.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ BOOL CDialog_Modify::OnInitDialog()
6363
for (int i = 0; i < 21; i++)
6464
{
6565
USES_CONVERSION;
66-
m_ComboLeave.InsertString(i, A2W(lpszXLevelType[i]));
66+
m_ComboLeave.InsertString(i, A2W(lpszXLevelType[i + 1]));
6767
}
6868
m_DateTimeRegister.SetFormat(_T("yyyy-MM-dd HH:mm:ss"));
6969
POSITION pSt_Sition = pUserWnd->m_ListCtrlClient.GetFirstSelectedItemPosition();
@@ -168,7 +168,7 @@ BOOL CDialog_Modify::OnInitDialog()
168168
m_EditLeftTime.SetWindowText(A2W(st_JsonObject["tszLeftTime"].asCString()));
169169

170170
m_ComboSerial.SetCurSel(st_JsonObject["enSerialType"].asInt());
171-
m_ComboLeave.SetCurSel(st_JsonObject["st_UserInfo"]["nUserLevel"].asInt() + 1);
171+
m_ComboLeave.SetCurSel(st_JsonObject["st_UserInfo"]["nUserLevel"].asInt());
172172

173173
if (ENUM_XENGINE_PROTOCOLHDR_LEVEL_TYPE_ROOT == st_JsonObject["st_UserInfo"]["nUserLevel"].asInt())
174174
{

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_User.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,15 @@ bool XEngine_AuthorizeHTTP_User(XNETHANDLE xhToken, LPCXSTR lpszClientAddr, LPCX
115115
st_UserTable.enSerialType = (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE)st_AuthConfig.st_XVerification.nTryMode;
116116
}
117117
//禁止权限0和1注册
118-
if (st_UserTable.st_UserInfo.nUserLevel <= 1)
118+
if (st_UserTable.st_UserInfo.nUserLevel < 10)
119119
{
120-
st_UserTable.st_UserInfo.nUserLevel = ENUM_XENGINE_PROTOCOLHDR_LEVEL_TYPE_USER;
120+
Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, ERROR_AUTHORIZE_PROTOCOL_PERMISSION, "user and pass does not set");
121+
XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);
122+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,注册失败,没有设置用户和密码"), lpszClientAddr);
123+
return false;
121124
}
125+
//默认普通用户
126+
st_UserTable.st_UserInfo.nUserLevel = 20;
122127
if (_tcsxlen(st_UserTable.st_UserInfo.tszUserName) <= 0 || _tcsxlen(st_UserTable.st_UserInfo.tszUserPass) <= 0)
123128
{
124129
Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, ERROR_AUTHORIZE_PROTOCOL_REQUEST, "user and pass does not set");

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_TCPTask.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,6 @@ bool XEngine_Client_TCPTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
302302
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("客户端:%s,用户名:%s,多端登录失败,用户已经登录,类型:%d"), lpszClientAddr, st_AuthProtocol.tszUserName, st_AuthProtocol.enDeviceType);
303303
return false;
304304
}
305-
//是否被封禁
306-
if (-1 == st_UserTable.st_UserInfo.nUserLevel)
307-
{
308-
pSt_ProtocolHdr->wReserve = ERROR_AUTHORIZE_PROTOCOL_BANNED;
309-
Protocol_Packet_HDRComm(tszSDBuffer, &nSDLen, pSt_ProtocolHdr, nNetType);
310-
XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, nNetType);
311-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("客户端:%s,用户名:%s,登录失败,客户端已被封禁"), lpszClientAddr, st_AuthProtocol.tszUserName);
312-
return false;
313-
}
314305
//分析充值类型
315306
if ((ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_UNKNOW == st_UserTable.enSerialType) || ('0' == st_UserTable.tszLeftTime[0]))
316307
{

0 commit comments

Comments
 (0)