modify:adjust st_XToken location

Author: xengine-qyt

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -24,8 +24,12 @@
             "tszKeyPass":"123123qa"
         },
         "st_PassCrypto":{
-            "bEnable":false,
+            "bEnable":true,
             "nCodec":2
+        },
+        "st_XToken":{
+            "bAutoRenewal":false,
+            "nRenewalTime":-1
         }   
     },
     "XLogin":{
@@ -42,10 +46,6 @@
             "bTime":true,
             "bDay":false,
             "bCustom":false
-        },
-        "st_XToken":{
-            "bAutoRenewal":false,
-            "nRenewalTime":-1
         }
     },
     "XCrypto":{

XEngine_Source/AuthorizeModule_Configure/Config_Define.h

@@ -43,6 +43,11 @@ typedef struct
 			bool bEnable;                                   //是否启用
 			int nCodec;                                     //加密方法:ENUM_XENGINE_OPENSSL_DIGEST
 		}st_PassCrypto;
+		struct
+		{
+			bool bAutoRenewal;                              //自动续期
+			int nRenewalTime;                               //续期次数
+		}st_XToken;
 		int nCheckTimeNumber;                               //检测次数
 		int nCheckTimeout;                                  //超时时间
 		int nTokenTimeout;                                  //TOKEN登录超时时间
@@ -71,11 +76,6 @@ typedef struct
 			bool bTime;
 			bool bCustom;                                   
 		}st_MulitLogin;
-		struct  
-		{
-			bool bAutoRenewal;
-			int nRenewalTime;
-		}st_XToken;
 	}st_XLogin;
 	struct  
 	{

XEngine_Source/AuthorizeModule_Configure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

@@ -87,7 +87,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->bDeamon = st_JsonRoot["bDeamon"].asBool();
 	pSt_ServerConfig->bTimeNotify = st_JsonRoot["bTimeNotify"].asBool();
 	//最大配置
-	if (st_JsonRoot["XMax"].empty() || (6 != st_JsonRoot["XMax"].size()))
+	if (st_JsonRoot["XMax"].empty() || (7 != st_JsonRoot["XMax"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_AUTHORIZE_MODULE_CONFIGURE_XMAX;
@@ -120,8 +120,11 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 
 	pSt_ServerConfig->st_XVerification.st_PassCrypto.bEnable = st_JsonXVerification["st_PassCrypto"]["bEnable"].asBool();
 	pSt_ServerConfig->st_XVerification.st_PassCrypto.nCodec = st_JsonXVerification["st_PassCrypto"]["nCodec"].asInt();
+
+	pSt_ServerConfig->st_XVerification.st_XToken.bAutoRenewal = st_JsonXVerification["st_XToken"]["bAutoRenewal"].asBool();
+	pSt_ServerConfig->st_XVerification.st_XToken.nRenewalTime = st_JsonXVerification["st_XToken"]["nRenewalTime"].asInt();
 	//登录配置
-	if (st_JsonRoot["XLogin"].empty() || (6 != st_JsonRoot["XLogin"].size()))
+	if (st_JsonRoot["XLogin"].empty() || (5 != st_JsonRoot["XLogin"].size()))
 	{
 		Config_IsErrorOccur = true;
 		Config_dwErrorCode = ERROR_AUTHORIZE_MODULE_CONFIGURE_XVER;
@@ -142,10 +145,6 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->st_XLogin.st_MulitLogin.bDay = st_JsonMulitLogin["bDay"].asBool();
 	pSt_ServerConfig->st_XLogin.st_MulitLogin.bSecond = st_JsonMulitLogin["bSecond"].asBool();
 	pSt_ServerConfig->st_XLogin.st_MulitLogin.bTime = st_JsonMulitLogin["bTime"].asBool();
-
-	Json::Value st_JsonXToken = st_JsonXLogin["st_XToken"];
-	pSt_ServerConfig->st_XLogin.st_XToken.bAutoRenewal = st_JsonXToken["bAutoRenewal"].asBool();
-	pSt_ServerConfig->st_XLogin.st_XToken.nRenewalTime = st_JsonXToken["nRenewalTime"].asInt();
 	//加密配置
 	if (st_JsonRoot["XCrypto"].empty() || (2 != st_JsonRoot["XCrypto"].size()))
 	{

XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/Authorize_Task.cpp

@@ -69,18 +69,18 @@ void CALLBACK XEngine_TaskEvent_Token(XNETHANDLE xhToken, XPVOID lParam)
 
 	Session_Token_Get(xhToken, &st_UserTable);
 	//自动续期?
-	if (st_AuthConfig.st_XLogin.st_XToken.bAutoRenewal)
+	if (st_AuthConfig.st_XVerification.st_XToken.bAutoRenewal)
 	{
 		int nRenewalTime = 0;
 		Session_Token_RenewalTime(xhToken, &nRenewalTime);
 
-		if (-1 == st_AuthConfig.st_XLogin.st_XToken.nRenewalTime)
+		if (-1 == st_AuthConfig.st_XVerification.st_XToken.nRenewalTime)
 		{
 			bRemove = false;
 		}
 		else 
 		{
-			if (nRenewalTime <= st_AuthConfig.st_XLogin.st_XToken.nRenewalTime)
+			if (nRenewalTime <= st_AuthConfig.st_XVerification.st_XToken.nRenewalTime)
 			{
 				bRemove = false;
 			}