Z991239-4839 #comment feat: 订阅关闭页面接口

Module/mod_accessauth/AccessAuthFSM.cpp

@@ -29,6 +29,8 @@
 #include "CommEntityRestful.hpp"
 #include "SpUtility.h"
 #include "comm.h"
+#include "../mod_chromium/Chromium_client_g.h" //启动浏览器接口
+using namespace Chromium;
 #endif // RVC_OS_WIN
 
 int HexBuf2StrBuf(PBYTE hexBuf, char** strBuf, DWORD len)
@@ -574,7 +576,7 @@ struct GetTokenTask : ITaskSp
         {
             AccessTokenJson accessToken;
             SharedKeyJson sharedKey;
-            int flag;
+            bool flag;
             string warnMessage;
             JSONCONVERT2OBJECT_MEMEBER_REGISTER(accessToken, sharedKey, flag, warnMessage)
         } getTokenAns;
@@ -614,16 +616,18 @@ struct GetTokenTask : ITaskSp
                 return;
             }
             SP::Module::Restful::ExtractDataFromDebranchResponse(result.content, getTokenAns);
-
+            
             Dbg("getTokenAns.flag = %d, getTokenAns.warnMessage = %s", getTokenAns.flag, getTokenAns.warnMessage.c_str());
-            if (getTokenAns.flag != 0 && getTokenAns.warnMessage.length() != 0/*&& flag？*/) //判断是否需要告警，通过标志位,标志位待确定
+            if (getTokenAns.flag != false/*&& flag？*/) //判断是否需要告警，通过标志位,标志位待确定
             {
+                Dbg("告警");
                 CSimpleStringA tmsg = CSimpleStringA::Format("{\"errcode\": \"%s\", \"message\": %s}",
                     responseStatus.errorCode.c_str(), getTokenAns.warnMessage.c_str());
                 m_fsm->GetEntityBase()->GetFunction()->SetSysVar("AuthErrMsg", tmsg.GetData(), true);
             }
             else
             {
+                Dbg("不告景");
                 m_fsm->GetEntityBase()->GetFunction()->SetSysVar("AuthErrMsg", "", true);
             }
 
@@ -668,6 +672,11 @@ struct GetTokenTask : ITaskSp
             m_fsm->AuthLogWarn(result, config.GetRequestUri(), "获取准入token");
             DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("GetTokenTask Connect Failed.");
         }
+
+        CSimpleStringA msg(true);
+        m_fsm->GetEntityBase()->GetFunction()->GetSysVar("AuthErrMsg", msg);
+        Dbg("AuthErrMsg 在AccessAuth的内容是： %s.", msg.GetData());
+
         FSMEvent* pEvent = new FSMEvent(CAccessAuthFSM::Event_ReqTokenFail);
         m_fsm->PostEventFIFO(pEvent);
 #endif // RVC_OS_WIN
@@ -1738,6 +1747,46 @@ void CAccessAuthFSM::GetNetMsg(SpReqAnsContext<AccessAuthService_GetNetMsg_Req,
     ctx->Answer(Error_Succeed);
 }
 
+void CAccessAuthFSM::CloseTempWindow(SpReqAnsContext<AccessAuthService_CloseTempWindow_Req, AccessAuthService_CloseTempWindow_Ans>::Pointer& ctx)
+{
+    auto pFunc = GetEntityBase()->GetFunction();
+    CSimpleStringA strPath, statusPagePath;
+    pFunc->GetPath("Bin", strPath);
+    //strPath += "\\Chromium\\cefclient.exe";
+
+    ChromiumSrv_ClientBase* chromiumClient = new ChromiumSrv_ClientBase(GetEntityBase());
+    ErrorCodeEnum error = chromiumClient->Connect();
+    if (error == Error_Succeed)
+    {
+        ChromiumSrv_CloseBrowser_Req req;
+        ChromiumSrv_CloseBrowser_Ans ans;
+
+        if (ctx->Req.windowType == 1) //关闭终端告警页面
+        {
+            //CSimpleStringA setting = "--logextend=test";
+            //CSimpleStringA cmdLine = strPath + " --kill " + setting;
+            //WinExec(cmdLine.GetData(), SW_MINIMIZE);
+
+            DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("关闭告警页面");
+
+            req.type = "SpecialPageFromOtherEntity";
+            req.name = "tempMessage";
+
+            error = chromiumClient->CloseBrowser(req, ans, 10000);
+            if (error != Error_Succeed)
+            {
+                ctx->Ans.closeResult = false;
+                DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Close chromium page [terminalStatus] failed.");
+            }
+            else
+            {
+                ctx->Ans.closeResult = true;
+                DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Close chromium page [terminalStatus] success.");
+            }
+        }
+    }
+}
+
 //以下所有代码为windows的
 #ifdef RVC_OS_WIN
 ErrorCodeEnum CAccessAuthFSM::GetDns(string& dnsList)

Module/mod_accessauth/AccessAuthFSM.h

@@ -466,6 +466,7 @@ public:
 	void AuthLogWarn(const T& ret, const string& url, const string& method, bool bNeedEvent = true);
 
 	void GetNetMsg(SpReqAnsContext<AccessAuthService_GetNetMsg_Req, AccessAuthService_GetNetMsg_Ans>::Pointer& ctx);
+	void CloseTempWindow(SpReqAnsContext<AccessAuthService_CloseTempWindow_Req, AccessAuthService_CloseTempWindow_Ans>::Pointer& ctx);
 #ifdef RVC_OS_WIN
 	DWORD GetDeviceInfo(CEntityBase* pCallerEntity, const CSimpleStringA& devDeviceName,
 		CSimpleStringA& strModel, CSimpleStringA& strVendor, CSimpleStringA& strVersion);

Module/mod_accessauth/AccessAuthorization.xml

@@ -46,6 +46,18 @@
 				<param name="reserved2" type="string" />
       </res>
     </twoway>
+	<twoway name="CloseTempWindow" overlap="true">
+	  <req>
+		  <param name="windowType" type="int"/>
+		  <param name="reserved1" type="int"/>
+		  <param name="reserved2" type="string"/>
+	  </req>
+	  <res>
+		  <param name="closeResult" type="int" />
+		  <param name="reserved1" type="int" />
+		  <param name="reserved2" type="string" />
+	  </res>
+	</twoway>
   </class>
 </entity>
 

Module/mod_accessauth/AccessAuthorization_client_g.h

@@ -218,6 +218,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(AccessAuthService_Method_GetNetMsg, AccessAuthService_MethodSignature_GetNetMsg, Buf, spAsyncWait, m_context, dwTimeout);
 		m_context.clear();
 		return ret;
@@ -233,17 +239,77 @@ public:
 		}
 		return Error;
 	}
+	ErrorCodeEnum GetNetMsg(AccessAuthService_GetNetMsg_Req &Req, AccessAuthService_GetNetMsg_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = GetNetMsg(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 GetNetMsg(AccessAuthService_GetNetMsg_Req &Req, AccessAuthService_GetNetMsg_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
 	{
-        CSmartPointer<IAsynWaitSp> spAsyncWait;
-        ErrorCodeEnum Error = GetNetMsg(Req, spAsyncWait, dwTimeout);
-        if (Error == Error_Succeed) {
-            bool bEnd = false;
-            CSimpleString str;
-            Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
-            LOG_ASSERT(Error || bEnd);
-        }
-        return Error;
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = GetNetMsg(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			CSimpleString str;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
+	}
+
+	ErrorCodeEnum CloseTempWindow(AccessAuthService_CloseTempWindow_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(AccessAuthService_Method_CloseTempWindow, AccessAuthService_MethodSignature_CloseTempWindow, Buf, spAsyncWait, m_context, dwTimeout);
+		m_context.clear();
+		return ret;
+	}
+	ErrorCodeEnum CloseTempWindow(AccessAuthService_CloseTempWindow_Req &Req, AccessAuthService_CloseTempWindow_Ans &Ans, DWORD dwTimeout)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = CloseTempWindow(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
+	}
+	ErrorCodeEnum CloseTempWindow(AccessAuthService_CloseTempWindow_Req &Req, AccessAuthService_CloseTempWindow_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError, CSimpleString &str)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = CloseTempWindow(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 CloseTempWindow(AccessAuthService_CloseTempWindow_Req &Req, AccessAuthService_CloseTempWindow_Ans &Ans, DWORD dwTimeout, DWORD &dwUserError)
+	{
+		CSmartPointer<IAsynWaitSp> spAsyncWait;
+		ErrorCodeEnum Error = CloseTempWindow(Req, spAsyncWait, dwTimeout);
+		if (Error == Error_Succeed) {
+			bool bEnd = false;
+			CSimpleString str;
+			Error = SpWaitAnswerObject(spAsyncWait, Ans, bEnd, dwUserError, str, dwTimeout);
+			LOG_ASSERT(Error || bEnd);
+		}
+		return Error;
 	}
 
 

Module/mod_accessauth/AccessAuthorization_def_g.h

@@ -19,6 +19,7 @@ namespace AccessAuthorization {
 #define AccessAuthService_Method_InitializeNew 4
 #define AccessAuthService_Method_SyncTime 5
 #define AccessAuthService_Method_GetNetMsg 6
+#define AccessAuthService_Method_CloseTempWindow 7
 
 #define AccessAuthService_MethodSignature_Regist -1850909100
 #define AccessAuthService_MethodSignature_Unregist 667273038
@@ -27,6 +28,7 @@ namespace AccessAuthorization {
 #define AccessAuthService_MethodSignature_InitializeNew 1851143282
 #define AccessAuthService_MethodSignature_SyncTime 1195907872
 #define AccessAuthService_MethodSignature_GetNetMsg 62776855
+#define AccessAuthService_MethodSignature_CloseTempWindow 1864857265
 
 #define AccessAuthService_LogCode_Regist "QLR040250200"
 #define AccessAuthService_LogCode_Unregist "QLR040250201"
@@ -35,6 +37,7 @@ namespace AccessAuthorization {
 #define AccessAuthService_LogCode_InitializeNew "QLR040250204"
 #define AccessAuthService_LogCode_SyncTime "QLR040250205"
 #define AccessAuthService_LogCode_GetNetMsg "QLR040250206"
+#define AccessAuthService_LogCode_CloseTempWindow "QLR040250207"
 
 struct AccessAuthService_Regist_Info
 {
@@ -151,6 +154,32 @@ struct AccessAuthService_GetNetMsg_Ans
 
 };
 
+struct AccessAuthService_CloseTempWindow_Req
+{
+	int windowType;
+	int reserved1;
+	CSimpleStringA reserved2;
+
+	void Serialize(SpBuffer &Buf)
+	{
+		auto & buf = Buf & windowType & reserved1 & reserved2;
+	}
+
+};
+
+struct AccessAuthService_CloseTempWindow_Ans
+{
+	int closeResult;
+	int reserved1;
+	CSimpleStringA reserved2;
+
+	void Serialize(SpBuffer &Buf)
+	{
+		auto & buf = Buf & closeResult & reserved1 & reserved2;
+	}
+
+};
+
 
 ///////////////////////////
 

Module/mod_accessauth/AccessAuthorization_server_g.h

@@ -79,6 +79,13 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
+		case AccessAuthService_Method_CloseTempWindow:
+			if (dwSignature == AccessAuthService_MethodSignature_CloseTempWindow) {
+				bOverlap = true;
+			} else {
+				Error = Error_MethodSignatureFailed;
+			}
+			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -125,6 +132,11 @@ public:
 				Error = Error_MethodSignatureFailed;
 			}
 			break;
+		case AccessAuthService_Method_CloseTempWindow:
+			if (dwSignature != AccessAuthService_MethodSignature_CloseTempWindow) {
+				Error = Error_MethodSignatureFailed;
+			}
+			break;
 		default:
 			Error = Error_MethodNotFound;
 			break;
@@ -167,6 +179,11 @@ public:
 	/// override by user
 	}
 
+	virtual void Handle_CloseTempWindow(SpReqAnsContext<AccessAuthService_CloseTempWindow_Req, AccessAuthService_CloseTempWindow_Ans>::Pointer ctx)
+	{
+	/// override by user
+	}
+
 	virtual void OnRequest(CSmartPointer<ITransactionContext> pTransactionContext)
 	{
 		CAutoBuffer Buf;
@@ -189,7 +206,6 @@ public:
 						ctx.Attach(new SpOnewayCallContext<AccessAuthService_Regist_Info>());
 						SpBuffer2Object(Buf, ctx->Info);
 						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
 						Handle_Regist(ctx);
 					}
 					break;
@@ -199,7 +215,6 @@ public:
 						ctx.Attach(new SpOnewayCallContext<AccessAuthService_Unregist_Info>());
 						SpBuffer2Object(Buf, ctx->Info);
 						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
 						Handle_Unregist(ctx);
 					}
 					break;
@@ -209,7 +224,6 @@ public:
 						ctx.Attach(new SpReqAnsContext<AccessAuthService_InitDev_Req,AccessAuthService_InitDev_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
 						Handle_InitDev(ctx);
 					}
 					break;
@@ -219,7 +233,6 @@ public:
 						ctx.Attach(new SpOnewayCallContext<AccessAuthService_UpdateWK_Info>());
 						SpBuffer2Object(Buf, ctx->Info);
 						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
 						Handle_UpdateWK(ctx);
 					}
 					break;
@@ -229,7 +242,6 @@ public:
 						ctx.Attach(new SpReqAnsContext<AccessAuthService_InitializeNew_Req,AccessAuthService_InitializeNew_Ans>(pTransactionContext));
 						SpBuffer2Object(Buf, ctx->Req);
 						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
 						Handle_InitializeNew(ctx);
 					}
 					break;
@@ -239,7 +251,6 @@ public:
 						ctx.Attach(new SpOnewayCallContext<AccessAuthService_SyncTime_Info>());
 						SpBuffer2Object(Buf, ctx->Info);
 						pTransactionContext->GetLinkContext(ctx->link);
-						EntityResource::setLink(ctx->link);
 						Handle_SyncTime(ctx);
 					}
 					break;
@@ -252,6 +263,15 @@ public:
 						Handle_GetNetMsg(ctx);
 					}
 					break;
+				case AccessAuthService_Method_CloseTempWindow:
+					{
+						SpReqAnsContext<AccessAuthService_CloseTempWindow_Req,AccessAuthService_CloseTempWindow_Ans>::Pointer ctx;
+						ctx.Attach(new SpReqAnsContext<AccessAuthService_CloseTempWindow_Req,AccessAuthService_CloseTempWindow_Ans>(pTransactionContext));
+						SpBuffer2Object(Buf, ctx->Req);
+						pTransactionContext->GetLinkContext(ctx->link);
+						Handle_CloseTempWindow(ctx);
+					}
+					break;
 				default:
 					assert(0);
 					break;

Module/mod_accessauth/mod_AccessAuth.cpp

@@ -250,6 +250,11 @@ void CAccessAuthSession::Handle_GetNetMsg(SpReqAnsContext<AccessAuthService_GetN
 	m_pEntity->GetNetMsg(ctx);
 }
 
+void CAccessAuthSession::Handle_CloseTempWindow(SpReqAnsContext<AccessAuthService_CloseTempWindow_Req, AccessAuthService_CloseTempWindow_Ans>::Pointer ctx)
+{
+	m_pEntity->CloseTempWindow(ctx);
+}
+
 void CAccessAuthEntity::OnStarted()
 {
 	//设置时区为北京标准时区
@@ -1708,6 +1713,12 @@ void CAccessAuthEntity::GetNetMsg(SpReqAnsContext<AccessAuthService_GetNetMsg_Re
 	return;
 }
 
+void CAccessAuthEntity::CloseTempWindow(SpReqAnsContext<AccessAuthService_CloseTempWindow_Req, AccessAuthService_CloseTempWindow_Ans>::Pointer& ctx)
+{
+	m_FSM.CloseTempWindow(ctx);
+	return;
+}
+
 bool CAccessAuthEntity::GenerateRandomNum()
 {
 	LOG_FUNCTION();

Module/mod_accessauth/mod_AccessAuth.h

@@ -24,6 +24,7 @@ public:
 	virtual void Handle_InitializeNew(SpReqAnsContext<AccessAuthService_InitializeNew_Req, AccessAuthService_InitializeNew_Ans>::Pointer ctx);
 	virtual void Handle_InitDev(SpReqAnsContext<AccessAuthService_InitDev_Req, AccessAuthService_InitDev_Ans>::Pointer ctx);
 	virtual void Handle_GetNetMsg(SpReqAnsContext<AccessAuthService_GetNetMsg_Req, AccessAuthService_GetNetMsg_Ans>::Pointer ctx);
+	virtual void Handle_CloseTempWindow(SpReqAnsContext<AccessAuthService_CloseTempWindow_Req, AccessAuthService_CloseTempWindow_Ans>::Pointer ctx);
 private:
 	CAccessAuthEntity *m_pEntity;
 };
@@ -175,6 +176,7 @@ public:
 	ErrorCodeEnum LoadKeysToPinPadACS(string TMK, string TPK, string EDK, string index);
 	DWORD InitDevice(SpReqAnsContext<AccessAuthService_InitDev_Req, AccessAuthService_InitDev_Ans>::Pointer& ctx);
 	void GetNetMsg(SpReqAnsContext<AccessAuthService_GetNetMsg_Req, AccessAuthService_GetNetMsg_Ans>::Pointer& ctx);
+	void CloseTempWindow(SpReqAnsContext<AccessAuthService_CloseTempWindow_Req, AccessAuthService_CloseTempWindow_Ans>::Pointer& ctx);
 	DWORD m_eErrNum;
 	CSimpleStringA m_strLastErrMsg;
 	CSimpleStringA m_strUserID, m_strPassword, m_strInitUrl;

Module/mod_healthmanager/mod_healthmanager.cpp

@@ -1960,6 +1960,8 @@ void CHealthManagerEntity::OnLog(const CAutoArray<CUUID>& SubIDs, const CUUID nL
 
 		CSimpleStringA msg(true);
 		GetFunction()->GetSysVar("AuthErrMsg", msg);
+		Dbg("AuthErrMsg 在healthmanager的内容是： %s.", msg.GetData());
+
 		if (msg.GetLength() != 0)
 		{
 			StartManagerDesktopPage("warnPrompt.html");

addin/res/ManagerDesktop/js/entityService.js

@@ -471,12 +471,14 @@ var AccessAuthService = {
     },
     _methodID : {
         InitializeNew: 4,
-        GetNetMsg: 6
+        GetNetMsg: 6,
+        CloseTempWindow:7,
     },
             
     _methodSignature :{
         InitializeNew: 1851143282,
         GetNetMsg: 62776855,
+        CloseTempWindow: 1864857265
     },
     init:function(){
         //start session
@@ -512,6 +514,18 @@ var AccessAuthService = {
             callback(jsondata);
         });
     },
+    CloseTempWindow: function(req,callback){
+        req.entity = this._serviceBase.entityName;
+		req.class = this._serviceBase.className;
+		req.methodID = this._methodID.CloseTempWindow;
+        req.signature = this._methodSignature.CloseTempWindow;
+        console.log('CloseTempWindow startSession callback',req)
+
+		WebSocketBase.sendMsg(req, function(data) {
+            var jsondata = JSON.parse(data);
+            callback(jsondata);
+        });
+    },
 };
 
 //注册CenterSettingService
@@ -675,40 +689,6 @@ var HealthManagerService={
 };
 
 
-var ChromiumSrv={
-    _serviceBase:{
-        entityName : 'Chromium',
-        className : 'ChromiumSrv'
-    },
-    _methodID : {
-        CloseBrowser: 1,
-    },
-            
-    _methodSignature :{
-        CloseBrowser: -1561571899,
-    },
-    init:function(){
-        //start session
-        var sessionMsg = new Session();
-        sessionMsg.entity = this._serviceBase.entityName;
-        sessionMsg.class = this._serviceBase.className;
-        WebSocketBase.startSession(sessionMsg, function() {
-            logEvent("Chromium startSession callback");
-        });
-    },
-    CloseBrowser:function(req,callback){
-        req.entity = this._serviceBase.entityName;
-		req.class = this._serviceBase.className;
-		req.methodID = this._methodID.CloseBrowser;
-		req.signature = this._methodSignature.CloseBrowser;
-		WebSocketBase.sendMsg(req, function(data) {
-            var jsondata = JSON.parse(data);
-            callback(jsondata);
-        });
-    }
-
-};
-
 //注册DeviceService
 var DeviceService= {
     _eventCode:{

addin/res/ManagerDesktop/js/getTerminalInfo.js

@@ -208,16 +208,15 @@ function chromiumClose(){
 		// req.command = 'ChromiumClose';
 		// sendRequest(req); 
 	let req = new Request()
-	req.type = "SpecialPageFromOtherEntity";
-	req.name = "tempMessage";
+	req.windowType = 1
 	let timeoutFn= setTimeout(function(){
 		let tips = '请求超时'
 		ModalPrompt(tips, 'pathN')
 	},60000)
 		
-	ChromiumSrv.CloseBrowser(req, function(ret) {
-		logEvent("CloseBrowser ret: "+JSON.stringify(ret));
-		console.log("CloseBrowser ret: "+JSON.stringify(ret));
+	AccessAuthService.CloseTempWindow(req, function(ret) {
+		logEvent("CloseTempWindow ret: "+JSON.stringify(ret));
+		console.log("CloseTempWindow ret: "+JSON.stringify(ret));
 		if(ret){
 			clearTimeout(timeoutFn);
 		}