|
|
@@ -153,15 +153,14 @@ ErrorCodeEnum CCenterSettingConn::OnEndPollConfig(const CSmartPointer<IPackage>
|
|
|
{
|
|
|
auto pEntity = (CCenterSettingEntity*)m_pEntity;
|
|
|
|
|
|
- ErrorCodeEnum rc = Error_Succeed;
|
|
|
DWORD dwSysCode, dwUserCode;
|
|
|
string strErrMsg;
|
|
|
|
|
|
bool bInitMKSuc = false;
|
|
|
if (pRecvPkg->GetErrMsg(dwSysCode, dwUserCode, strErrMsg))
|
|
|
{
|
|
|
- Dbg("poll center config fail, %s", strErrMsg.c_str());
|
|
|
- return rc;
|
|
|
+ Dbg("poll center config fail, sysCode=%d, usrCode=%d, %s", dwSysCode, dwUserCode, strErrMsg.c_str());
|
|
|
+ return Error_Unexpect;
|
|
|
}
|
|
|
|
|
|
int nIndex = 1;
|
|
|
@@ -172,7 +171,6 @@ ErrorCodeEnum CCenterSettingConn::OnEndPollConfig(const CSmartPointer<IPackage>
|
|
|
int nRetLen = pRecvPkg->GetStructLen(strCurStructName);
|
|
|
if (nRetLen == -1)
|
|
|
{
|
|
|
- //Dbg("center config not changed");
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
@@ -199,8 +197,9 @@ ErrorCodeEnum CCenterSettingConn::OnEndPollConfig(const CSmartPointer<IPackage>
|
|
|
}
|
|
|
|
|
|
CSimpleStringA strHash;
|
|
|
- for (int i = 0; i < 32; i++)
|
|
|
+ for (int i = 0; i < 32; i++) {
|
|
|
strHash += CSimpleStringA::Format("%02x", sm3[i]);
|
|
|
+ }
|
|
|
|
|
|
if (stricmp(strHash, pRet->FileHash) != 0)
|
|
|
{
|
gifur