Эх сурвалжийг харах

#IQRV #comment [BugFix][Module] 准入内容乱码

gifur 4 жил өмнө
parent
commit
a240101292

+ 11 - 0
Module/mod_accessauth/mod_AccessAuth.cpp

@@ -7,6 +7,7 @@
 #include <fileutil.h>
 #include <iniutil.h>
 #include <cmath>
+#include "SpUtility.h"
 #include "TokenKeeper_client_g.h"
 using namespace TokenKeeper;
 
@@ -936,6 +937,16 @@ bool CAccessAuthEntity::GetTerminalPublicKey(BYTE *pBuf, int &nBufLen)
 	return true;
 }
 
+void CAccessAuthEntity::SetAuthErrMsg(const char* pszErrMsg)
+{
+#if defined(RVC_OS_WIN)
+    m_strAuthErrMsg = pszErrMsg;
+#else
+    std::string str = SP::Utility::GBK2UTF8(pszErrMsg);
+    m_strAuthErrMsg = str.c_str();
+#endif //RVC_OS_WIN
+}
+
 DWORD CAccessAuthEntity::InitDevice(SpReqAnsContext<AccessAuthService_InitDev_Req, AccessAuthService_InitDev_Ans>::Pointer &ctx)
 {
 	return m_FSM.InitDevice(ctx);

+ 1 - 1
Module/mod_accessauth/mod_AccessAuth.h

@@ -116,7 +116,7 @@ public:
 	
 	DWORD InitDevice(SpReqAnsContext<AccessAuthService_InitDev_Req, AccessAuthService_InitDev_Ans>::Pointer &ctx);
 
-	void SetAuthErrMsg(const char *pszErrMsg) { m_strAuthErrMsg = pszErrMsg; }
+	void SetAuthErrMsg(const char* pszErrMsg);
 	const char *GetAuthErrMsg() { return m_strAuthErrMsg; }
 
 	// 获取密码键盘ID和外设ID