فهرست منبع

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

雷志明80280620 5 سال پیش
والد
کامیت
575536e822
2فایلهای تغییر یافته به همراه5 افزوده شده و 6 حذف شده
  1. 2 2
      Module/mod_Initializer/mod_Initializer.cpp
  2. 3 4
      Module/mod_accessauth/mod_AccessAuth.cpp

+ 2 - 2
Module/mod_Initializer/mod_Initializer.cpp

@@ -2291,7 +2291,7 @@ bool CInitializerEntity::GetTerminalPublicKey(BYTE *pBuf, int &nBufLen)
 		Dbg("GetPath runinfo error=%d.",rc);
 		return false;
 	}
-	runInfoPath += "\\runcfg\\";
+	runInfoPath += SPLIT_SLASH_STR "runcfg" SPLIT_SLASH_STR;
 	/*if (!boost::filesystem::exists(runInfoPath.GetData())) {
 		boost::filesystem::create_directories(runInfoPath.GetData());
 	}*/
@@ -2688,7 +2688,7 @@ bool CInitializerEntity::GetAccessauthIsFirst()
 		Dbg("GetPath runinfo error=%d.", rc);
 		return false;
 	}
-	runInfoPath += "\\runcfg\\AccessAuthorization.ini";
+	runInfoPath += SPLIT_SLASH_STR "runcfg" SPLIT_SLASH_STR "AccessAuthorization.ini";
 
 	//char isFirst[BUF_SIZE] = { 0 };
 	//GetPrivateProfileString("SM", "IsFirst", "", isFirst, BUF_SIZE, runInfoPath.GetData());

+ 3 - 4
Module/mod_accessauth/mod_AccessAuth.cpp

@@ -1071,12 +1071,11 @@ bool CAccessAuthEntity::SaveAuthVerAndKey(int nAuthVer, BYTE *pKey)
 		}
 		
 		char privateKey[BUF_SIZE] = { 0 };
+        runInfoPath += SPLIT_SLASH_STR "runcfg" SPLIT_SLASH_STR "Initializer.ini";
 #ifdef RVC_OS_WIN
-		runInfoPath += "\\runcfg\\Initializer.ini";
 		GetPrivateProfileString("TerminalPD", "PrivateKey", "", privateKey, BUF_SIZE, runInfoPath.GetData());
 #else
-		runInfoPath += "/runcfg/Initializer.ini";
-		Dbg("·¾¶ex£º%s", runInfoPath.GetData());
+		Dbg("path ex£º%s", runInfoPath.GetData());
 		char* tmp = inifile_read_str(runInfoPath.GetData(),"TerminalPD", "PrivateKey", "");
 		strcpy(privateKey, tmp);
 		delete tmp;
@@ -1394,7 +1393,7 @@ bool CAccessAuthEntity::GetTerminalPublicKey(BYTE *pBuf, int &nBufLen)
 		Dbg("GetPath runinfo error=%d.", rc);
 		return false;
 	}
-	runInfoPath += "\\runcfg\\Initializer.ini";
+	runInfoPath += SPLIT_SLASH_STR "runcfg" SPLIT_SLASH_STR "Initializer.ini";
 	char publicKey[BUF_SIZE] = { 0 };
 	
 #ifdef RVC_OS_WIN