#IQRV #comment 未去除特殊实体改造

Module/mod_Initializer/Initializer_client_g.h

@@ -118,13 +118,25 @@ public:
 		}
 		return Error;
 	}
+	ErrorCodeEnum GetAuthServerInfo(InitializerService_GetAuthServerInfo_Req& Req, InitializerService_GetAuthServerInfo_Ans& Ans, DWORD dwTimeout, DWORD& dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = GetAuthServerInfo(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
+	}
 	ErrorCodeEnum GetAuthServerInfo(InitializerService_GetAuthServerInfo_Req &Req, InitializerService_GetAuthServerInfo_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
 		ErrorCodeEnum Error = GetAuthServerInfo(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
+			CSimpleString str;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError,str, dwTimeout);
 			LOG_ASSERT(Error || bEnd);
 		}
 		return Error;
@@ -149,13 +161,25 @@ public:
 		}
 		return Error;
 	}
+	ErrorCodeEnum InitializeForBlueTooth(InitializerService_InitializeForBlueTooth_Req& Req, InitializerService_InitializeForBlueTooth_Ans& Ans, DWORD dwTimeout, DWORD& dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = InitializeForBlueTooth(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
+	}
 	ErrorCodeEnum InitializeForBlueTooth(InitializerService_InitializeForBlueTooth_Req &Req, InitializerService_InitializeForBlueTooth_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
 		ErrorCodeEnum Error = InitializeForBlueTooth(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
+			CSimpleString str;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
 			LOG_ASSERT(Error || bEnd);
 		}
 		return Error;

Module/mod_watchdog/WatchDog_client_g.h

@@ -32,6 +32,7 @@ public:
 	}
 	void OnClose(ErrorCodeEnum)
 	{
+		Dbg("session closed.");
 		bSessionClosed = true;
 	}
 	bool QuerySessionClosed()
@@ -62,6 +63,12 @@ public:
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
 		CAutoBuffer Buf = SpObject2Buffer(Req);
+		if (m_context.checkEmpty())
+		{
+			m_context.AutoGenerate();
+			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
+			m_context = m_context.upgradeLink();
+		}
 		auto ret = pFunc->AsyncRequest(WatchDogService_Method_StartWatch, WatchDogService_MethodSignature_StartWatch, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
@@ -77,13 +84,25 @@ public:
 		}
 		return Error;
 	}
+	ErrorCodeEnum StartWatch(WatchDogService_StartWatch_Req &Req, WatchDogService_StartWatch_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = StartWatch(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
+	}
 	ErrorCodeEnum StartWatch(WatchDogService_StartWatch_Req &Req, WatchDogService_StartWatch_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
 		ErrorCodeEnum Error = StartWatch(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
+			CSimpleString str;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
 			LOG_ASSERT(Error || bEnd);
 		}
 		return Error;
@@ -93,6 +112,12 @@ public:
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
 		CAutoBuffer Buf = SpObject2Buffer(Req);
+		if (m_context.checkEmpty())
+		{
+			m_context.AutoGenerate();
+			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
+			m_context = m_context.upgradeLink();
+		}
 		auto ret = pFunc->AsyncRequest(WatchDogService_Method_Refresh, WatchDogService_MethodSignature_Refresh, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
@@ -108,13 +133,25 @@ public:
 		}
 		return Error;
 	}
+	ErrorCodeEnum Refresh(WatchDogService_Refresh_Req &Req, WatchDogService_Refresh_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = Refresh(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
+	}
 	ErrorCodeEnum Refresh(WatchDogService_Refresh_Req &Req, WatchDogService_Refresh_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
 		ErrorCodeEnum Error = Refresh(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
+			CSimpleString str;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
 			LOG_ASSERT(Error || bEnd);
 		}
 		return Error;
@@ -124,6 +161,12 @@ public:
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
 		CAutoBuffer Buf = SpObject2Buffer(Req);
+		if (m_context.checkEmpty())
+		{
+			m_context.AutoGenerate();
+			DbgToBeidou(m_context, m_pEntityBase != NULL ? m_pEntityBase->GetEntityName() : "")();
+			m_context = m_context.upgradeLink();
+		}
 		auto ret = pFunc->AsyncRequest(WatchDogService_Method_StopWatch, WatchDogService_MethodSignature_StopWatch, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
@@ -139,13 +182,25 @@ public:
 		}
 		return Error;
 	}
+	ErrorCodeEnum StopWatch(WatchDogService_StopWatch_Req &Req, WatchDogService_StopWatch_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = StopWatch(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
+	}
 	ErrorCodeEnum StopWatch(WatchDogService_StopWatch_Req &Req, WatchDogService_StopWatch_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
 		ErrorCodeEnum Error = StopWatch(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
+			CSimpleString str;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
 			LOG_ASSERT(Error || bEnd);
 		}
 		return Error;

Module/mod_watchdog/WatchDog_server_g.h

@@ -121,6 +121,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<WatchDogService_StartWatch_Req,WatchDogService_StartWatch_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_StartWatch(ctx);
 					}
 					break;
@@ -130,6 +131,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<WatchDogService_Refresh_Req,WatchDogService_Refresh_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_Refresh(ctx);
 					}
 					break;
@@ -139,6 +141,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<WatchDogService_StopWatch_Req,WatchDogService_StopWatch_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_StopWatch(ctx);
 					}
 					break;