#IQRV #comment [BugFix][Initializer] 初始化格式错乱调整

Module/mod_Initializer/InitializerConn.cpp

@@ -536,15 +536,15 @@ DWORD CInitializerConn::HandleInitMKRet(const CSmartPointer<IPackage> &pRecvPkg)
 			if (rc != Error_Succeed)
 			{
 				strRetErrMsg = "加载SM密钥到密码键盘失败";
-				LogWarn(Severity_Middle, (ErrorCodeEnum)rc, ERR_INITIALIZER_LOAD_KEYS_TO_PINPAD,
-					GetOutPutStr("%s%08X%s%s", "LoadKeysToPinPad", rc, "strRetErrMsg", strRetErrMsg).c_str());
-
                 CEntityLastErrorInfo lastInfo;
                 pEntity->GetFunction()->GetEntityLastError("PinPad", lastInfo);
-				if (!lastInfo.strErrMsg.IsNullOrEmpty()) {
-					strRetErrMsg += ": ";
-					strRetErrMsg += lastInfo.strErrMsg;
-				}
+                if (!lastInfo.strErrMsg.IsNullOrEmpty()) {
+                    strRetErrMsg += ": ";
+                    strRetErrMsg += lastInfo.strErrMsg;
+                }
+
+				LogWarn(Severity_Middle, (ErrorCodeEnum)rc, ERR_INITIALIZER_LOAD_KEYS_TO_PINPAD,
+					GetOutPutStr("%s%08X%s%s", "LoadKeysToPinPad", rc, "strRetErrMsg", strRetErrMsg.GetData()).c_str());
 			}
 		}
 	}

Module/mod_Initializer/mod_Initializer.cpp

@@ -939,22 +939,17 @@ void CInitializerEntity::EndGetKMCKey(DWORD rc, const char* pszErrMsg) {
 DWORD CInitializerEntity::ReportInitMKState(const char *pszUserID, DWORD dwErrCode, const char *pszErrMsg)
 {
 	LOG_FUNCTION();
-	auto rc = SecureClientConnect();
-	if (rc != Error_Succeed)
-	{
-		LogWarn(Severity_Middle, Error_Unexpect, ERR_INITIALIZER_NET_CONNECT,
-					GetOutPutStr("%s%08X", "SecureClientConnect", rc).c_str());
-		return rc;
-	}
-	assert(m_pConnection->IsConnectionOK());
-	if (m_bACS)
-	{
-		std::string errStr = SP::Utility::UTF8ToGBK(std::string(pszErrMsg));
-		return m_pConnection->SendReportStatePackage("InitMK", pszUserID, dwErrCode, errStr.c_str());
-	}
-	else
-	{
-		return m_pConnection->SendReportStatePackage("InitMK", pszUserID, dwErrCode, pszErrMsg);
+
+	if (!m_bACS) {
+        auto rc = SecureClientConnect();
+        if (rc != Error_Succeed) {
+            LogWarn(Severity_Middle, Error_Unexpect, ERR_INITIALIZER_NET_CONNECT,
+                    GetOutPutStr("%s%08X", "SecureClientConnect", rc).c_str());
+            return rc;
+        }
+        assert(m_pConnection->IsConnectionOK());
+        std::string errStr = SP::Utility::UTF8ToGBK(std::string(pszErrMsg));
+        return m_pConnection->SendReportStatePackage("InitMK", pszUserID, dwErrCode, errStr.c_str());
 	}
 }
 
@@ -997,6 +992,7 @@ void CInitializerEntity::EndInitMK(DWORD rc, const char *pszErrMsg)
 
 	// 通知到中台
 	ReportInitMKState(m_strInitUserID, rc, m_strLastErrMsg);
+
 	if (rc != Error_Succeed)
 	{
 		LogWarn(Severity_Middle, Error_Unexpect, ERR_INITIALIZER_INIT_MK,