modify:bswitchblack to bswitchbanned

Author: xengine-qyt

XEngine_Source/AuthorizeModule_Configure/Config_Define.h

@@ -118,7 +118,7 @@ typedef struct
 	bool bSwitchDCode;                                      //动态验证码
 	bool bSwitchMulti;                                      //多端登录开关
 	bool bSwitchTry;                                        //临时验证
-	bool bSwitchBlack;                                      //黑名单
+	bool bSwitchBanned;                                      //黑名单
 }XENGINE_FUNCTIONSWITCH;
 //////////////////////////////////////////////////////////////////////////
 //                              导出的函数

XEngine_Source/AuthorizeModule_Configure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -341,6 +341,6 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_Switch(LPCXSTR lpszConfigFile,
 	pSt_ServerConfig->bSwitchDCode = st_JsonRoot["bSwitchDCode"].asBool();
 	pSt_ServerConfig->bSwitchMulti = st_JsonRoot["bSwitchMulti"].asBool();
 	pSt_ServerConfig->bSwitchTry = st_JsonRoot["bSwitchTry"].asBool();
-	pSt_ServerConfig->bSwitchBlack = st_JsonRoot["bSwitchBlack"].asBool();
+	pSt_ServerConfig->bSwitchBanned = st_JsonRoot["bSwitchBanned"].asBool();
 	return true;
 }

XEngine_Source/AuthorizeModule_Protocol/Protocol_Packet/Protocol_Packet.cpp

@@ -660,7 +660,7 @@ bool CProtocol_Packet::Protocol_Packet_HttpSwitch(XCHAR* ptszMsgBuffer, int* pIn
 	st_JsonRoot["bSwitchDCode"] = pSt_FunSwitch->bSwitchDCode;
 	st_JsonRoot["bSwitchMulti"] = pSt_FunSwitch->bSwitchMulti;
 	st_JsonRoot["bSwitchTry"] = pSt_FunSwitch->bSwitchTry;
-	st_JsonRoot["bSwitchBlack"] = pSt_FunSwitch->bSwitchBlack;
+	st_JsonRoot["bSwitchBanned"] = pSt_FunSwitch->bSwitchBanned;
 
 	*pInt_MsgLen = st_JsonRoot.toStyledString().length();
 	memcpy(ptszMsgBuffer, st_JsonRoot.toStyledString().c_str(), *pInt_MsgLen);

XEngine_Source/AuthorizeModule_Protocol/Protocol_Parse/Protocol_Parse.cpp

@@ -840,7 +840,7 @@ bool CProtocol_Parse::Protocol_Parse_HttpParseSwitch(LPCXSTR lpszMsgBuffer, int
 	pSt_FunSwitch->bSwitchDCode = st_JsonObject["bSwitchDCode"].asBool();
 	pSt_FunSwitch->bSwitchMulti = st_JsonObject["bSwitchMulti"].asBool();
 	pSt_FunSwitch->bSwitchTry = st_JsonObject["bSwitchTry"].asBool();
-	pSt_FunSwitch->bSwitchBlack = st_JsonObject["bSwitchBlack"].asBool();
+	pSt_FunSwitch->bSwitchBanned = st_JsonObject["bSwitchBanned"].asBool();
 
 	return true;
 }

XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Switch.cpp

@@ -234,7 +234,7 @@ void CDialog_Switch::OnBnClickedButton1()
 			m_RadioTryOPen.SetCheck(BST_UNCHECKED);
 			m_RadioTryClose.SetCheck(BST_CHECKED);
 		}
-		if (st_JsonRoot["bSwitchBlack"].asBool())
+		if (st_JsonRoot["bSwitchBanned"].asBool())
 		{
 			m_RadioBlackOPen.SetCheck(BST_CHECKED);
 			m_RadioBlackClose.SetCheck(BST_UNCHECKED);
@@ -363,11 +363,11 @@ void CDialog_Switch::OnBnClickedButton2()
 
 	if (BST_CHECKED == m_RadioBlackOPen.GetCheck())
 	{
-		st_JsonObject["bSwitchBlack"] = true;
+		st_JsonObject["bSwitchBanned"] = true;
 	}
 	else
 	{
-		st_JsonObject["bSwitchBlack"] = false;
+		st_JsonObject["bSwitchBanned"] = false;
 	}
 	st_JsonRoot["st_SwitchInfo"] = st_JsonObject;
 	st_JsonRoot["xhToken"] = _ttxoll(m_StrToken.GetBuffer());

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_Banned.cpp

@@ -11,7 +11,7 @@ bool XEngine_AuthorizeHTTP_Banned(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, L
 
 	memset(tszSDBuffer, '\0', sizeof(tszSDBuffer));
 
-	if (!st_FunSwitch.bSwitchBlack)
+	if (!st_FunSwitch.bSwitchBanned)
 	{
 		Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, 503, "the function is closed");
 		XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_User.cpp

@@ -76,7 +76,7 @@ bool XEngine_AuthorizeHTTP_User(LPCXSTR lpszClientAddr, LPCXSTR lpszAPIName, LPC
 		{
 			bSuccess = DBModule_MySQL_BannedExist(&st_Banned);
 		}
-		if (!bSuccess && st_FunSwitch.bSwitchBlack)
+		if (!bSuccess && st_FunSwitch.bSwitchBanned)
 		{
 			Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, 423, "user name is banned");
 			XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_HttpTask.cpp

@@ -72,7 +72,7 @@ bool XEngine_Client_HttpTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 	{
 		bSuccess = DBModule_MySQL_BannedExist(&st_Banned);//IP地址是否在黑名单
 	}
-	if (!bSuccess && st_FunSwitch.bSwitchBlack)
+	if (!bSuccess && st_FunSwitch.bSwitchBanned)
 	{
 		Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, 423, "ip address is banned");
 		XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_TCPTask.cpp

@@ -77,7 +77,7 @@ bool XEngine_Client_TCPTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
 		{
 			bSuccess = DBModule_MySQL_BannedExist(&st_Banned);//是否在黑名单
 		}
-		if (!bSuccess && st_FunSwitch.bSwitchBlack)
+		if (!bSuccess && st_FunSwitch.bSwitchBanned)
 		{
 			pSt_ProtocolHdr->wReserve = 423;
 			Protocol_Packet_HDRComm(tszSDBuffer, &nSDLen, pSt_ProtocolHdr, nNetType);

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/XEngine_AuthorizeService.cpp

@@ -315,7 +315,7 @@ int main(int argc, char** argv)
 	{
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_WARN, _X("启动服务中，信息报告给API服务器没有启用"));
 	}
-	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，功能开关选项,删除功能:%d,登录功能:%d,找回密码:%d,充值功能:%d,注册功能:%d,CDKey功能:%d,公告系统:%d,动态验证:%d,多端登录:%d,临时试用:%d,黑名单功能:%d"), st_FunSwitch.bSwitchDelete, st_FunSwitch.bSwitchLogin, st_FunSwitch.bSwitchPass, st_FunSwitch.bSwitchPay, st_FunSwitch.bSwitchRegister, st_FunSwitch.bSwitchCDKey, st_FunSwitch.bSwitchNotice, st_FunSwitch.bSwitchDCode, st_FunSwitch.bSwitchMulti, st_FunSwitch.bSwitchTry, st_FunSwitch.bSwitchBlack);
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，功能开关选项,删除功能:%d,登录功能:%d,找回密码:%d,充值功能:%d,注册功能:%d,CDKey功能:%d,公告系统:%d,动态验证:%d,多端登录:%d,临时试用:%d,黑名单功能:%d"), st_FunSwitch.bSwitchDelete, st_FunSwitch.bSwitchLogin, st_FunSwitch.bSwitchPass, st_FunSwitch.bSwitchPay, st_FunSwitch.bSwitchRegister, st_FunSwitch.bSwitchCDKey, st_FunSwitch.bSwitchNotice, st_FunSwitch.bSwitchDCode, st_FunSwitch.bSwitchMulti, st_FunSwitch.bSwitchTry, st_FunSwitch.bSwitchBanned);
 
 	pSt_File = _xtfopen(st_AuthConfig.st_XVerification.st_XCDKey.tszKeyFile, _X("rb"));
 	if (NULL == pSt_File)