Z991239-6293 #comment feat: 身份证日志精简

Module/mod_IDCertificate/IDCertFSM.cpp

@@ -164,7 +164,7 @@ void CIDCertFSM::s0_on_exit()
 }
 unsigned int CIDCertFSM::s0_on_event(FSMEvent* pEvt)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("s0 evt %d",pEvt->iEvt);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("s0 evt %d",pEvt->iEvt);
 	switch (pEvt->iEvt)
 	{
 		case USER_EVT_ERROR:
@@ -218,7 +218,7 @@ void CIDCertFSM::s1_on_exit()
 }
 unsigned int CIDCertFSM::s1_on_event(FSMEvent *pEvt)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("s1 evt %d", pEvt->iEvt);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("s1 evt %d", pEvt->iEvt);
 	int ret = 0;
 	switch(pEvt->iEvt)
 	{
@@ -303,7 +303,7 @@ void CIDCertFSM::s3_on_exit()
 }
 unsigned int CIDCertFSM::s3_on_event(FSMEvent* pEvt)
 {
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("s3 evt %d", pEvt->iEvt);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("s3 evt %d", pEvt->iEvt);
 	int ret = 0;
 	switch (pEvt->iEvt)
 	{
@@ -693,18 +693,18 @@ int CIDCertFSM::ReadAndScanUTF8(SpReqAnsContext<IDCert_ReadAndScanUTF8_Req, IDCe
 
 	if (m_bCancelRead)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 1");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 1");
 
 		return 1;
 	}
 
 	if (bExitWhenReading)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 2");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 2");
 
 		return 2;
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 0");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 0");
 	return 0;
 }
 
@@ -883,18 +883,18 @@ int CIDCertFSM::ReadAndScanUTF8JS(SpReqAnsContext<IDCert_ReadAndScanUTF8JS_Req,
 
 	if (m_bCancelRead)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 1");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 1");
 
 		return 1;
 	}
 
 	if (bExitWhenReading)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 2");
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 2");
 
 		return 2;
 	}
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 0");
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("return 0");
 	return 0;
 }
 
@@ -905,7 +905,7 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 	eErr = m_pEntity->GetFunction()->GetPath("Dep", strPath);
 	if (eErr != Error_Succeed)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Get [Dep] path failed!  errcode:%s.", SpStrError(eErr));
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Get [Dep] path failed!  errcode:%s.", SpStrError(eErr));
 		return Error_Param;
 	}
 
@@ -916,7 +916,7 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 		eErr = m_pEntity->GetFunction()->GetPath("DepBak", strOldPath);
 		if (eErr != Error_Succeed)
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Get [DepBak] Path failed！ errcode:%s.", SpStrError(eErr));
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Get [DepBak] Path failed！ errcode:%s.", SpStrError(eErr));
 			return Error_Param;
 		}
 		strOldPath = strOldPath + SPLIT_SLASH_STR + fileNamePrefix;
@@ -946,7 +946,7 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 	if (!src)
 	{
 		errMsg = CSimpleStringA::Format("read file %s.bmp failed.err:%d", (const char*)strPath, GetLastError());
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)(errMsg.GetData());
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)(errMsg.GetData());
 		if (transImgMsg.GetLength() != 0)
 		{
 			transImgMsg = transImgMsg + "," + errMsg;
@@ -974,7 +974,7 @@ ErrorCodeEnum CIDCertFSM::GetPngBlobEx(CBlob &data, CSimpleStringA fileNamePrefi
 	}
 	else {
 		errMsg = CSimpleStringA::Format("fopen %s failed!", (const char*)strPath);
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)(errMsg.GetData());
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)(errMsg.GetData());
 		if (transImgMsg.GetLength() != 0)
 		{
 			transImgMsg = transImgMsg + "," + errMsg;
@@ -998,7 +998,7 @@ ErrorCodeEnum CIDCertFSM::DeleteFileIfExisted(LPCTSTR fileName, int deleteTiming
 {
 	if(strlen(fileName) == 0 || strchr(fileName, (int)'*') != NULL)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)
 			("Invalid or empty fileName(%s)", fileName);
 		return Error_Param;
 	}
@@ -1124,8 +1124,6 @@ int CIDCertFSM::Initial()
 	FulfillAdapterInfoFrom(pEntity->vendorLibInfo);
 
 	pEntity->InitializeVendorLogSwitch();
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)
-		("Vendor=%s#Version=%s#Batch=%s", (const char*)m_adapterInfo.strVendor, (const char*)m_adapterInfo.strVersion, (const char*)m_adapterInfo.strBatch);
 	eErrDev = LoadUpAdapterLibrary();
 	if (!IS_SUCCEED(eErrDev)) {
 		LogWarn(Severity_Middle, Error_Unexpect, IDCertificate_UserErrorCode_DllLoadFailed,
@@ -1162,8 +1160,6 @@ int CIDCertFSM::Initial()
 	{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("DevAdapter::GetDevCategory").setCostTime(m_ullEndTime - m_ullBeginTime)
 			("Initial GetDevCategory succeed");
-		if (strlen(m_devCatInfo.szModel) < 256)
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("%s", m_devCatInfo.szModel);
 
 		CSimpleStringA szMod(m_devCatInfo.szModel);
 		if (strstr(m_devCatInfo.szModel, "CODE=UCS2") != NULL)
@@ -1206,7 +1202,7 @@ void CIDCertFSM::UCS2_to_UTF8(UINT16* ucs2_code, UINT8* utf8_code)
 
 	if (!utf8_code || !ucs2_code)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)
 			("UCS2转换异常：UCS2[%d], UTF8[%d]", (ucs2_code == NULL), (utf8_code == NULL));
 		return;
 	}
@@ -1246,7 +1242,7 @@ void CIDCertFSM::GetSexUTF8String(UINT16* in, UINT8* out)
 {
 	if (!in || !out)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)
 			("性别转换参数异常：in_UCS2[%d], out_UTF8[%d]", (in == NULL), (out == NULL));
 		return;
 	}
@@ -1310,7 +1306,7 @@ void CIDCertFSM::GetNationalUTF8String(UINT16* in, UINT8* out)
 {
 	if (!in || !out)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)
 			("民族转换参数异常：in_UCS2[%d], out_UTF8[%d]", (in == NULL), (out == NULL));
 		return;
 	}
@@ -1349,7 +1345,7 @@ void CIDCertFSM::GetDateStandardFormatUTF8(UINT16* in, UINT8* out)
 {
 	if (!in || !out)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)
 			("日期转换参数异常：in_UCS2[%d], out_UTF8[%d]", (in == NULL), (out == NULL));
 		return;
 	}
@@ -1412,7 +1408,7 @@ void CIDCertFSM::RemoveUCS2Blank(UINT16* ucs2_code)
 {
 	if (!ucs2_code)
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("去除UCS2空格异常, UCS2数据地址为空！");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("去除UCS2空格异常, UCS2数据地址为空！");
 		return;
 	}