#IQRV #comment [AccessAuth] 修改准入的部分描述

Module/mod_accessauth/AccessAuthConn.cpp

@@ -1391,11 +1391,14 @@ DWORD CAccessAuthConn::HandleTimeSyn(int nTimeDiff,BYTE nAuthVersion,BYTE* nSess
 	if (((CAccessAuthEntity*)m_pEntity)->SaveAuthVerAndKey(nAuthVersion, nSessionKey)) return Error_Succeed;
 	return Error_Unexpect;
 }
-DWORD CAccessAuthConn::HandleLockState(int nState) {
+DWORD CAccessAuthConn::HandleLockState(int nState)
+{
+	Dbg("%s:lock state: %d", __FUNCTION__, nState);
 
+    DWORD rc = Error_Succeed;
 	//设置系统变量LockState, 0，正常；1，锁定；2，罚出；(准入服务返回，6:罚出 7：锁定)
 	CSmartPointer<IEntityFunction> spFunction = m_pEntity->GetFunction();
-	DWORD rc = Error_Succeed;
+
 	if (6 == nState)
 	{
 		rc = spFunction->SetSysVar("LockState", "2", true);
@@ -1406,6 +1409,7 @@ DWORD CAccessAuthConn::HandleLockState(int nState) {
 		rc = spFunction->SetSysVar("LockState", "1", true);
 		((CAccessAuthEntity*)m_pEntity)->SetAuthErrMsg("终端已锁定");
 	}
+
 	return rc;
 }
 DWORD CAccessAuthConn::HandleGetToken(BYTE* enToken1, BYTE* sharedKey, BYTE* enToken2, BYTE* retHash) {

Module/mod_accessauth/AccessAuthFSM.cpp

@@ -69,6 +69,7 @@ ErrorCodeEnum CAccessAuthFSM::SecureClientConnect()
 		return Error_Succeed;
 
 	SecureClientRelease();
+
 	return Error_PeerReject;
 }
 
@@ -332,8 +333,10 @@ struct LockStateTask : ITaskSp {
 				SAFE_DELETE_HTTPCLIENT(client);
 				return;
 			}
-			Dbg("lock stat:%s", lockStateRet.data.lockState.c_str());
-			DWORD rc = m_fsm->m_pConnection->HandleLockState(atoi(lockStateRet.data.lockState.c_str()));
+			Dbg("handle lock state..");
+			const int lockState = atoi(lockStateRet.data.lockState.c_str());
+			Dbg("lock stat:%s|%d", lockStateRet.data.lockState.c_str(), lockState);
+			DWORD rc = m_fsm->m_pConnection->HandleLockState(lockState);
 			if (rc == Error_Succeed) {
 				Dbg("lockStateTask HandleLockState Success");
 			}
@@ -713,7 +716,7 @@ void CAccessAuthFSM::s2_on_entry()
 		if ((rc = SecureClientConnect()) != Error_Succeed)
 		{
 			// 启动定时器尝试重试
-			doWarnMsg(ERR_ACCESSAUTH_CONNECT_SERVER, GetOutPutStr("%s%08X", "请先检查网络是否连通，如果网络连通则检查集中配置是否正常。", rc).c_str(),true);
+			doWarnMsg(ERR_ACCESSAUTH_CONNECT_SERVER, GetOutPutStr("%s%08X", "连接分行服务失败，请检查网络连通情况或检查集中配置内容是否正常", rc).c_str(),true);
 			ScheduleTimer(1, 8000);
 			return;
 		}
@@ -751,7 +754,7 @@ unsigned int CAccessAuthFSM::s2_on_event(FSMEvent* pEvent)
 				if (rc != Error_Succeed)
 				{
 					// 启动定时器尝试重试
-					doWarnMsg(ERR_ACCESSAUTH_CONNECT_SERVER, GetOutPutStr("%s%08X", "请先检查网络是否连通，如果网络连通则检查集中配置是否正常。", rc).c_str(),true);
+					doWarnMsg(ERR_ACCESSAUTH_CONNECT_SERVER, GetOutPutStr("%s%08X", "连接分行服务失败，请检查网络连通情况或检查集中配置内容是否正常", rc).c_str(),true);
 					ScheduleTimer(1, 8000);
 					return 1;
 				}