Z991239-4792 #comment 修复spgen头文件问题

Module/mod_counterconnector/CounterConnector_client_g.h

@@ -210,6 +210,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(ConnectService_Method_GetCallRouteType, ConnectService_MethodSignature_GetCallRouteType, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
@@ -225,13 +231,25 @@ public:
 		}
 		return Error;
 	}
+	ErrorCodeEnum GetCallRouteType(ConnectService_GetCallRouteType_Req &Req, ConnectService_GetCallRouteType_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = GetCallRouteType(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 GetCallRouteType(ConnectService_GetCallRouteType_Req &Req, ConnectService_GetCallRouteType_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
 		ErrorCodeEnum Error = GetCallRouteType(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;
@@ -241,6 +259,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(ConnectService_Method_SetVideoCallRouteParams, ConnectService_MethodSignature_SetVideoCallRouteParams, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
@@ -256,13 +280,25 @@ public:
 		}
 		return Error;
 	}
+	ErrorCodeEnum SetVideoCallRouteParams(ConnectService_SetVideoCallRouteParams_Req &Req, ConnectService_SetVideoCallRouteParams_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = SetVideoCallRouteParams(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 SetVideoCallRouteParams(ConnectService_SetVideoCallRouteParams_Req &Req, ConnectService_SetVideoCallRouteParams_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
 		ErrorCodeEnum Error = SetVideoCallRouteParams(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_counterconnector/CounterConnector_def_g.h

@@ -33,7 +33,6 @@ namespace CounterConnector {
 #define ConnectService_MethodSignature_GetCallRouteType 1911492577
 #define ConnectService_MethodSignature_SetVideoCallRouteParams -240588169
 
-
 struct ConnectService_StartCall_Req
 {
 	int callingtype;

Module/mod_counterconnector/CounterConnector_server_g.h

@@ -185,6 +185,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<ConnectService_GetCallRouteType_Req,ConnectService_GetCallRouteType_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_GetCallRouteType(ctx);
 					}
 					break;
@@ -194,6 +195,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<ConnectService_SetVideoCallRouteParams_Req,ConnectService_SetVideoCallRouteParams_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_SetVideoCallRouteParams(ctx);
 					}
 					break;

Module/mod_healthmanager/HealthManager_client_g.h

@@ -401,10 +401,17 @@ public:
 		}
 		return Error;
 	}
+
 	ErrorCodeEnum GetAuthErrMsg(HealthManagerService_GetAuthErrMsg_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		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(HealthManagerService_Method_GetAuthErrMsg, HealthManagerService_MethodSignature_GetAuthErrMsg, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
@@ -420,17 +427,30 @@ public:
 		}
 		return Error;
 	}
+	ErrorCodeEnum GetAuthErrMsg(HealthManagerService_GetAuthErrMsg_Req &Req, HealthManagerService_GetAuthErrMsg_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = GetAuthErrMsg(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 GetAuthErrMsg(HealthManagerService_GetAuthErrMsg_Req &Req, HealthManagerService_GetAuthErrMsg_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
 		ErrorCodeEnum Error = GetAuthErrMsg(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;
 	}
+
 	ErrorCodeEnum ControlTerminalLife(HealthManagerService_ControlTerminalLife_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();

Module/mod_healthmanager/HealthManager_server_g.h

@@ -113,7 +113,7 @@ public:
 			} else {
 				Error = Error_MethodSignatureFailed;
 			}
-			break;			
+			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -184,7 +184,7 @@ public:
 			if (dwSignature != HealthManagerService_MethodSignature_Gateway) {
 				Error = Error_MethodSignatureFailed;
 			}
-			break;			
+			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -231,6 +231,7 @@ public:
 	{
 	/// override by user
 	}
+
 	virtual void Handle_ControlTerminalLife(SpReqAnsContext<HealthManagerService_ControlTerminalLife_Req, HealthManagerService_ControlTerminalLife_Ans>::Pointer ctx)
 	{
 	/// override by user
@@ -343,6 +344,7 @@ public:
 						ctx.Attach(new SpReqAnsContext<HealthManagerService_GetAuthErrMsg_Req,HealthManagerService_GetAuthErrMsg_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
+						EntityResource::setLink(ctx->link);
 						Handle_GetAuthErrMsg(ctx);
 					}
 					break;
@@ -385,7 +387,7 @@ public:
 						EntityResource::setLink(ctx->link);
 						Handle_Gateway(ctx);
 					}
-					break;					
+					break;
 				default:
 					assert(0);
 					break;