Skip to content

Commit daed8b9

Browse files
xengine-qytxengine-qyt
committed
fixed:print log is incorrect when client leave
1 parent a90c97c commit daed8b9

File tree

4 files changed

+52
-10
lines changed

4 files changed

+52
-10
lines changed

‎XEngine_Apps/Authorize_APPClient/Authorize_APPClient.cpp‎

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ using namespace std;
3535
//Linux::g++ -std=c++17 -Wall -g Authorize_APPClient.cpp -o Authorize_APPClient.exe -I ../../XEngine_Source/XEngine_Depend/XEngine_Module/jsoncpp -L ../../XEngine_Release -lXEngine_Cryption -lXClient_Socket -lXEngine_BaseLib -lXClient_APIHelp -lpthread -ljsoncpp -Wl,-rpath=../../XEngine_Release
3636

3737
//#define _DYNAMIC_CODE
38-
//#define _PASS_ENCRYPT
38+
#define _PASS_ENCRYPT
3939
bool bRun = true;
4040
bool bLogin = true;
4141
bool bTimeOut = true;
@@ -128,12 +128,22 @@ int AuthClient_Register()
128128
Json::Value st_JsonUserTable;
129129
LPCXSTR lpszUrl = _X("http://127.0.0.1:5302/auth/user/register");
130130

131-
st_JsonUserInfo["tszUserName"] = lpszUser;
131+
#ifdef _PASS_ENCRYPT
132+
XCHAR tszPassCodec[128] = {};
133+
int nPLen = _tcsxlen(lpszPass);
134+
XBYTE byMD5Buffer[MAX_PATH] = {};
135+
Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen);
136+
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, tszPassCodec);
137+
st_JsonUserInfo["tszUserPass"] = tszPassCodec;
138+
#else
132139
st_JsonUserInfo["tszUserPass"] = lpszPass;
140+
#endif
141+
142+
st_JsonUserInfo["tszUserName"] = lpszUser;
133143
st_JsonUserInfo["tszEMailAddr"] = lpszEmail;
134144
st_JsonUserInfo["nPhoneNumber"] = (Json::Value::Int64)nPhoneNumber;
135145
st_JsonUserInfo["nIDNumber"] = (Json::Value::Int64)nIDNumber;
136-
st_JsonUserInfo["nUserLevel"] = 5;
146+
st_JsonUserInfo["nUserLevel"] = ENUM_XENGINE_PROTOCOLHDR_LEVEL_TYPE_USER;
137147

138148
st_JsonUserTable["tszHardCode"] = "2FDWAD02JD2091";
139149
st_JsonUserTable["st_UserInfo"] = st_JsonUserInfo;
@@ -266,9 +276,9 @@ int AuthClient_Login()
266276
#ifdef _PASS_ENCRYPT
267277
int nPLen = _tcsxlen(st_AuthUser.tszUserPass);
268278
XBYTE byMD5Buffer[MAX_PATH] = {};
269-
OPenSsl_Api_Digest(st_AuthUser.tszUserPass, byMD5Buffer, &nPLen, false, XENGINE_OPENSSL_API_DIGEST_MD5);
279+
Cryption_Api_Digest(st_AuthUser.tszUserPass, byMD5Buffer, &nPLen);
270280
memset(st_AuthUser.tszUserPass, '\0', sizeof(st_AuthUser.tszUserPass));
271-
BaseLib_OperatorString_StrToHex((LPCXSTR)byMD5Buffer, nPLen, st_AuthUser.tszUserPass);
281+
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, st_AuthUser.tszUserPass);
272282
#endif
273283

274284
if (nDYCode > 0)
@@ -366,6 +376,17 @@ int AuthClient_GetPass()
366376
Json::Value st_JsonObject;
367377
LPCXSTR lpszUrl = _X("http://127.0.0.1:5302/auth/user/pass");
368378

379+
#ifdef _PASS_ENCRYPT
380+
XCHAR tszPASSCodec[128] = {};
381+
int nPLen = _tcsxlen(lpszPass);
382+
XBYTE byMD5Buffer[MAX_PATH] = {};
383+
Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen);
384+
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, tszPASSCodec);
385+
st_JsonObject["tszUserPass"] = tszPASSCodec;
386+
#else
387+
st_JsonObject["tszUserPass"] = lpszPass;
388+
#endif
389+
369390
st_JsonObject["tszUserName"] = lpszUser;
370391
st_JsonObject["tszEMailAddr"] = lpszEmail;
371392
st_JsonObject["nPhoneNumber"] = (Json::Value::Int64)nPhoneNumber;
@@ -406,7 +427,18 @@ int AuthClient_GetTime()
406427
_xstprintf(tszURLStr, _X("http://127.0.0.1:5302/api?function=time&token=%lld"),xhToken);
407428

408429
st_JsonObject["tszUserName"] = lpszUser;
430+
431+
#ifdef _PASS_ENCRYPT
432+
XCHAR tszPASSCodec[128] = {};
433+
int nPLen = _tcsxlen(lpszPass);
434+
XBYTE byMD5Buffer[MAX_PATH] = {};
435+
Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen);
436+
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, tszPASSCodec);
437+
st_JsonObject["tszUserPass"] = tszPASSCodec;
438+
#else
409439
st_JsonObject["tszUserPass"] = lpszPass;
440+
#endif
441+
410442
st_JsonRoot["st_UserAuth"] = st_JsonObject;
411443

412444
int nMsgLen = 0;
@@ -440,8 +472,18 @@ int AuthClient_Delete()
440472
Json::Value st_JsonObject;
441473
LPCXSTR lpszUrl = _X("http://127.0.0.1:5302/auth/user/delete");
442474

443-
st_JsonObject["tszUserName"] = lpszUser;
475+
#ifdef _PASS_ENCRYPT
476+
XCHAR tszPASSCodec[128] = {};
477+
int nPLen = _tcsxlen(lpszPass);
478+
XBYTE byMD5Buffer[MAX_PATH] = {};
479+
Cryption_Api_Digest(lpszPass, byMD5Buffer, &nPLen);
480+
BaseLib_String_StrToHex((LPCXSTR)byMD5Buffer, nPLen, tszPASSCodec);
481+
st_JsonObject["tszUserPass"] = tszPASSCodec;
482+
#else
444483
st_JsonObject["tszUserPass"] = lpszPass;
484+
#endif
485+
486+
st_JsonObject["tszUserName"] = lpszUser;
445487
st_JsonObject["tszEMailAddr"] = lpszEmail;
446488
st_JsonObject["nPhoneNumber"] = (Json::Value::Int64)nPhoneNumber;
447489
st_JsonObject["nIDNumber"] = (Json::Value::Int64)nIDNumber;
@@ -532,7 +574,7 @@ int main()
532574
AuthClient_GetPass();
533575
AuthClient_GetTime();
534576

535-
std::this_thread::sleep_for(std::chrono::seconds(100));
577+
std::this_thread::sleep_for(std::chrono::seconds(10));
536578
AuthClient_Delete();
537579
AuthClient_Try();
538580

‎XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Post/AuthorizeHTTP_User.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ bool XEngine_AuthorizeHTTP_User(XNETHANDLE xhToken, LPCXSTR lpszClientAddr, LPCX
230230
return false;
231231
}
232232
//安全验证判断
233-
if ((0 != _tcsxnicmp(st_UserInfo.tszEMailAddr, st_UserTable.st_UserInfo.tszEMailAddr, _tcsxlen(st_UserInfo.tszEMailAddr))) || (st_UserTable.st_UserInfo.nIDNumber != st_UserInfo.nIDNumber))
233+
if ((0 != _tcsxnicmp(st_UserInfo.tszEMailAddr, st_UserTable.st_UserInfo.tszEMailAddr, _tcsxlen(st_UserInfo.tszEMailAddr))) || (st_UserTable.st_UserInfo.nIDNumber != st_UserInfo.nIDNumber) || (st_UserTable.st_UserInfo.nPhoneNumber != st_UserInfo.nPhoneNumber))
234234
{
235235
Protocol_Packet_HttpComm(tszSDBuffer, &nSDLen, ERROR_AUTHORIZE_PROTOCOL_NOTMATCH, "user information is incorrent");
236236
XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);

‎XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Net.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ bool XEngine_CloseClient(LPCXSTR lpszClientAddr, bool bHeart)
135135
}
136136
Session_Token_Delete(st_NETClient.xhToken);
137137
Session_Authorize_CloseAddr(lpszClientAddr);
138-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("客户端：%s，用户名：%s，Token:%llu，离开服务器,在线时长:%d,离开方式:%s"), lpszClientAddr, st_NETClient.st_UserTable.st_UserInfo.tszUserName, st_NETClient.xhToken, st_AuthTime.nTimeONLine, m_StrLeave.c_str());
138+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("客户端：%s，用户名：%s，Token:%llu，离开服务器,在线时长:%lld,离开方式:%s"), lpszClientAddr, st_NETClient.st_UserTable.st_UserInfo.tszUserName, st_NETClient.xhToken, st_AuthTime.nTimeONLine, m_StrLeave.c_str());
139139
}
140140
else
141141
{

‎XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_TCPTask.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ bool XEngine_Client_TCPTask(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuffer, int n
6868
{
6969
Session_Token_UPDate(pSt_ProtocolHdr->xhToken);
7070
}
71-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("客户端：%s，句柄:%llu 心跳处理成功"), lpszClientAddr, pSt_ProtocolHdr->xhToken);
71+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("客户端：%s，句柄:%llu 心跳处理成功"), lpszClientAddr, pSt_ProtocolHdr->xhToken);
7272
}
7373
else if (XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN == pSt_ProtocolHdr->unOperatorCode)
7474
{

0 commit comments

Comments
 (0)