Merge pull request #22 from libxengine/develop

xengine-qyt · web-flow · commit b6a59d8addb3 · 2023-11-10T17:48:34.000+08:00
V3.9.1.1001 Merge
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,15 @@
+XEngine_Authorize V3.9.1.1001
+
+修改:管理程序禁用了天数卡生成选项
+修正:删除用户崩溃的问题
+修正:管理程序无法生成自定义序列号的问题
+删除:http验证超时时间配置
+
+modify:management disable to day serial generate
+fixed:crashed when delete user
+fixed:not custom serial for management app
+delete:http auth time in configure
+================================================================
 XEngine_Authorize V3.9.0.1001
 
 优化:管理程序的用户列表刷新代码
diff --git a/XEngine_Docment/Docment_en.docx b/XEngine_Docment/Docment_en.docx
diff --git a/XEngine_Docment/Docment_zh.docx b/XEngine_Docment/Docment_zh.docx
diff --git a/XEngine_Release/XEngine_Config/XEngine_Config.json b/XEngine_Release/XEngine_Config/XEngine_Config.json
@@ -24,8 +24,7 @@
     "XLogin":{
         "bHTTPAuth":false,
         "bPassAuth":false,
-        "nHTTPAuthTime":10,
-        "nMultiMode":2,
+        "nMultiMode":0,
         "st_PassUrl":{
             "tszPassLogin":"http://127.0.0.1:5303/auth/pass/login",
             "tszPassLogout":"http://127.0.0.1:5303/auth/pass/logout",
@@ -52,6 +51,7 @@
         "LogLeave":32
     },
     "XVer":[
+        "V3.9.1.1001 Build20231110",
         "V3.9.0.1001 Build20231110",
         "V3.8.0.1001 Build20230811",
         "V3.7.0.1001 Build20230421",
diff --git a/XEngine_Source/AuthorizeModule_Configure/Config_Define.h b/XEngine_Source/AuthorizeModule_Configure/Config_Define.h
@@ -43,7 +43,6 @@ typedef struct
 	{
 		bool bHTTPAuth;                                     //是否开启HTTP授权登录,支持HTTP授权验证
 		bool bPassAuth;                                     //是否启用三方认证
-		int nHTTPAuthTime;                                  //HTTP验证超时时间,单位秒
 		int nMultiMode;                                     //多端登录模式,0按照平台(PC,WEB,PAD,PHONE 4种),1按照类型(每种都可以)
 		struct  
 		{
diff --git a/XEngine_Source/AuthorizeModule_Configure/ModuleConfigure_Json/ModuleConfigure_Json.cpp b/XEngine_Source/AuthorizeModule_Configure/ModuleConfigure_Json/ModuleConfigure_Json.cpp
@@ -116,7 +116,7 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	pSt_ServerConfig->st_XVerification.nTryTime = st_JsonXVerification["nTryTime"].asInt();
 	pSt_ServerConfig->st_XVerification.nTryMode = st_JsonXVerification["nTryMode"].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;
@@ -125,7 +125,6 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
 	Json::Value st_JsonXLogin = st_JsonRoot["XLogin"];
 	pSt_ServerConfig->st_XLogin.bHTTPAuth = st_JsonXLogin["bHTTPAuth"].asBool();
 	pSt_ServerConfig->st_XLogin.bPassAuth = st_JsonXLogin["bPassAuth"].asBool();
-	pSt_ServerConfig->st_XLogin.nHTTPAuthTime = st_JsonXLogin["nHTTPAuthTime"].asInt();
 	pSt_ServerConfig->st_XLogin.nMultiMode = st_JsonXLogin["nMultiMode"].asInt();
 
 	Json::Value st_JsonXLoginUrl = st_JsonXLogin["st_PassUrl"];
diff --git a/XEngine_Source/AuthorizeModule_Session/Session_Define.h b/XEngine_Source/AuthorizeModule_Session/Session_Define.h
@@ -205,17 +205,12 @@ extern "C" bool Session_Token_Destroy();
   类型：数据结构指针
   可空：N
   意思：用户信息表
- 参数.三：nTimeout
-  In/Out：In
-  类型：整数型
-  可空：Y
-  意思：大于0单独指定TOKEN超时时间
 返回值
   类型：逻辑型
   意思：是否允许登陆
 备注：
 *********************************************************************/
-extern "C" bool Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE* pSt_UserTable, int nTimeout = 0);
+extern "C" bool Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE* pSt_UserTable);
 /********************************************************************
 函数名称：Session_Token_Delete
 函数功能：移除一个客户端
diff --git a/XEngine_Source/AuthorizeModule_Session/Session_Token/Session_Token.cpp b/XEngine_Source/AuthorizeModule_Session/Session_Token/Session_Token.cpp
@@ -107,17 +107,12 @@ bool CSession_Token::Session_Token_Destroy()
   类型：数据结构指针
   可空：N
   意思：用户信息表
- 参数.三：nTimeout
-  In/Out：In
-  类型：整数型
-  可空：Y
-  意思：大于0单独指定TOKEN超时时间
 返回值
   类型：逻辑型
   意思：是否允许登陆
 备注：
 *********************************************************************/
-bool CSession_Token::Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE* pSt_UserTable, int nTimeout /* = 0 */)
+bool CSession_Token::Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE* pSt_UserTable)
 {
     Session_IsErrorOccur = false;
 
@@ -130,7 +125,6 @@ bool CSession_Token::Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE*
     AUTHSESSION_TOKENCLIENT st_TokenClient;
     memset(&st_TokenClient,'\0',sizeof(AUTHSESSION_TOKENCLIENT));
 
-    st_TokenClient.nOnlineTime = nTimeout;
     BaseLib_OperatorTime_GetSysTime(&st_TokenClient.st_LibTimer);
     memcpy(&st_TokenClient.st_UserTable, pSt_UserTable, sizeof(AUTHREG_USERTABLE));
 
diff --git a/XEngine_Source/AuthorizeModule_Session/Session_Token/Session_Token.h b/XEngine_Source/AuthorizeModule_Session/Session_Token/Session_Token.h
@@ -14,7 +14,6 @@ typedef struct
 {
 	AUTHREG_USERTABLE st_UserTable;                                       //用户表
 	XENGINE_LIBTIMER st_LibTimer;                                         //登录时间结构
-	__int64x nOnlineTime;                                                 //在线时间
     int nTimeout;                                                         //单独指定超时
 }AUTHSESSION_TOKENCLIENT, * LPAUTHSESSION_TOKENCLIENT;
 //////////////////////////////////////////////////////////////////////////
@@ -26,7 +25,7 @@ class CSession_Token
 public:
     bool Session_Token_Init(int nTimeout, CALLBACK_XENGIEN_AUTHORIZE_SESSION_TOKEN_EVENTS fpCall_AuthEvent, XPVOID lParam = NULL);
     bool Session_Token_Destroy();
-    bool Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE* pSt_UserTable, int nTimeout = 0);
+    bool Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE* pSt_UserTable);
     bool Session_Token_Delete(XNETHANDLE xhToken);
     bool Session_Token_UPDate(XNETHANDLE xhToken);
     bool Session_Token_Get(XNETHANDLE xhToken, AUTHREG_USERTABLE* pSt_UserTable = NULL);
diff --git a/XEngine_Source/AuthorizeModule_Session/pch.cpp b/XEngine_Source/AuthorizeModule_Session/pch.cpp
@@ -70,9 +70,9 @@ extern "C" bool Session_Token_Destroy()
 {
 	return m_SessionToken.Session_Token_Destroy();
 }
-extern "C" bool Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE * pSt_UserTable, int nTimeout)
+extern "C" bool Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE * pSt_UserTable)
 {
-	return m_SessionToken.Session_Token_Insert(xhToken, pSt_UserTable, nTimeout);
+	return m_SessionToken.Session_Token_Insert(xhToken, pSt_UserTable);
 }
 extern "C" bool Session_Token_Delete(XNETHANDLE xhToken)
 {
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_Serial.cpp
@@ -60,7 +60,7 @@ BOOL CDialog_Serial::OnInitDialog()
 	m_ListSerial.InsertColumn(5, _T("创建日期"), LVCFMT_LEFT, 120);
 	m_ListSerial.SetExtendedStyle(LVS_EX_FULLROWSELECT);
 
-	for (int i = 0; i < 4; i++)
+	for (int i = 0; i < 5; i++)
 	{
 		m_ComboSerialType.InsertString(i, lpszXSerialType[i]);
 	}
@@ -182,6 +182,11 @@ void CDialog_Serial::OnBnClickedButton1()
 void CDialog_Serial::OnBnClickedButton2()
 {
 	// TODO: 在此添加控件通知处理程序代码
+	if (2 == m_ComboSerialType.GetCurSel())
+	{
+		AfxMessageBox(_T("生成失败,天数卡暂时不支持"));
+		return;
+	}
 	CString m_StrIPAddr;
 	CString m_StrIPPort;
 	CString m_StrToken;
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/Dialog_User.cpp
@@ -302,7 +302,7 @@ void CDialog_User::OnBnClickedButton3()
 
 	TCHAR tszUrlAddr[MAX_PATH];
 	memset(tszUrlAddr, '\0', MAX_PATH);
-	_xstprintf(tszUrlAddr, _T("http://%s:%s/auth/client/delete"), m_StrIPAddr.GetBuffer(), m_StrIPPort.GetBuffer());
+	_xstprintf(tszUrlAddr, _T("http://%s:%s/auth/user/delete"), m_StrIPAddr.GetBuffer(), m_StrIPPort.GetBuffer());
 
 	Json::Value st_JsonRoot;
 	Json::Value st_JsonObject;
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.aps b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.aps
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.rc b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/XEngineAuthorizeApp.rc
diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Get/AuthorizeHTTP_Token.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeService/AuthorizeHTTP_Get/AuthorizeHTTP_Token.cpp
@@ -102,7 +102,7 @@ bool XEngine_AuthorizeHTTP_Token(LPCXSTR lpszClientAddr, XCHAR** pptszList, int
 		{
 			BaseLib_OperatorHandle_Create(&xhToken);
 		}
-		Session_Token_Insert(xhToken, &st_UserTable, st_UserTable.st_UserInfo.nUserLevel > 0 ? st_AuthConfig.st_XLogin.nHTTPAuthTime : 0);
+		Session_Token_Insert(xhToken, &st_UserTable);
 		Protocol_Packet_HttpToken(tszSDBuffer, &nSDLen, xhToken, st_AuthConfig.st_XVerification.nTokenTimeout);
 		XEngine_Client_TaskSend(lpszClientAddr, tszSDBuffer, nSDLen, XENGINE_AUTH_APP_NETTYPE_HTTP);
 		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("HTTP客户端:%s,请求登录获得TOKEN:%lld 成功,用户级别:%d"), lpszClientAddr, xhToken, st_UserTable.st_UserInfo.nUserLevel);

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ typedef struct`
`43`	`43`	`{`
`44`	`44`	`bool bHTTPAuth; //是否开启HTTP授权登录,支持HTTP授权验证`
`45`	`45`	`bool bPassAuth; //是否启用三方认证`
`46`		`- int nHTTPAuthTime; //HTTP验证超时时间,单位秒`
`47`	`46`	`int nMultiMode; //多端登录模式,0按照平台(PC,WEB,PAD,PHONE 4种),1按照类型(每种都可以)`
`48`	`47`	`struct`
`49`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ extern "C" bool Session_Token_Destroy()`
`70`	`70`	`{`
`71`	`71`	`return m_SessionToken.Session_Token_Destroy();`
`72`	`72`	`}`
`73`		`-extern "C" bool Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE * pSt_UserTable, int nTimeout)`
	`73`	`+extern "C" bool Session_Token_Insert(XNETHANDLE xhToken, AUTHREG_USERTABLE * pSt_UserTable)`
`74`	`74`	`{`
`75`		`- return m_SessionToken.Session_Token_Insert(xhToken, pSt_UserTable, nTimeout);`
	`75`	`+ return m_SessionToken.Session_Token_Insert(xhToken, pSt_UserTable);`
`76`	`76`	`}`
`77`	`77`	`extern "C" bool Session_Token_Delete(XNETHANDLE xhToken)`
`78`	`78`	`{`