소스 검색

Z991239-4797 #comment feat: 接口同步

陈纪林80310970 2 년 전
부모
커밋
5d3200a87a

+ 37 - 109
Module/mod_CenterSetting/CenterSettingService.xml

@@ -1,114 +1,42 @@
 <?xml version="1.0" encoding="gb2312" ?>
 <entity name="CenterSetting">
 	<class name="CenterSettingService" overlap="true" exclusive="false">
-    <twoway name="Download" overlap="true">
-      <req>
-        <param name="strAddr" type="string"/>
-        <param name="nPort" type="int"/>
-      </req>
+		<twoway name="Downloadv2" overlap="true">
+			<req>
+				<param name="reqCenterConfigUrl" type="string"/>
+			</req>
+			<res>
+				<param name="downloadStat" type="int"/>
+				<param name="strErrMsg" type="string"/>
+				<param name="retCenterConfigUrl" type="string"/>
+				<param name="HostUrl" type="string"/>
+			</res>
 		</twoway>
-    <twoway name="GetSyncInfo" overlap="true">
-      <res>
-        <param name="nSyncTime" type="uint"/>
-        <param name="strFileName" type="string"/>
-        <param name="strFileHash" type="string"/>
-      </res>
-    </twoway>
-    <twoway name="EditWebUrl" overlap="true">
-      <req>
-        <!--0:invalid;1:new;2:delete;3:update-->
-        <param name="operation" type="int"/>
-        <param name="index" type="int"/>
-        <param name="futureUrl" type="string"/>
-        <param name="adUrl" type="string"/>
-        <param name="remark" type="string"/>
-        <param name="env" type="int"/>
-        <param name="setDefault" type="bool"/>
-      </req>
-      <res>
-        <param name="result" type="int"/>
-        <param name="addition" type="int"/>
-        <param name="msg" type="string"/>
-      </res>
-    </twoway>
-    <twoway name="GetWebUrlList" overlap="true">
-      <req>
-        <param name="filter1" type="int"/>
-        <param name="filter2" type="int"/>
-        <param name="filter3" type="int"/>
-        <param name="filter4" type="string"/>
-      </req>
-      <res>
-        <param name="index" type="array_int"/>
-        <param name="futureUrl" type="array_string"/>
-        <param name="adUrl" type="array_string"/>
-        <param name="remark" type="array_string"/>
-        <!--1:DEV;2:ST;3:UAT-->
-        <param name="env" type="array_int"/>
-        <!--0:default;1:custom-->
-        <param name="type" type="array_int"/>
-        <!--0:backup;3:invalid;1:current apply;2:current using-->
-        <param name="status" type="array_int"/>
-      </res>
-    </twoway>
-    <twoway name="GetActiveCustomUrl" overlap="true">
-      <res>
-        <param name="fultureUrl" type="string"/>
-        <param name="adUrl" type="string"/>
-      </res>
-    </twoway>
-    <twoway name="EditTerminalBackupInfo" overlap="true">
-      <req>
-        <!--0:invalid;1:new;2:delete;3:update-->
-        <param name="operation" type="int"/>
-        <param name="index" type="int"/>
-        <param name="terminalNo" type="string"/>
-        <param name="branchIP" type="string"/>
-        <param name="remark" type="string"/>
-        <param name="env" type="int"/>
-        <param name="setDefault" type="bool"/>
-      </req>
-      <res>
-        <param name="result" type="int"/>
-        <param name="addition" type="int"/>
-        <param name="msg" type="string"/>
-      </res>
-    </twoway>
-    <twoway name="GetTerminalBackupInfoList" overlap="true">
-      <req>
-        <param name="filter1" type="int"/>
-        <param name="filter2" type="int"/>
-        <param name="filter3" type="int"/>
-        <param name="filter4" type="string"/>
-      </req>
-      <res>
-        <param name="index" type="array_int"/>
-        <param name="terminalNo" type="array_string"/>
-        <param name="branchIP" type="array_string"/>
-        <param name="remark" type="array_string"/>
-        <!--1:DEV;2:ST;3:UAT-->
-        <param name="env" type="array_int"/>
-        <!--0:backup;3:invalid;1:current apply;2:current using-->
-        <param name="status" type="array_int"/>
-      </res>
-    </twoway>
-    <twoway name="DownloadCenterFiles" overlap="true">
-      <req>
-        <param name="operation" type="int"/>
-        <param name="strAddr" type="string"/>
-        <param name="nPort" type="int"/>
-        <param name="deleteIfExist" type="bool"/>
-        <param name="additional1" type="string"/>
-        <param name="additional2" type="string"/>
-        <param name="additional3" type="string"/>
-        <param name="additional4" type="string"/>
-        <param name="reserved1" type="int"/>
-        <param name="reserved2" type="int"/>
-      </req>
-      <res>
-        <param name="result" type="int"/>
-        <param name="msg" type="string"/>
-      </res>
-    </twoway>
-    </class>
+		<oneway name="Hold1" overlap="true">
+		</oneway>
+		<oneway name="Hold2" overlap="true">
+		</oneway>
+		<twoway name="GetAccessUrl" overlap="true">
+			<res>
+				<param name="HostUrl" type="string"/>
+			</res>
+		</twoway>
+		<twoway name="GetCertainAceessUrl" overlap="true">
+			<req>
+				<param name="reqName" type="string"/>
+				<param name="reverse1" type="string"/>
+				<param name="reverse2" type="string"/>
+				<param name="intreverse1" type="int"/>
+				<param name="intreverse2" type="int"/>
+			</req>
+			<res>
+				<param name="CertainAceessUrl" type="string"/>
+				<param name="reverse1" type="string"/>
+				<param name="reverse2" type="string"/>
+				<param name="intreverse1" type="int"/>
+				<param name="intreverse2" type="int"/>
+			</res>
+		</twoway>
+
+	</class>
 </entity>

+ 23 - 165
Module/mod_CenterSetting/CenterSetting_client_g.h

@@ -32,6 +32,7 @@ public:
 	}
 	void OnClose(ErrorCodeEnum)
 	{
+		Dbg("session closed.");
 		bSessionClosed = true;
 	}
 	bool QuerySessionClosed()
@@ -58,18 +59,18 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum Download(CenterSettingService_Download_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
+	ErrorCodeEnum Downloadv2(CenterSettingService_Downloadv2_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
 		CAutoBuffer Buf = SpObject2Buffer(Req);
-		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_Download, CenterSettingService_MethodSignature_Download, Buf, spAsyncWait, m_context, dwTimeout);
+		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_Downloadv2, CenterSettingService_MethodSignature_Downloadv2, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
 	}
-	ErrorCodeEnum Download(CenterSettingService_Download_Req &Req, CenterSettingService_Download_Ans &Ans, DWORD dwTimeout)
+	ErrorCodeEnum Downloadv2(CenterSettingService_Downloadv2_Req &Req, CenterSettingService_Downloadv2_Ans &Ans, DWORD dwTimeout)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Download(Req, spAsyncWait, dwTimeout);
+		ErrorCodeEnum Error = Downloadv2(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
 			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
@@ -77,10 +78,10 @@ public:
 		}
 		return Error;
 	}
-	ErrorCodeEnum Download(CenterSettingService_Download_Req &Req, CenterSettingService_Download_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
+	ErrorCodeEnum Downloadv2(CenterSettingService_Downloadv2_Req &Req, CenterSettingService_Downloadv2_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = Download(Req, spAsyncWait, dwTimeout);
+		ErrorCodeEnum Error = Downloadv2(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
 			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
@@ -89,173 +90,30 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum GetSyncInfo(CenterSettingService_GetSyncInfo_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
+	ErrorCodeEnum Hold1()
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_GetSyncInfo, CenterSettingService_MethodSignature_GetSyncInfo, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum GetSyncInfo(CenterSettingService_GetSyncInfo_Req &Req, CenterSettingService_GetSyncInfo_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetSyncInfo(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum GetSyncInfo(CenterSettingService_GetSyncInfo_Req &Req, CenterSettingService_GetSyncInfo_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetSyncInfo(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
+		return pFunc->OnewayCall(CenterSettingService_Method_Hold1, CenterSettingService_MethodSignature_Hold1, m_context);
 	}
 
-	ErrorCodeEnum EditWebUrl(CenterSettingService_EditWebUrl_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
+	ErrorCodeEnum Hold2()
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_EditWebUrl, CenterSettingService_MethodSignature_EditWebUrl, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum EditWebUrl(CenterSettingService_EditWebUrl_Req &Req, CenterSettingService_EditWebUrl_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = EditWebUrl(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum EditWebUrl(CenterSettingService_EditWebUrl_Req &Req, CenterSettingService_EditWebUrl_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = EditWebUrl(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum GetWebUrlList(CenterSettingService_GetWebUrlList_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_GetWebUrlList, CenterSettingService_MethodSignature_GetWebUrlList, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum GetWebUrlList(CenterSettingService_GetWebUrlList_Req &Req, CenterSettingService_GetWebUrlList_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetWebUrlList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum GetWebUrlList(CenterSettingService_GetWebUrlList_Req &Req, CenterSettingService_GetWebUrlList_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetWebUrlList(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum GetActiveCustomUrl(CenterSettingService_GetActiveCustomUrl_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_GetActiveCustomUrl, CenterSettingService_MethodSignature_GetActiveCustomUrl, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum GetActiveCustomUrl(CenterSettingService_GetActiveCustomUrl_Req &Req, CenterSettingService_GetActiveCustomUrl_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetActiveCustomUrl(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum GetActiveCustomUrl(CenterSettingService_GetActiveCustomUrl_Req &Req, CenterSettingService_GetActiveCustomUrl_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetActiveCustomUrl(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-
-	ErrorCodeEnum EditTerminalBackupInfo(CenterSettingService_EditTerminalBackupInfo_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
-	{
-		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
-		CAutoBuffer Buf = SpObject2Buffer(Req);
-		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_EditTerminalBackupInfo, CenterSettingService_MethodSignature_EditTerminalBackupInfo, Buf, spAsyncWait, m_context, dwTimeout);
-		m_context.clear();
-		return ret;
-	}
-	ErrorCodeEnum EditTerminalBackupInfo(CenterSettingService_EditTerminalBackupInfo_Req &Req, CenterSettingService_EditTerminalBackupInfo_Ans &Ans, DWORD dwTimeout)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = EditTerminalBackupInfo(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
-	}
-	ErrorCodeEnum EditTerminalBackupInfo(CenterSettingService_EditTerminalBackupInfo_Req &Req, CenterSettingService_EditTerminalBackupInfo_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
-	{
-		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = EditTerminalBackupInfo(Req, spAsyncWait, dwTimeout);
-		if (Error == Error_Succeed) {
-			bool bEnd = false;
-			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
-			LOG_ASSERT(Error || bEnd);
-		}
-		return Error;
+		return pFunc->OnewayCall(CenterSettingService_Method_Hold2, CenterSettingService_MethodSignature_Hold2, m_context);
 	}
 
-	ErrorCodeEnum GetTerminalBackupInfoList(CenterSettingService_GetTerminalBackupInfoList_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
+	ErrorCodeEnum GetAccessUrl(CenterSettingService_GetAccessUrl_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
 		CAutoBuffer Buf = SpObject2Buffer(Req);
-		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_GetTerminalBackupInfoList, CenterSettingService_MethodSignature_GetTerminalBackupInfoList, Buf, spAsyncWait, m_context, dwTimeout);
+		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_GetAccessUrl, CenterSettingService_MethodSignature_GetAccessUrl, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
 	}
-	ErrorCodeEnum GetTerminalBackupInfoList(CenterSettingService_GetTerminalBackupInfoList_Req &Req, CenterSettingService_GetTerminalBackupInfoList_Ans &Ans, DWORD dwTimeout)
+	ErrorCodeEnum GetAccessUrl(CenterSettingService_GetAccessUrl_Req &Req, CenterSettingService_GetAccessUrl_Ans &Ans, DWORD dwTimeout)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetTerminalBackupInfoList(Req, spAsyncWait, dwTimeout);
+		ErrorCodeEnum Error = GetAccessUrl(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
 			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
@@ -263,10 +121,10 @@ public:
 		}
 		return Error;
 	}
-	ErrorCodeEnum GetTerminalBackupInfoList(CenterSettingService_GetTerminalBackupInfoList_Req &Req, CenterSettingService_GetTerminalBackupInfoList_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
+	ErrorCodeEnum GetAccessUrl(CenterSettingService_GetAccessUrl_Req &Req, CenterSettingService_GetAccessUrl_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = GetTerminalBackupInfoList(Req, spAsyncWait, dwTimeout);
+		ErrorCodeEnum Error = GetAccessUrl(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
 			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);
@@ -275,18 +133,18 @@ public:
 		return Error;
 	}
 
-	ErrorCodeEnum DownloadCenterFiles(CenterSettingService_DownloadCenterFiles_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
+	ErrorCodeEnum GetCertainAceessUrl(CenterSettingService_GetCertainAceessUrl_Req &Req, CSmartPointer<IAsynWaitSp> &spAsyncWait, DWORD dwTimeout)
 	{
 		CSmartPointer<IClientSessionFunction> pFunc = GetFunction();
 		CAutoBuffer Buf = SpObject2Buffer(Req);
-		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_DownloadCenterFiles, CenterSettingService_MethodSignature_DownloadCenterFiles, Buf, spAsyncWait, m_context, dwTimeout);
+		auto ret = pFunc->AsyncRequest(CenterSettingService_Method_GetCertainAceessUrl, CenterSettingService_MethodSignature_GetCertainAceessUrl, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
 	}
-	ErrorCodeEnum DownloadCenterFiles(CenterSettingService_DownloadCenterFiles_Req &Req, CenterSettingService_DownloadCenterFiles_Ans &Ans, DWORD dwTimeout)
+	ErrorCodeEnum GetCertainAceessUrl(CenterSettingService_GetCertainAceessUrl_Req &Req, CenterSettingService_GetCertainAceessUrl_Ans &Ans, DWORD dwTimeout)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = DownloadCenterFiles(Req, spAsyncWait, dwTimeout);
+		ErrorCodeEnum Error = GetCertainAceessUrl(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
 			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
@@ -294,10 +152,10 @@ public:
 		}
 		return Error;
 	}
-	ErrorCodeEnum DownloadCenterFiles(CenterSettingService_DownloadCenterFiles_Req &Req, CenterSettingService_DownloadCenterFiles_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
+	ErrorCodeEnum GetCertainAceessUrl(CenterSettingService_GetCertainAceessUrl_Req &Req, CenterSettingService_GetCertainAceessUrl_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
 		CSmartPointer<IAsynWaitSp> spAsyncWait;
-		ErrorCodeEnum Error = DownloadCenterFiles(Req, spAsyncWait, dwTimeout);
+		ErrorCodeEnum Error = GetCertainAceessUrl(Req, spAsyncWait, dwTimeout);
 		if (Error == Error_Succeed) {
 			bool bEnd = false;
 			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, dwTimeout);

+ 39 - 169
Module/mod_CenterSetting/CenterSetting_def_g.h

@@ -12,237 +12,107 @@ namespace CenterSetting {
 // const goes here
 //
 
-#define CenterSettingService_Method_Download 0
-#define CenterSettingService_Method_GetSyncInfo 1
-#define CenterSettingService_Method_EditWebUrl 2
-#define CenterSettingService_Method_GetWebUrlList 3
-#define CenterSettingService_Method_GetActiveCustomUrl 4
-#define CenterSettingService_Method_EditTerminalBackupInfo 5
-#define CenterSettingService_Method_GetTerminalBackupInfoList 6
-#define CenterSettingService_Method_DownloadCenterFiles 7
-
-#define CenterSettingService_MethodSignature_Download -101852141
-#define CenterSettingService_MethodSignature_GetSyncInfo 1338819403
-#define CenterSettingService_MethodSignature_EditWebUrl 112159607
-#define CenterSettingService_MethodSignature_GetWebUrlList 166192532
-#define CenterSettingService_MethodSignature_GetActiveCustomUrl -2094137460
-#define CenterSettingService_MethodSignature_EditTerminalBackupInfo -1684426310
-#define CenterSettingService_MethodSignature_GetTerminalBackupInfoList 652072921
-#define CenterSettingService_MethodSignature_DownloadCenterFiles 1100121901
-
-struct CenterSettingService_Download_Req
-{
-	CSimpleStringA strAddr;
-	int nPort;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & strAddr & nPort;
-	}
-
-};
-
-struct CenterSettingService_Download_Ans
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct CenterSettingService_GetSyncInfo_Req
-{
-
-	void Serialize(SpBuffer &Buf)
-	{
-	}
-
-};
-
-struct CenterSettingService_GetSyncInfo_Ans
-{
-	unsigned int nSyncTime;
-	CSimpleStringA strFileName;
-	CSimpleStringA strFileHash;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & nSyncTime & strFileName & strFileHash;
-	}
-
-};
+#define CenterSettingService_Method_Downloadv2 0
+#define CenterSettingService_Method_Hold1 1
+#define CenterSettingService_Method_Hold2 2
+#define CenterSettingService_Method_GetAccessUrl 3
+#define CenterSettingService_Method_GetCertainAceessUrl 4
 
-struct CenterSettingService_EditWebUrl_Req
-{
-	int operation;
-	int index;
-	CSimpleStringA futureUrl;
-	CSimpleStringA adUrl;
-	CSimpleStringA remark;
-	int env;
-	bool setDefault;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & operation & index & futureUrl & adUrl & remark & env & setDefault;
-	}
-
-};
-
-struct CenterSettingService_EditWebUrl_Ans
-{
-	int result;
-	int addition;
-	CSimpleStringA msg;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & result & addition & msg;
-	}
-
-};
-
-struct CenterSettingService_GetWebUrlList_Req
-{
-	int filter1;
-	int filter2;
-	int filter3;
-	CSimpleStringA filter4;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & filter1 & filter2 & filter3 & filter4;
-	}
-
-};
-
-struct CenterSettingService_GetWebUrlList_Ans
-{
-	CAutoArray<int> index;
-	CAutoArray<CSimpleStringA> futureUrl;
-	CAutoArray<CSimpleStringA> adUrl;
-	CAutoArray<CSimpleStringA> remark;
-	CAutoArray<int> env;
-	CAutoArray<int> type;
-	CAutoArray<int> status;
-
-	void Serialize(SpBuffer &Buf)
-	{
-		auto & buf = Buf & index & futureUrl & adUrl & remark & env & type & status;
-	}
-
-};
+#define CenterSettingService_MethodSignature_Downloadv2 -1569222403
+#define CenterSettingService_MethodSignature_Hold1 35758230
+#define CenterSettingService_MethodSignature_Hold2 35758233
+#define CenterSettingService_MethodSignature_GetAccessUrl 1887530540
+#define CenterSettingService_MethodSignature_GetCertainAceessUrl -927544309
 
-struct CenterSettingService_GetActiveCustomUrl_Req
+struct CenterSettingService_Downloadv2_Req
 {
+	CSimpleStringA reqCenterConfigUrl;
 
 	void Serialize(SpBuffer &Buf)
 	{
+		auto & buf = Buf & reqCenterConfigUrl;
 	}
 
 };
 
-struct CenterSettingService_GetActiveCustomUrl_Ans
+struct CenterSettingService_Downloadv2_Ans
 {
-	CSimpleStringA fultureUrl;
-	CSimpleStringA adUrl;
+	int downloadStat;
+	CSimpleStringA strErrMsg;
+	CSimpleStringA retCenterConfigUrl;
+	CSimpleStringA HostUrl;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & fultureUrl & adUrl;
+		auto & buf = Buf & downloadStat & strErrMsg & retCenterConfigUrl & HostUrl;
 	}
 
 };
 
-struct CenterSettingService_EditTerminalBackupInfo_Req
+struct CenterSettingService_Hold1_Info
 {
-	int operation;
-	int index;
-	CSimpleStringA terminalNo;
-	CSimpleStringA branchIP;
-	CSimpleStringA remark;
-	int env;
-	bool setDefault;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & operation & index & terminalNo & branchIP & remark & env & setDefault;
 	}
 
 };
 
-struct CenterSettingService_EditTerminalBackupInfo_Ans
+struct CenterSettingService_Hold2_Info
 {
-	int result;
-	int addition;
-	CSimpleStringA msg;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & result & addition & msg;
 	}
 
 };
 
-struct CenterSettingService_GetTerminalBackupInfoList_Req
+struct CenterSettingService_GetAccessUrl_Req
 {
-	int filter1;
-	int filter2;
-	int filter3;
-	CSimpleStringA filter4;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & filter1 & filter2 & filter3 & filter4;
 	}
 
 };
 
-struct CenterSettingService_GetTerminalBackupInfoList_Ans
+struct CenterSettingService_GetAccessUrl_Ans
 {
-	CAutoArray<int> index;
-	CAutoArray<CSimpleStringA> terminalNo;
-	CAutoArray<CSimpleStringA> branchIP;
-	CAutoArray<CSimpleStringA> remark;
-	CAutoArray<int> env;
-	CAutoArray<int> status;
+	CSimpleStringA HostUrl;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & index & terminalNo & branchIP & remark & env & status;
+		auto & buf = Buf & HostUrl;
 	}
 
 };
 
-struct CenterSettingService_DownloadCenterFiles_Req
+struct CenterSettingService_GetCertainAceessUrl_Req
 {
-	int operation;
-	CSimpleStringA strAddr;
-	int nPort;
-	bool deleteIfExist;
-	CSimpleStringA additional1;
-	CSimpleStringA additional2;
-	CSimpleStringA additional3;
-	CSimpleStringA additional4;
-	int reserved1;
-	int reserved2;
+	CSimpleStringA reqName;
+	CSimpleStringA reverse1;
+	CSimpleStringA reverse2;
+	int intreverse1;
+	int intreverse2;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & operation & strAddr & nPort & deleteIfExist & additional1 & additional2 & additional3 & additional4 & reserved1 & reserved2;
+		auto & buf = Buf & reqName & reverse1 & reverse2 & intreverse1 & intreverse2;
 	}
 
 };
 
-struct CenterSettingService_DownloadCenterFiles_Ans
+struct CenterSettingService_GetCertainAceessUrl_Ans
 {
-	int result;
-	CSimpleStringA msg;
+	CSimpleStringA CertainAceessUrl;
+	CSimpleStringA reverse1;
+	CSimpleStringA reverse2;
+	int intreverse1;
+	int intreverse2;
 
 	void Serialize(SpBuffer &Buf)
 	{
-		auto & buf = Buf & result & msg;
+		auto & buf = Buf & CertainAceessUrl & reverse1 & reverse2 & intreverse1 & intreverse2;
 	}
 
 };

+ 47 - 125
Module/mod_CenterSetting/CenterSetting_server_g.h

@@ -30,57 +30,36 @@ public:
 	{
 		ErrorCodeEnum Error = Error_Succeed;
 		switch (dwMessageID) {
-		case CenterSettingService_Method_Download:
-			if (dwSignature == CenterSettingService_MethodSignature_Download) {
+		case CenterSettingService_Method_Downloadv2:
+			if (dwSignature == CenterSettingService_MethodSignature_Downloadv2) {
 				bOverlap = true;
 			} else {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CenterSettingService_Method_GetSyncInfo:
-			if (dwSignature == CenterSettingService_MethodSignature_GetSyncInfo) {
+		case CenterSettingService_Method_Hold1:
+			if (dwSignature == CenterSettingService_MethodSignature_Hold1) {
 				bOverlap = true;
 			} else {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CenterSettingService_Method_EditWebUrl:
-			if (dwSignature == CenterSettingService_MethodSignature_EditWebUrl) {
+		case CenterSettingService_Method_Hold2:
+			if (dwSignature == CenterSettingService_MethodSignature_Hold2) {
 				bOverlap = true;
 			} else {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CenterSettingService_Method_GetWebUrlList:
-			if (dwSignature == CenterSettingService_MethodSignature_GetWebUrlList) {
+		case CenterSettingService_Method_GetAccessUrl:
+			if (dwSignature == CenterSettingService_MethodSignature_GetAccessUrl) {
 				bOverlap = true;
 			} else {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CenterSettingService_Method_GetActiveCustomUrl:
-			if (dwSignature == CenterSettingService_MethodSignature_GetActiveCustomUrl) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CenterSettingService_Method_EditTerminalBackupInfo:
-			if (dwSignature == CenterSettingService_MethodSignature_EditTerminalBackupInfo) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CenterSettingService_Method_GetTerminalBackupInfoList:
-			if (dwSignature == CenterSettingService_MethodSignature_GetTerminalBackupInfoList) {
-				bOverlap = true;
-			} else {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CenterSettingService_Method_DownloadCenterFiles:
-			if (dwSignature == CenterSettingService_MethodSignature_DownloadCenterFiles) {
+		case CenterSettingService_Method_GetCertainAceessUrl:
+			if (dwSignature == CenterSettingService_MethodSignature_GetCertainAceessUrl) {
 				bOverlap = true;
 			} else {
 				Error = Error_MethodSignatureFailed;
@@ -97,43 +76,28 @@ public:
 	{
 		ErrorCodeEnum Error = Error_Succeed;
 		switch (dwMessageID) {
-		case CenterSettingService_Method_Download:
-			if (dwSignature != CenterSettingService_MethodSignature_Download) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CenterSettingService_Method_GetSyncInfo:
-			if (dwSignature != CenterSettingService_MethodSignature_GetSyncInfo) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CenterSettingService_Method_EditWebUrl:
-			if (dwSignature != CenterSettingService_MethodSignature_EditWebUrl) {
+		case CenterSettingService_Method_Downloadv2:
+			if (dwSignature != CenterSettingService_MethodSignature_Downloadv2) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CenterSettingService_Method_GetWebUrlList:
-			if (dwSignature != CenterSettingService_MethodSignature_GetWebUrlList) {
+		case CenterSettingService_Method_Hold1:
+			if (dwSignature != CenterSettingService_MethodSignature_Hold1) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CenterSettingService_Method_GetActiveCustomUrl:
-			if (dwSignature != CenterSettingService_MethodSignature_GetActiveCustomUrl) {
+		case CenterSettingService_Method_Hold2:
+			if (dwSignature != CenterSettingService_MethodSignature_Hold2) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CenterSettingService_Method_EditTerminalBackupInfo:
-			if (dwSignature != CenterSettingService_MethodSignature_EditTerminalBackupInfo) {
+		case CenterSettingService_Method_GetAccessUrl:
+			if (dwSignature != CenterSettingService_MethodSignature_GetAccessUrl) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
-		case CenterSettingService_Method_GetTerminalBackupInfoList:
-			if (dwSignature != CenterSettingService_MethodSignature_GetTerminalBackupInfoList) {
-				Error = Error_MethodSignatureFailed;
-			}
-			break;
-		case CenterSettingService_Method_DownloadCenterFiles:
-			if (dwSignature != CenterSettingService_MethodSignature_DownloadCenterFiles) {
+		case CenterSettingService_Method_GetCertainAceessUrl:
+			if (dwSignature != CenterSettingService_MethodSignature_GetCertainAceessUrl) {
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
@@ -144,42 +108,27 @@ public:
 		return Error;
 	}
 
-	virtual void Handle_Download(SpReqAnsContext<CenterSettingService_Download_Req, CenterSettingService_Download_Ans>::Pointer ctx)
+	virtual void Handle_Downloadv2(SpReqAnsContext<CenterSettingService_Downloadv2_Req, CenterSettingService_Downloadv2_Ans>::Pointer ctx)
 	{
 	/// override by user
 	}
 
-	virtual void Handle_GetSyncInfo(SpReqAnsContext<CenterSettingService_GetSyncInfo_Req, CenterSettingService_GetSyncInfo_Ans>::Pointer ctx)
+	virtual void Handle_Hold1(SpOnewayCallContext<CenterSettingService_Hold1_Info>::Pointer ctx)
 	{
 	/// override by user
 	}
 
-	virtual void Handle_EditWebUrl(SpReqAnsContext<CenterSettingService_EditWebUrl_Req, CenterSettingService_EditWebUrl_Ans>::Pointer ctx)
+	virtual void Handle_Hold2(SpOnewayCallContext<CenterSettingService_Hold2_Info>::Pointer ctx)
 	{
 	/// override by user
 	}
 
-	virtual void Handle_GetWebUrlList(SpReqAnsContext<CenterSettingService_GetWebUrlList_Req, CenterSettingService_GetWebUrlList_Ans>::Pointer ctx)
+	virtual void Handle_GetAccessUrl(SpReqAnsContext<CenterSettingService_GetAccessUrl_Req, CenterSettingService_GetAccessUrl_Ans>::Pointer ctx)
 	{
 	/// override by user
 	}
 
-	virtual void Handle_GetActiveCustomUrl(SpReqAnsContext<CenterSettingService_GetActiveCustomUrl_Req, CenterSettingService_GetActiveCustomUrl_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_EditTerminalBackupInfo(SpReqAnsContext<CenterSettingService_EditTerminalBackupInfo_Req, CenterSettingService_EditTerminalBackupInfo_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_GetTerminalBackupInfoList(SpReqAnsContext<CenterSettingService_GetTerminalBackupInfoList_Req, CenterSettingService_GetTerminalBackupInfoList_Ans>::Pointer ctx)
-	{
-	/// override by user
-	}
-
-	virtual void Handle_DownloadCenterFiles(SpReqAnsContext<CenterSettingService_DownloadCenterFiles_Req, CenterSettingService_DownloadCenterFiles_Ans>::Pointer ctx)
+	virtual void Handle_GetCertainAceessUrl(SpReqAnsContext<CenterSettingService_GetCertainAceessUrl_Req, CenterSettingService_GetCertainAceessUrl_Ans>::Pointer ctx)
 	{
 	/// override by user
 	}
@@ -200,76 +149,49 @@ public:
 			}
 #endif
 			switch (dwMessageID) {
-				case CenterSettingService_Method_Download:
-					{
-						SpReqAnsContext<CenterSettingService_Download_Req,CenterSettingService_Download_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CenterSettingService_Download_Req,CenterSettingService_Download_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						Handle_Download(ctx);
-					}
-					break;
-				case CenterSettingService_Method_GetSyncInfo:
+				case CenterSettingService_Method_Downloadv2:
 					{
-						SpReqAnsContext<CenterSettingService_GetSyncInfo_Req,CenterSettingService_GetSyncInfo_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CenterSettingService_GetSyncInfo_Req,CenterSettingService_GetSyncInfo_Ans>(pTransactionContext));
+						SpReqAnsContext<CenterSettingService_Downloadv2_Req,CenterSettingService_Downloadv2_Ans>::Pointer ctx;
+						ctx.Attach(new SpReqAnsContext<CenterSettingService_Downloadv2_Req,CenterSettingService_Downloadv2_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
-						Handle_GetSyncInfo(ctx);
+						Handle_Downloadv2(ctx);
 					}
 					break;
-				case CenterSettingService_Method_EditWebUrl:
+				case CenterSettingService_Method_Hold1:
 					{
-						SpReqAnsContext<CenterSettingService_EditWebUrl_Req,CenterSettingService_EditWebUrl_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CenterSettingService_EditWebUrl_Req,CenterSettingService_EditWebUrl_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						Handle_EditWebUrl(ctx);
-					}
-					break;
-				case CenterSettingService_Method_GetWebUrlList:
-					{
-						SpReqAnsContext<CenterSettingService_GetWebUrlList_Req,CenterSettingService_GetWebUrlList_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CenterSettingService_GetWebUrlList_Req,CenterSettingService_GetWebUrlList_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
+						SpOnewayCallContext<CenterSettingService_Hold1_Info>::Pointer ctx;
+						ctx.Attach(new SpOnewayCallContext<CenterSettingService_Hold1_Info>());
+						SpBuffer2Object(Buf, ctx->Info);
 						pTransactionContext->GetLinkContext(ctx->link);
-						Handle_GetWebUrlList(ctx);
+						Handle_Hold1(ctx);
 					}
 					break;
-				case CenterSettingService_Method_GetActiveCustomUrl:
+				case CenterSettingService_Method_Hold2:
 					{
-						SpReqAnsContext<CenterSettingService_GetActiveCustomUrl_Req,CenterSettingService_GetActiveCustomUrl_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CenterSettingService_GetActiveCustomUrl_Req,CenterSettingService_GetActiveCustomUrl_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
-						pTransactionContext->GetLinkContext(ctx->link);
-						Handle_GetActiveCustomUrl(ctx);
-					}
-					break;
-				case CenterSettingService_Method_EditTerminalBackupInfo:
-					{
-						SpReqAnsContext<CenterSettingService_EditTerminalBackupInfo_Req,CenterSettingService_EditTerminalBackupInfo_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CenterSettingService_EditTerminalBackupInfo_Req,CenterSettingService_EditTerminalBackupInfo_Ans>(pTransactionContext));
-						SpBuffer2Object(Buf, ctx->Req);
+						SpOnewayCallContext<CenterSettingService_Hold2_Info>::Pointer ctx;
+						ctx.Attach(new SpOnewayCallContext<CenterSettingService_Hold2_Info>());
+						SpBuffer2Object(Buf, ctx->Info);
 						pTransactionContext->GetLinkContext(ctx->link);
-						Handle_EditTerminalBackupInfo(ctx);
+						Handle_Hold2(ctx);
 					}
 					break;
-				case CenterSettingService_Method_GetTerminalBackupInfoList:
+				case CenterSettingService_Method_GetAccessUrl:
 					{
-						SpReqAnsContext<CenterSettingService_GetTerminalBackupInfoList_Req,CenterSettingService_GetTerminalBackupInfoList_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CenterSettingService_GetTerminalBackupInfoList_Req,CenterSettingService_GetTerminalBackupInfoList_Ans>(pTransactionContext));
+						SpReqAnsContext<CenterSettingService_GetAccessUrl_Req,CenterSettingService_GetAccessUrl_Ans>::Pointer ctx;
+						ctx.Attach(new SpReqAnsContext<CenterSettingService_GetAccessUrl_Req,CenterSettingService_GetAccessUrl_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
-						Handle_GetTerminalBackupInfoList(ctx);
+						Handle_GetAccessUrl(ctx);
 					}
 					break;
-				case CenterSettingService_Method_DownloadCenterFiles:
+				case CenterSettingService_Method_GetCertainAceessUrl:
 					{
-						SpReqAnsContext<CenterSettingService_DownloadCenterFiles_Req,CenterSettingService_DownloadCenterFiles_Ans>::Pointer ctx;
-						ctx.Attach(new SpReqAnsContext<CenterSettingService_DownloadCenterFiles_Req,CenterSettingService_DownloadCenterFiles_Ans>(pTransactionContext));
+						SpReqAnsContext<CenterSettingService_GetCertainAceessUrl_Req,CenterSettingService_GetCertainAceessUrl_Ans>::Pointer ctx;
+						ctx.Attach(new SpReqAnsContext<CenterSettingService_GetCertainAceessUrl_Req,CenterSettingService_GetCertainAceessUrl_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
-						Handle_DownloadCenterFiles(ctx);
+						Handle_GetCertainAceessUrl(ctx);
 					}
 					break;
 				default: