modify:user register level is 20

modify:level choice range for management app

Author: xengine-qyt

XEngine_Source/XAuth_Protocol.h

@@ -50,6 +50,7 @@
 #define ERROR_AUTHORIZE_PROTOCOL_NOTSUPPORT 0x113                         //不支持
 #define ERROR_AUTHORIZE_PROTOCOL_NOTMATCH 0x114                           //数据不匹配
 #define ERROR_AUTHORIZE_PROTOCOL_TIMEOUT 0x115                            //超时
+#define ERROR_AUTHORIZE_PROTOCOL_PERMISSION 0x116                         //用户权限错误
 
 #define ERROR_AUTHORIZE_PROTOCOL_SERVER 0x201                             //服务端内部错误
 #define ERROR_AUTHORIZE_PROTOCOL_LIMIT 0x202                              //服务端内部限制,数据过大后者过小

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Modify.cpp

@@ -63,7 +63,7 @@ BOOL CDialog_Modify::OnInitDialog()
 	for (int i = 0; i < 21; i++)
 	{
 		USES_CONVERSION;
-		m_ComboLeave.InsertString(i, A2W(lpszXLevelType[i]));
+		m_ComboLeave.InsertString(i, A2W(lpszXLevelType[i + 1]));
 	}
 	m_DateTimeRegister.SetFormat(_T("yyyy-MM-dd HH:mm:ss"));
 	POSITION pSt_Sition = pUserWnd->m_ListCtrlClient.GetFirstSelectedItemPosition();
@@ -168,7 +168,7 @@ BOOL CDialog_Modify::OnInitDialog()
 		m_EditLeftTime.SetWindowText(A2W(st_JsonObject["tszLeftTime"].asCString()));
 
 		m_ComboSerial.SetCurSel(st_JsonObject["enSerialType"].asInt());
-		m_ComboLeave.SetCurSel(st_JsonObject["st_UserInfo"]["nUserLevel"].asInt() + 1);
+		m_ComboLeave.SetCurSel(st_JsonObject["st_UserInfo"]["nUserLevel"].asInt());
 
 		if (ENUM_XENGINE_PROTOCOLHDR_LEVEL_TYPE_ROOT == st_JsonObject["st_UserInfo"]["nUserLevel"].asInt())
 		{

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_User.cpp

@@ -115,10 +115,15 @@ bool XEngine_AuthorizeHTTP_User(XNETHANDLE xhToken, LPCXSTR lpszClientAddr, LPCX
 			st_UserTable.enSerialType = (ENUM_AUTHORIZE_MODULE_SERIAL_TYPE)st_AuthConfig.st_XVerification.nTryMode;
 		}
 		//禁止权限0和1注册
-		if (st_UserTable.st_UserInfo.nUserLevel <= 1)
+		if (st_UserTable.st_UserInfo.nUserLevel < 10)
 		{
-			st_UserTable.st_UserInfo.nUserLevel = ENUM_XENGINE_PROTOCOLHDR_LEVEL_TYPE_USER;
+			Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, ERROR_AUTHORIZE_PROTOCOL_PERMISSION, "user and pass does not set");
+			XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);
+			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端：%s，注册失败，没有设置用户和密码"), lpszClientAddr);
+			return false;
 		}
+		//默认普通用户
+		st_UserTable.st_UserInfo.nUserLevel = 20;
 		if (_tcsxlen(st_UserTable.st_UserInfo.tszUserName) <= 0 || _tcsxlen(st_UserTable.st_UserInfo.tszUserPass) <= 0)
 		{
 			Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, ERROR_AUTHORIZE_PROTOCOL_REQUEST, "user and pass does not set");

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_TCPTask.cpp

@@ -302,15 +302,6 @@ bool XEngine_Client_TCPTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
 			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("客户端：%s，用户名：%s，多端登录失败，用户已经登录,类型:%d"), lpszClientAddr, st_AuthProtocol.tszUserName, st_AuthProtocol.enDeviceType);
 			return false;
 		}
-		//是否被封禁
-		if (-1 == st_UserTable.st_UserInfo.nUserLevel)
-		{
-			pSt_ProtocolHdr->wReserve = ERROR_AUTHORIZE_PROTOCOL_BANNED;
-			Protocol_Packet_HDRComm(tszSDBuffer, &nSDLen, pSt_ProtocolHdr, nNetType);
-			XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, nNetType);
-			XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("客户端：%s，用户名：%s，登录失败，客户端已被封禁"), lpszClientAddr, st_AuthProtocol.tszUserName);
-			return false;
-		}
 		//分析充值类型
 		if ((ENUM_AUTHORIZE_MODULE_SERIAL_TYPE_UNKNOW == st_UserTable.enSerialType) || ('0' == st_UserTable.tszLeftTime[0]))
 		{