Z991239-5199 #comment feat: 细化身份证实体日志

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -111,12 +111,10 @@ struct ImgChekTask : ITaskSp
 
 		string imgIn = imgInput.m_pData; //图片原始数据
 		long srclen = imgInput.m_iLength;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("m_iLength图片数据长度为%ld.", srclen);
 				
 		string encodeIn = base64_encode((unsigned char*)imgInput.m_pData, srclen);
 		//string encodeIn;
 		//Encode(imgIn, encodeIn); //传给服务端应base64编码
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("base64 encode 成功。");
 		imgCheckReq.imageBase64 = encodeIn;
 
 		CSmartPointer<IConfigInfo> spCtSettingConfig;
@@ -147,17 +145,8 @@ struct ImgChekTask : ITaskSp
 
 		CSimpleStringA errMsg;
 		if (ret) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__).setBeginTime(beg).setEndTime(end).
-			setResultCode(std::to_string(LONGLONG(imgCheckRet.m_sysCode)).c_str()).
-				setResultMsg(imgCheckRet.m_errMsg.c_str())
-				("imgCheckRetTask userCode:%s,resultdata:%s.", 
-					imgCheckRet.m_userCode.c_str(),imgCheckRet.m_resultData.c_str());
-
 			//Dbg("图片检测成功---");
-			if (imgCheckRet.m_success == true) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("图片检测通过。");
-			}
-			else
+			if (imgCheckRet.m_success != true) 
 			{
 				errMsg = CSimpleStringA::Format("图片检测不通过，result_data:%s.", imgCheckRet.m_resultData.c_str());
 				LogWarn(Severity_Middle, Error_Resource, IDCertificate_UserErrorCode_ScanImg_Failed, errMsg.GetData());
@@ -576,7 +565,7 @@ ErrorCodeEnum CIDCertFSM::OnInit()
 
 	supportUCS2 = FALSE;
 	igestionVer = FALSE;
-	
+
 	closeImgCheck = FALSE;
 	CSmartPointer<IConfigInfo> spCtSettingConfig;
 	GetEntityBase()->GetFunction()->OpenConfig(Config_CenterSetting, spCtSettingConfig);
@@ -761,14 +750,12 @@ int CIDCertFSM::ReadAndScan(SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadA
 			m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 			errRF = m_hDevHelper->IDCerRFControl(true);
 			m_ullEndTime = SP::Module::Comm::RVCGetTickCount();
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::IDCerRFControl").setCostTime(m_ullEndTime - m_ullBeginTime)
-				("ReadAndScan DevAdapter::IDCerRFControl");
 #ifdef RVC_OS_LINUX
 			ecForIDCerRFControl = errRF;
 #endif
 			if (Error_Succeed == errRF)
 			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("DevAdapter::IDCerRFControl").setCostTime(m_ullEndTime - m_ullBeginTime)("open rf succeed.");
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::IDCerRFControl").setCostTime(m_ullEndTime - m_ullBeginTime)("open rf succeed.");
 			}
 			else
 			{
@@ -836,7 +823,7 @@ int CIDCertFSM::ReadAndScan(SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadA
 				}
 				else
 				{
-					DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER)
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)
 						.setAPI("DevAdapter::IDCerGetData").setCostTime(m_ullEndTime - m_ullBeginTime)
 						.setLogCode("QLR040220106")("read succeed.");
 
@@ -890,7 +877,7 @@ int CIDCertFSM::ReadAndScan(SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadA
 				}
 				else
 				{
-					DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER)
+					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER)
 						.setAPI("DevAdapter::IDCerGetDataEx").setCostTime(m_ullEndTime - m_ullBeginTime)
 						.setLogCode("QLR040220106")("read succeed(sp scan).");
 
@@ -1138,7 +1125,7 @@ int CIDCertFSM::ReadAndScan(SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadA
 			}
 		}
 	}else{
-		DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setLogCode("QLR040220106").setResultCode("RTA2104");
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220106").setResultCode("RTA2104");
 		ctx->Answer(Error_Unexpect, IDCertificate_UserErrorCode_ReadAndScan_Failed);
 		LogError(Severity_High, Error_Unexpect, IDCertificate_UserErrorCode_ReadAndScan_Failed, "ReadAndScan some thing wrong.");
 	}
@@ -1187,20 +1174,17 @@ int CIDCertFSM::ReadAndScan(SpReqAnsContext<IDCert_ReadAndScan_Req, IDCert_ReadA
 	if(m_bCancelRead)
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 2");
-
 		return 2;
 	}
 
 	if(bExitWhenReading)
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 3");
-
 		return 3;
 	}
 
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 0");
 #endif //RVC_OS_WIN
-
 	return 0;
 }
 
@@ -1282,11 +1266,11 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 #endif
 			if (Error_Succeed == errRF)
 			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("DevAdapter::IDCerRFControl").setCostTime(m_ullEndTime - m_ullBeginTime)("open rf succeed.");
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::IDCerRFControl").setCostTime(m_ullEndTime - m_ullBeginTime)("open rf succeed.");
 			}
 			else
 			{
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("DevAdapter::IDCerRFControl").setCostTime(m_ullEndTime - m_ullBeginTime).setResultCode("RTA2106")
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::IDCerRFControl").setCostTime(m_ullEndTime - m_ullBeginTime).setResultCode("RTA2106")
 					("open rf failed.");
 				dwEnd = SP::Module::Comm::RVCGetTickCount();
 				elapsed = dwEnd - dwStart;
@@ -1332,13 +1316,13 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 			if (errReadEx2 == Error_NotImpl)
 			{
 				ctx->Ans.msgtype = 0; //旧字段传递，GBK、字符串传递文字信息
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("厂商不支持新接口，请调用旧接口。");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("厂商不支持新接口，请调用旧接口。");
 			}
 			else
 			{
 				ctx->Ans.msgtype = 1; //新字段传递，UTF8、二进制传递文字信息
 				//ex2数据读取功能代码、UCS2转UTF8代码
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("使用新字段。");
+				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("使用新字段。");
 				bInvokeReadEx2 = true;
 				if (errReadEx2 != Error_Succeed)
 				{
@@ -1395,7 +1379,7 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 					RemoveUCS2Blank((UINT16*)idInfoEx2.reserved2.data); //英文名备用字段
 					RemoveUCS2Blank((UINT16*)idInfoEx2.issuedSN.data); //换证次数
 
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("已去除首尾空格");
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("已去除首尾空格");
 
 #ifdef RVC_OS_WIN
 					//转换成GBK用于debug上传
@@ -1486,7 +1470,7 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 					UCS2_to_UTF8((UINT16*)idInfoEx2.reserved2.data, englishNameEx);
 					UCS2_to_UTF8((UINT16*)idInfoEx2.issuedSN.data, IssuedSN);
 
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("已转换成utf8");
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("已转换成utf8");
 
 					ctx->Ans.name_utf8.Alloc(strlen((char*)name));
 					ctx->Ans.sex_utf8.Alloc(strlen((char*)sex));
@@ -1520,7 +1504,7 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 					memcpy(ctx->Ans.reserved_utf8.m_pData, reserved, strlen((char*)reserved)); //新外国人永居证关联字段
 					memcpy(ctx->Ans.othercode_utf8.m_pData, englishNameEx, strlen((char*)englishNameEx)); //英文名备用字段
 
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("已传递接口字段。");
+					DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("已传递接口字段。");
 
 					m_ullBeginTime = SP::Module::Comm::RVCGetTickCount();
 					eErr = m_hDevHelper->ScanIDAndSaveImage();
@@ -1775,7 +1759,7 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 	}
 	else 
 	{
-		DbgWithLink(LOG_LEVEL_INFO, ctx->link.checkEmpty() ? LOG_TYPE_SYSTEM : LOG_TYPE_USER).setLogCode("QLR040220106").setResultCode("RTA2104");
+		DbgWithLink(LOG_LEVEL_ERROR, LOG_TYPE_USER).setLogCode("QLR040220106").setResultCode("RTA2104");
 		ctx->Answer(Error_Unexpect, IDCertificate_UserErrorCode_ReadAndScan_Failed);
 		LogError(Severity_High, Error_Unexpect, IDCertificate_UserErrorCode_ReadAndScan_Failed, "ReadAndScanUTF8 some thing wrong.");
 	}
@@ -2079,7 +2063,7 @@ int CIDCertFSM::Initial() //windows ver
 	GetEntityBase()->GetFunction()->GetSystemStaticInfo(sysInfo);
 	m_csMachineType = sysInfo.strMachineType;
 	m_terminalNo = sysInfo.strTerminalID;
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("machineType:%s,terminalNo:%s", (const char*)m_csMachineType, (const char*)m_terminalNo);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("machineType:%s,terminalNo:%s", (const char*)m_csMachineType, (const char*)m_terminalNo);
 	//oilyang@20220413 except RVC.PAD without FWB
 	CSimpleStringA tmpFWBDevSN("");
 	GetEntityBase()->GetFunction()->GetSysVar("FWBDevSN", tmpFWBDevSN);
@@ -2128,7 +2112,7 @@ int CIDCertFSM::Initial() //windows ver
 		m_devSN = "";
 		eErrDev = pEntity->LoadVendorLibName();
 		if (eErrDev != Error_Succeed) {
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("get vendor dll(%s)name failed.", pEntity->GetVendorLibName().GetData());
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("get vendor dll(%s)name failed.", pEntity->GetVendorLibName().GetData());
 			return 2;
 		}
 
@@ -2553,7 +2537,7 @@ BOOL CIDCertFSM::GetSexUTF8String(UINT16* in, UINT8* out)
 	}
 #endif
 
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("性别代码映射成功");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("性别代码映射成功");
 	return true;
 }
 
@@ -2592,7 +2576,7 @@ BOOL CIDCertFSM::GetNationalUTF8String(UINT16* in, UINT8* out)
 	}
 #endif
 
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("民族代码映射成功");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("民族代码映射成功");
 	return true;
 }
 
@@ -2620,7 +2604,7 @@ BOOL CIDCertFSM::GetDateStandardFormatUTF8(UINT16* in, UINT8* out)
 	int cmp = strcmp((char*)ltimeCheck, (char*)ltimeIn); //判断长期证件
 	if (cmp == 0)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("长期身份证，转换日期为9999/12/31");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("长期身份证，转换日期为9999/12/31");
 #ifdef RVC_OS_WIN
 		wstring time = L"9999/12/31";
 		UCS2_to_UTF8((UINT16*)time.c_str(), out);
@@ -2656,7 +2640,7 @@ BOOL CIDCertFSM::GetDateStandardFormatUTF8(UINT16* in, UINT8* out)
 	//*p2 = '\0';
 
 	UCS2_to_UTF8(trans, out);
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("日期格式转换成功！");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("日期格式转换成功！");
 	return true;
 }
 
@@ -2720,7 +2704,7 @@ void CIDCertFSM::CheckHanZi(UINT16* ucs2_code)
 	{
 		if (*tmp >= 0x4e00 && *tmp <= 0x9fa5)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("是汉字。");
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("是汉字。");
 		}
 		else
 		{
@@ -2744,6 +2728,6 @@ void CIDCertFSM::CheckHanZi(UINT16* ucs2_code)
 #ifdef RVC_OS_WIN
 void CIDCertFSM::HttpsLogCallBack(const char* logtxt)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("%s", logtxt);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("%s", logtxt);
 }
 #endif

Module/mod_IDCertificate/mod_IDCertificate.cpp

@@ -58,7 +58,7 @@ void CIDCertEntity::OnSysVarEvent(const char* pszKey,
 {
 	if ((_strnicmp(pszKey, "FWBReConn", strlen("FWBReConn")) == 0))
 	{
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("OnSysVarEvent FWBReConn:%s", pszValue);
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("OnSysVarEvent FWBReConn:%s", pszValue);
 		//"Y":open suc "U":unbind
 		if (_strnicmp(pszValue, "Y", strlen("Y")) == 0 || _strnicmp(pszValue, "U", strlen("U")) == 0)
 		{