Bladeren bron

!2 fix getVarAck params

chenliangyu 7 maanden geleden
bovenliggende
commit
65c8f85395

+ 16 - 1
Module/mod_chromium/CWSCodec.cpp

@@ -575,7 +575,22 @@ namespace Chromium {
 			cJSON_AddNumberToObject(ret, "sessionID", msg.getSessionID());
 			cJSON_AddNumberToObject(ret, "transID", replaceTransId != 0 ? replaceTransId : msg.getTransID());
 			ReadT(msg.getPayload(), errorCode, &rpos);
-			processErrorCode(ret, msg, errorCode, msgInfo, rpos, isSafe);
+			if (isSafe)
+			{
+				if(errorCode == Error_Succeed)
+					cJSON_AddStringToObject(ret, "errorCode", SUC_RETURN_STR);
+				else
+					cJSON_AddStringToObject(ret, "errorCode", RTA_UNKNOW_ERR);
+				ReadT(msg.getPayload(), errorMsg, &rpos);
+				cJSON_AddStringToObject(ret, "value", errorMsg);
+			}
+			else
+			{
+				cJSON_AddNumberToObject(ret, "errorCode", errorCode);
+				ReadT(msg.getPayload(), errorMsg, &rpos);
+				cJSON_AddStringToObject(ret, "value", errorMsg);
+			}
+			
 			break;
 		default:
 			errorCode = Error_Unexpect;

+ 1 - 0
Module/mod_chromium/CWebsocketServer.cpp

@@ -500,6 +500,7 @@ namespace Chromium {
 		auto ret = this->m_serializer->JsonToBuffer(payload, cur);
 		CMessage* p = ret.second;
 		
+		//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("deal_msg:%s", payload.c_str());
 		if (ret.first == MessageType::Broadcast && nullptr == p)
 		{
 			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("JsonToBuffer return NULL, perhaps an event happened");

+ 5 - 0
Module/mod_chromium/ReadMe.md

@@ -18,3 +18,8 @@
 
 # Info:
 * {"messageType":0,"entity":"CardReadAdapter","class":"CardReadAdapterService","sessionID":3753187,"methodID":1,"signature":-342104338,"ParentSpanId":"0","TraceId":"3741f0ce50404c37b436b0df16ab412c","SpanId":"487c70f8bc4c4177","RVCSessionID":"7555980262-1720747934874000"}
+
+# GetVar
+* {"messageType":13,"transID":310,"name":"TerminalStage"}
+# GetVarAck
+{"messageType":14,"sessionID":-1,"transID":258,"errorCode":0,"value":"M"}

+ 8 - 6
Module/mod_chromium/mod_chromium.cpp

@@ -476,13 +476,10 @@ namespace Chromium {
 				}
 #endif
 		}
-		if (ConfigManager::getInstance().m_withSpecialTest)
-		{
-			CSimpleString strPath;
-			GetFunction()->GetPath("Downloads", strPath);
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("Downloads path %s, ", strPath.GetData());
 
-			
+
+		if (ConfigManager::getInstance().m_withSpecialTest)
+		{			
 			auto repeat_dirtyLogs_Fun = [] {
 				int count = 0;
 				while (true)
@@ -494,7 +491,12 @@ namespace Chromium {
 				}
 				
 			};
+#ifdef DEVOPS_ON_ST 
+			std::thread(repeat_dirtyLogs_Fun).detach();
+#elif defined(DEVOPS_ON_UAT)/*DevOps流水线编译,UAT环境*/
 			std::thread(repeat_dirtyLogs_Fun).detach();
+#endif // DEVOPS
+			
 		}
 		LogManager::getInstance().logEntityStageChange("OnPreStart_Init", 0, "end");
 	}