Browse Source

!10130 准入信息脱敏
Merge pull request !10130 from 80310970/uos_newUpdateWK_1205

杨诗友80174847 1 year ago
parent
commit
be36a3da8e
2 changed files with 18 additions and 19 deletions
  1. 2 2
      Module/mod_accessauth/AccessAuthFSM.cpp
  2. 16 17
      Module/mod_accessauth/AccessAuthFSM.h

+ 2 - 2
Module/mod_accessauth/AccessAuthFSM.cpp

@@ -463,12 +463,12 @@ struct UpdateWKTask : ITaskSp
 				return;
 			}
 			SP::Module::Restful::ExtractDataFromDebranchResponse(result.content, updateWKAns);
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("tmk=%s %d", updateWKAns.tmk.c_str(), updateWKAns.tmk.size());
+			/*DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("tmk=%s %d", updateWKAns.tmk.c_str(), updateWKAns.tmk.size());
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("tpk=%s %d", updateWKAns.tpk.c_str(), updateWKAns.tpk.size());
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("edk=%s %d", updateWKAns.edk.c_str(), updateWKAns.edk.size());
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("tpkKeyCheck=%s %d", updateWKAns.tpkKeyCheck.c_str(), updateWKAns.tpkKeyCheck.size());
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("edkKeyCheck=%s %d", updateWKAns.edkKeyCheck.c_str(), updateWKAns.edkKeyCheck.size());
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("index=%s %d", updateWKAns.keyIndex.c_str(), updateWKAns.keyIndex.size());
+			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("index=%s %d", updateWKAns.keyIndex.c_str(), updateWKAns.keyIndex.size());*/
 
 			DWORD rc = m_entity->LoadKeysToPinPadACS(tmkpair.second, updateWKAns.tpk, updateWKAns.edk, updateWKAns.keyIndex);
 			if (rc == Error_Succeed) {

+ 16 - 17
Module/mod_accessauth/AccessAuthFSM.h

@@ -38,8 +38,8 @@ typedef struct CSessionkeySynReq : CHTTPReq {
 		Json::FastWriter writer;
 		string strData = writer.write(value);
 
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CSessionkeySynReq")
-			("req=%s at CSessionkeySynReq", strData.c_str());
+		/*DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CSessionkeySynReq")
+			("req=%s at CSessionkeySynReq", strData.c_str());*/
 
 		return strData;
 	}
@@ -51,8 +51,8 @@ typedef struct CSessionkeySynRet : CHTTPRet {
 		string sessionKey;
 	} data;
 	bool Parse(string strData) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CSessionkeySynRet")
-			("ret=%s at CSessionkeySynRet", strData.c_str());
+		/*DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CSessionkeySynRet")
+			("ret=%s at CSessionkeySynRet", strData.c_str());*/
 
 		Json::Value root;
 		Json::Reader reader;
@@ -79,8 +79,8 @@ typedef struct CAccessAuthUpdateWKReq : CHTTPReq {
 		value[REFLECTION(keyIndex)] = keyIndex;
 		Json::FastWriter writer;
 		string strData = writer.write(value);
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CAccessAuthUpdateWKReq")
-			("req=%s at CAccessAuthUpdateWKReq", strData.c_str());
+		/*DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CAccessAuthUpdateWKReq")
+			("req=%s at CAccessAuthUpdateWKReq", strData.c_str());*/
 
 		return strData;
 	}
@@ -134,8 +134,8 @@ public:
 
 		Json::FastWriter writer;
 		string strData = writer.write(value);
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CAccessAuthGetTokenReq")
-			("req=%s at CAccessAuthGetTokenReq", strData.c_str());
+		/*DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CAccessAuthGetTokenReq")
+			("req=%s at CAccessAuthGetTokenReq", strData.c_str());*/
 
 		return strData;
 #else
@@ -152,8 +152,8 @@ public:
 		char* tmp = rvcJson.GetJsonStr();
 		ret.assign(tmp);
 		delete tmp;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CAccessAuthGetTokenReq")
-			("req=%s at CAccessAuthGetTokenReq", ret.c_str());
+		/*DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CAccessAuthGetTokenReq")
+			("req=%s at CAccessAuthGetTokenReq", ret.c_str());*/
 		return ret;
 #endif // RVC_OS_WIN
 	}
@@ -193,7 +193,7 @@ typedef struct CAccessAuthGetTokenRet : CHTTPRet {
 
 		return true;
 #else
-		Dbg("ret=%s at CAccessAuthGetTokenRet", strData.c_str());
+		//Dbg("ret=%s at CAccessAuthGetTokenRet", strData.c_str());
 		if (m_userCode.compare(ACS_SUCCESS)) return true;
 		RVCJson rvcJson;
 		rvcJson.SetJson(strData.c_str());
@@ -219,7 +219,6 @@ typedef struct CAccessAuthGetTokenRet : CHTTPRet {
 		delete dataJson;
 
 		rvcJson.Destory();
-		Dbg("leave CAccessAuthGetTokenRet.");
 		return true;
 #endif // RVC_OS_WIN
 	}
@@ -281,7 +280,7 @@ typedef struct CInitlizerMKReq : CHTTPReq {
 		Json::FastWriter writer;
 		string strData = writer.write(value);
 
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CInitlizerMKReq")("CInitlizerMKReq:%s", strData.c_str());
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CInitlizerMKReq")("CInitlizerMKReq:%s", strData.c_str());
 
 		return strData;
 #else
@@ -314,7 +313,7 @@ typedef struct CInitlizerMKReq : CHTTPReq {
 		char* tmp = rvcJson.GetJsonStr();
 		ret.assign(tmp);
 		delete tmp;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CInitlizerMKReq")("req=%s at CInitlizerMKReq", ret.c_str());
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CInitlizerMKReq")("req=%s at CInitlizerMKReq", ret.c_str());
 		rvcJson.Destory();
 		return ret;
 #endif // RVC_OS_WIN
@@ -330,7 +329,7 @@ typedef struct CInitlizerMKRet : CHTTPRet {
 	string keyIndex;
 
 	bool Parse(string strData) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CInitlizerMKRet")("ret=%s at CInitlizerMKRet", strData.c_str());
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI("CInitlizerMKRet")("ret=%s at CInitlizerMKRet", strData.c_str());
 
 		Json::Value root;
 		Json::Reader reader;
@@ -353,7 +352,7 @@ typedef struct CInitlizerMKRet : CHTTPRet {
 		string reserved;
 	} data;
 	bool Parse(string strData) {
-		Dbg("ret=%s at CInitlizerMKRet", strData.c_str());
+		//Dbg("ret=%s at CInitlizerMKRet", strData.c_str());
 		if (m_userCode.compare(ACS_SUCCESS)) return true;
 		RVCJson rvcJson;
 		rvcJson.SetJson((char*)strData.c_str());
@@ -391,7 +390,7 @@ typedef struct CAccessAuthInitDeviceReq : CHTTPReq {
 
 		Json::FastWriter writer;
 		string strData = writer.write(value);
-		Dbg("CAccessAuthInitDeviceReq:%s", strData.c_str());
+		//Dbg("CAccessAuthInitDeviceReq:%s", strData.c_str());
 		return strData;
 }
 } CAccessAuthInitDeviceReq;