Merge branch '0_0_2_test1' of http://mayun.itc.cmbchina.cn/QD_RemoteBankArea/LR04.02_RVCTerminalPlus into 0_0_2_test1

Module/mod_Initializer/mod_Initializer.cpp

@@ -1852,8 +1852,9 @@ bool CInitializerEntity::HasPinPad()
 				GetOutPutStr("%s%08X", "GetSystemStaticInfo", rc).c_str());
 	}
 	//@test自测shi使用
-	if (info.strMachineType.IsStartWith("RVC.Stand2S", true))
-		return false;
+	/*if (info.strMachineType.IsStartWith("RVC.Stand2S", true))
+		return false;*/
+	
 
 	if (info.strMachineType.IsStartWith("RPM", true) || info.strMachineType.IsStartWith("RVC.CardStore", true) || info.strMachineType.IsStartWith("RVC.IL", true))		// 回单打印机、简化版
 		return false;

Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp

@@ -784,7 +784,7 @@ ErrorCodeEnum CUpgradeMgrEntity::MD5Folder(CSimpleStringA strFolderPath,bool isD
 					//	Dbg("WhiteFile Filter don't add to md5 list, file = [%s]", strFindName.GetData());
 					//	continue;
 					//}
-					if (!isWhiteFile && !(strFindName.IndexOf(".so")>-1)) {
+					if (!isWhiteFile && !(strFindName.IndexOf(".so")==-1)) {
 						Dbg("WhiteFile Filter don't add to md5 list, file = [%s]", strFindName.GetData());
 						continue;
 					}

Module/mod_accessauth/AccessAuthConn.cpp

@@ -271,7 +271,7 @@ DWORD CAccessAuthConn::HandleReqTokenRet(const CSmartPointer<IPackage> &pRecvPkg
 				sharedSK.Alloc(16);
 				memcpy(sharedSK.m_pData, ret.sharedSK, 16);
 				//@test 
-				/*
+				
 				rc = ((CAccessAuthEntity*)m_pEntity)->SaveTokenAndSharedSK(token, sharedSK);
 				if (rc != Error_Succeed)
 				{
@@ -281,7 +281,7 @@ DWORD CAccessAuthConn::HandleReqTokenRet(const CSmartPointer<IPackage> &pRecvPkg
 					LogWarn(Severity_Middle, Error_Unexpect, ERR_ACCESSAUTH_SAVE_TOKEN,
 						GetOutPutStr("%s%08X", "SaveTokenAndSharedSK", rc).c_str());
 				}
-				*/
+				
 			}
 		}
 		else
@@ -429,10 +429,10 @@ DWORD CAccessAuthConn::SendGetTokenPackage()
 		return rc;
 	//@test 先不保存密钥至tokenkeeper
 	// 保存到令牌管理实体中
-	/*rc = ((CAccessAuthEntity*)m_pEntity)->SaveSM2KeyPair(pubKey, priKey);
+	rc = ((CAccessAuthEntity*)m_pEntity)->SaveSM2KeyPair(pubKey, priKey);
 	if (rc != Error_Succeed)
 		return rc;
-	*/
+	
 
 	// 加密机加密数据的时候，会在数据前加四字节的数据长度，然后作为一个整体加密，
 	// 解密时会先解密，然后取四字节长度后面的数据，比如加密数据 "12345678" 会先加 "0008" 变成"000812345678" 
@@ -532,9 +532,9 @@ DWORD CAccessAuthConn::SendGetTokenPackage()
 	si.EnrolGPS.GetBinaryLatitude(&pInfo->currentGPS[4]);
 	
 	CSimpleStringA ts;
-	//test 
-	//rc = m_pEntity->GetFunction()->GetSysVar("TerminalStage", ts);
-	ts = "A";
+	//@test 
+	rc = m_pEntity->GetFunction()->GetSysVar("TerminalStage", ts);
+	//ts = "A";
 	if (rc != Error_Succeed)
 	{
 		LogWarn(Severity_Middle, Error_Unexpect, ERR_ACCESSAUTH_GET_SYS_VAR,
@@ -546,8 +546,8 @@ DWORD CAccessAuthConn::SendGetTokenPackage()
 
 	CSimpleStringA rs;
 	//@test
-	//rc = m_pEntity->GetFunction()->GetSysVar("RunState", rs);
-	rs = "O";
+	rc = m_pEntity->GetFunction()->GetSysVar("RunState", rs);
+	//rs = "O";
 	if (rc != Error_Succeed)
 	{
 		LogWarn(Severity_Middle, Error_Unexpect, ERR_ACCESSAUTH_GET_SYS_VAR,

Module/mod_accessauth/mod_AccessAuth.cpp

@@ -596,7 +596,7 @@ DWORD CAccessAuthEntity::LoadPinPadWK(bool bSM)
 #endif
 */
 	//@test	
-	return Error_Succeed;
+	//return Error_Succeed;
 
 	Dbg("load sm key to pinpad...");
 	CSimpleString strErrMsg;
@@ -939,11 +939,13 @@ bool CAccessAuthEntity::HasPinPad()
 		return true;
 	}
 	//@test
+	/*
 	if (info.strMachineType.IsStartWith("RVC.Stand2S", true))
 	{
 		Dbg("MachineType[%s], not exist pinpad", info.strMachineType.GetData());
 		return false;
 	}
+	*/
 	if (info.strMachineType.IsStartWith("RPM", true) || info.strMachineType.IsStartWith("RVC.CardStore", true) || info.strMachineType.IsStartWith("RVC.IL", true))		// 쀼데댔丹샙、숌뺏경
 	{
 		Dbg("MachineType[%s], not exist pinpad", info.strMachineType);
@@ -1439,7 +1441,7 @@ int CAccessAuthEntity::GetPinPadIDAndDeviceID(CSimpleStringA &strPinPadID, CSimp
 		return -1;
 	}
 	//@test 
-	if (info.strMachineType.IsStartWith("RVC.Stand2S", true) )	return 0;
+	//if (info.strMachineType.IsStartWith("RVC.Stand2S", true) )	return 0;
 
 	if (info.strMachineType.IsStartWith("RPM", true) || info.strMachineType.IsStartWith("RVC.CardStore", true) || info.strMachineType.IsStartWith("RVC.IL", true))		// 쀼데댔丹샙、숌뺏경
 		return 0;