Z991239-6383 #comment feat: 下线升级旧接口

Signed-Off-By: commit-hook

Module/mod_UpgradeMgr/UpgradeManager_msg_g.h

@@ -10,11 +10,9 @@
 
 namespace UpgradeManager {
 #define eMsg_UpgradeStateEvent 0
-#define eMsg_ManualTaskEvent 1
 #define eMsg_UpgradeDownloadProgress 2
 
 #define eMsgSig_UpgradeStateEvent -1650087685
-#define eMsgSig_ManualTaskEvent 1253338878
 #define eMsgSig_UpgradeDownloadProgress -498820347
 
 struct UpgradeStateEvent
@@ -35,19 +33,6 @@ struct UpgradeStateEvent
 
 ///////////////////////////
 
-struct ManualTaskEvent
-{
-	int nTaskNum;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & nTaskNum;
-	}
-
-};
-
-///////////////////////////
-
 struct UpgradeDownloadProgress
 {
 	CSimpleStringA currentFile;

Module/mod_UpgradeMgr/UpgradeManager_server_g.h

@@ -37,20 +37,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UpgradeMgrService_Method_RegistLocalPack:
-			if (dwSignature == UpgradeMgrService_MethodSignature_RegistLocalPack) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_CancelUpdate:
-			if (dwSignature == UpgradeMgrService_MethodSignature_CancelUpdate) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case UpgradeMgrService_Method_RollbackUpdate:
 			if (dwSignature == UpgradeMgrService_MethodSignature_RollbackUpdate) {
 				bOverlap = true;
@@ -58,27 +44,6 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UpgradeMgrService_Method_SwitchUpgrade:
-			if (dwSignature == UpgradeMgrService_MethodSignature_SwitchUpgrade) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_RegistManualPack:
-			if (dwSignature == UpgradeMgrService_MethodSignature_RegistManualPack) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_GetManualPacks:
-			if (dwSignature == UpgradeMgrService_MethodSignature_GetManualPacks) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -95,36 +60,11 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UpgradeMgrService_Method_RegistLocalPack:
-			if (dwSignature != UpgradeMgrService_MethodSignature_RegistLocalPack) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_CancelUpdate:
-			if (dwSignature != UpgradeMgrService_MethodSignature_CancelUpdate) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		case UpgradeMgrService_Method_RollbackUpdate:
 			if (dwSignature != UpgradeMgrService_MethodSignature_RollbackUpdate) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case UpgradeMgrService_Method_SwitchUpgrade:
-			if (dwSignature != UpgradeMgrService_MethodSignature_SwitchUpgrade) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_RegistManualPack:
-			if (dwSignature != UpgradeMgrService_MethodSignature_RegistManualPack) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case UpgradeMgrService_Method_GetManualPacks:
-			if (dwSignature != UpgradeMgrService_MethodSignature_GetManualPacks) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -137,36 +77,11 @@ public:
 	/// override by user
 	}
 
-	virtual void Handle_RegistLocalPack(SpReqAnsContext<UpgradeMgrService_RegistLocalPack_Req, UpgradeMgrService_RegistLocalPack_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_CancelUpdate(SpReqAnsContext<UpgradeMgrService_CancelUpdate_Req, UpgradeMgrService_CancelUpdate_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void Handle_RollbackUpdate(SpReqAnsContext<UpgradeMgrService_RollbackUpdate_Req, UpgradeMgrService_RollbackUpdate_Ans>::Pointer ctx)
 	{
 	/// override by user
 	}
 
-	virtual void Handle_SwitchUpgrade(SpReqAnsContext<UpgradeMgrService_SwitchUpgrade_Req, UpgradeMgrService_SwitchUpgrade_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_RegistManualPack(SpReqAnsContext<UpgradeMgrService_RegistManualPack_Req, UpgradeMgrService_RegistManualPack_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_GetManualPacks(SpReqAnsContext<UpgradeMgrService_GetManualPacks_Req, UpgradeMgrService_GetManualPacks_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
 	virtual void OnRequest(CSmartPointer<ITransactionContext> pTransactionContext)
 	{
 		CAutoBuffer Buf;
@@ -193,26 +108,6 @@ public:
 						Handle_GetUpgradeState(ctx);
 					}
 					break;
-				case UpgradeMgrService_Method_RegistLocalPack:
-					{
-						SpReqAnsContext<UpgradeMgrService_RegistLocalPack_Req,UpgradeMgrService_RegistLocalPack_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_RegistLocalPack_Req,UpgradeMgrService_RegistLocalPack_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_RegistLocalPack(ctx);
-					}
-					break;
-				case UpgradeMgrService_Method_CancelUpdate:
-					{
-						SpReqAnsContext<UpgradeMgrService_CancelUpdate_Req,UpgradeMgrService_CancelUpdate_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_CancelUpdate_Req,UpgradeMgrService_CancelUpdate_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_CancelUpdate(ctx);
-					}
-					break;
 				case UpgradeMgrService_Method_RollbackUpdate:
 					{
 						SpReqAnsContext<UpgradeMgrService_RollbackUpdate_Req,UpgradeMgrService_RollbackUpdate_Ans>::Pointer ctx;
@@ -223,36 +118,6 @@ public:
 						Handle_RollbackUpdate(ctx);
 					}
 					break;
-				case UpgradeMgrService_Method_SwitchUpgrade:
-					{
-						SpReqAnsContext<UpgradeMgrService_SwitchUpgrade_Req,UpgradeMgrService_SwitchUpgrade_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_SwitchUpgrade_Req,UpgradeMgrService_SwitchUpgrade_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_SwitchUpgrade(ctx);
-					}
-					break;
-				case UpgradeMgrService_Method_RegistManualPack:
-					{
-						SpReqAnsContext<UpgradeMgrService_RegistManualPack_Req,UpgradeMgrService_RegistManualPack_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_RegistManualPack_Req,UpgradeMgrService_RegistManualPack_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_RegistManualPack(ctx);
-					}
-					break;
-				case UpgradeMgrService_Method_GetManualPacks:
-					{
-						SpReqAnsContext<UpgradeMgrService_GetManualPacks_Req,UpgradeMgrService_GetManualPacks_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<UpgradeMgrService_GetManualPacks_Req,UpgradeMgrService_GetManualPacks_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
-						Handle_GetManualPacks(ctx);
-					}
-					break;
 				default:
 					assert(0);
 					break;