فهرست منبع

Z991239-938 #comment other: CustMngrAuth在Linux下编译通过

翟俊伟80258120 5 سال پیش
والد
کامیت
5f9a8d3eeb
1فایلهای تغییر یافته به همراه7 افزوده شده و 5 حذف شده
  1. 7 5
      Module/mod_CustMngrAuth/CustMngrAuthFSM.h

+ 7 - 5
Module/mod_CustMngrAuth/CustMngrAuthFSM.h

@@ -395,6 +395,7 @@ public:
 		ErrorCodeEnum eErr;
 		//请求参数
 		FeatReq req = {0};
+
 		memcpy(req.BranchID, branchID, 16);
 		memcpy(req.CurrentAgent, currAgent, 16);//续传标志(代表已查到的最后一个客户经理
 		if (lastTime != NULL)
@@ -402,7 +403,13 @@ public:
 			memcpy(req.UpdateTime, lastTime, 20);//本地指纹数据最新时间
 			Dbg("req.UpdateTime:%s", req.UpdateTime);
 		}
+
+#ifdef RVC_OS_WIN
 		strncpy_s(req.TerminalID, sizeof(req.TerminalID), m_pFSM->m_TerminalID, _TRUNCATE);
+#else
+		strncpy(req.TerminalID, m_pFSM->m_TerminalID, _TRUNCATE);
+#endif // RVC_OS_WIN
+
 		CSmartPointer<IPackage> pkt = CreateNewPackage("FETQYREQ");
 		pkt->AddStruct("FETQYREQ", false, false, (LPBYTE)&req, sizeof(FeatReq));
 		m_reply = NULL;
@@ -465,13 +472,8 @@ protected:
 						m_reply = (FeatReply*)pData;
 						if (m_reply != NULL)
 						{
-							//Dbg("m_reply transformed successfully.");
-							//Dbg("Resultcode: %d", m_reply->ResultCode);
-							//Dbg("BranchID: %s", m_reply->BranchID);
-							//Dbg("CurrentAgent: %s", m_reply->CurrentAgent);
 							pData[nLen] = 0;
 							m_jsonLen = nLen - sizeof(FeatReply);
-							//Dbg("m_jsonLen:%d",m_jsonLen);
 						}
 						else
 						{