modify:crypt communication pass word support

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -51,8 +51,8 @@
         }
     },
     "XCrypto": {
-        "bEnable": false,
-        "nPass": 123123
+        "bEnable": true,
+        "tszPassKey": "123123aa"
     },
     "XApiVer": {
         "bEnable": false,

XEngine_Source/AuthorizeModule_Configure/Config_Define.h

@@ -81,8 +81,8 @@ typedef struct
 	}st_XLogin;
 	struct  
 	{
+		XCHAR tszCryptoKey[32];                             //加密传输密钥
 		bool bEnable;                                       //是否启用加密传输 
-		int nPassword;                                      //密码
 	}st_XCrypto;
 	struct  
 	{

XEngine_Source/AuthorizeModule_Configure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -154,7 +154,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	}
 	Json::Value st_JsonXCrypto = st_JsonRoot["XCrypto"];
 	pSt_ServerConfig->st_XCrypto.bEnable = st_JsonXCrypto["bEnable"].asBool();
-	pSt_ServerConfig->st_XCrypto.nPassword = st_JsonXCrypto["nPass"].asInt();
+	_tcsxcpy(pSt_ServerConfig->st_XCrypto.tszCryptoKey, st_JsonXCrypto["tszPassKey"].asCString());
 	//接口验证
 	if (st_JsonRoot["XApiVer"].empty() || (5 != st_JsonRoot["XApiVer"].size()))
 	{

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_HttpTask.cpp

@@ -26,14 +26,8 @@ XHTHREAD XCALLBACK XEngine_AuthService_HttpThread(XPVOID lParam)
 			{
 				if (st_AuthConfig.st_XCrypto.bEnable)
 				{
-					XCHAR tszPassword[64];
-					XCHAR tszDeBuffer[2048];
-
-					memset(tszPassword, '\0', sizeof(tszPassword));
-					memset(tszDeBuffer, '\0', sizeof(tszDeBuffer));
-
-					_xstprintf(tszPassword, _X("%d"), st_AuthConfig.st_XCrypto.nPassword);
-					Cryption_XCrypto_Decoder(ptszMsgBuffer, &nMsgLen, tszDeBuffer, tszPassword);
+					XCHAR tszDeBuffer[2048] = {};
+					Cryption_XCrypto_Decoder(ptszMsgBuffer, &nMsgLen, tszDeBuffer, st_AuthConfig.st_XCrypto.tszCryptoKey);
 					XEngine_Client_HttpTask(ppSt_ListClient[i]->tszClientAddr, tszDeBuffer, nMsgLen, &st_HTTPParament, ppszListHdr, nHdrCount);
 				}
 				else

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.cpp

@@ -159,11 +159,7 @@ bool XEngine_Client_TaskSend(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int
 {
 	if (st_AuthConfig.st_XCrypto.bEnable)
 	{
-		XCHAR tszPassword[64];
-		memset(tszPassword, '\0', sizeof(tszPassword));
-
-		_xstprintf(tszPassword, _X("%d"), st_AuthConfig.st_XCrypto.nPassword);
-		XEngine_SendMsg(lpszClientAddr, lpszMsgBuffer, nMsgLen, nNetType, tszPassword);
+		XEngine_SendMsg(lpszClientAddr, lpszMsgBuffer, nMsgLen, nNetType, st_AuthConfig.st_XCrypto.tszCryptoKey);
 	}
 	else
 	{

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_TCPTask.cpp

@@ -29,14 +29,8 @@ XHTHREAD XCALLBACK XEngine_AuthService_TCPThread(XPVOID lParam)
 			}
 			if (st_AuthConfig.st_XCrypto.bEnable && (ENUM_XENGINE_PROTOCOLHDR_CRYPTO_TYPE_XCRYPT == st_ProtocolHdr.wCrypto))
 			{
-				XCHAR tszPassword[64];
-				XCHAR tszDeBuffer[2048];
-
-				memset(tszPassword, '\0', sizeof(tszPassword));
-				memset(tszDeBuffer, '\0', sizeof(tszDeBuffer));
-
-				_xstprintf(tszPassword, _X("%d"), st_AuthConfig.st_XCrypto.nPassword);
-				Cryption_XCrypto_Decoder(tszMsgBuffer, &nMsgLen, tszDeBuffer, tszPassword);
+				XCHAR tszDeBuffer[2048] = {};
+				Cryption_XCrypto_Decoder(tszMsgBuffer, &nMsgLen, tszDeBuffer, st_AuthConfig.st_XCrypto.tszCryptoKey);
 				XEngine_Client_TCPTask(ppSt_ListClient[i]->tszClientAddr, tszDeBuffer, nMsgLen, &st_ProtocolHdr, XENGINE_AUTH_APP_NETTYPE_TCP);
 			}
 			else

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_WSTask.cpp

@@ -27,14 +27,8 @@ XHTHREAD XCALLBACK XEngine_AuthService_WSThread(XPVOID lParam)
 			}
 			if (st_AuthConfig.st_XCrypto.bEnable)
 			{
-				XCHAR tszPassword[64];
-				XCHAR tszDeBuffer[2048];
-
-				memset(tszPassword, '\0', sizeof(tszPassword));
-				memset(tszDeBuffer, '\0', sizeof(tszDeBuffer));
-
-				_xstprintf(tszPassword, _X("%d"), st_AuthConfig.st_XCrypto.nPassword);
-				Cryption_XCrypto_Decoder(tszMsgBuffer, &nMsgLen, tszDeBuffer, tszPassword);
+				XCHAR tszDeBuffer[2048] = {};
+				Cryption_XCrypto_Decoder(tszMsgBuffer, &nMsgLen, tszDeBuffer, st_AuthConfig.st_XCrypto.tszCryptoKey);
 				XEngine_Client_WSTask(ppSt_ListClient[i]->tszClientAddr, tszDeBuffer, nMsgLen, enOPCode);
 			}
 			else

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/XEngine_AuthorizeService.cpp

@@ -374,7 +374,7 @@ int main(int argc, char** argv)
 
 	if (st_AuthConfig.st_XCrypto.bEnable)
 	{
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，加密传输设置为开启,密码:%d"), st_AuthConfig.st_XCrypto.nPassword);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中，加密传输设置为开启,密码:%s"), st_AuthConfig.st_XCrypto.tszCryptoKey);
 	}
 	else
 	{