Merge pull request #8 from libxengine/develop

V2.7.1.1001 Merge
libxengine · Jun 2, 2022 · b4e7938 · b4e7938
2 parents 97e5118 + e8bc449
commit b4e7938
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,11 @@
+XEngine_Authorize V2.7.1.1001
+
+修正:读取CDKEY失败的问题
+删除:无用的代码
+
+fixed:read cdkey is incorrent
+delete:unused code
+======================================================================================
 XEngine_Authorize V2.7.0.1001
 
 添加:界面程序增加了用户在线和离线状态栏

diff --git a/README.en.md b/README.en.md
@@ -64,6 +64,7 @@ port :tcp port 5300,websocket port 5301,Transmission verification password: no e
 ![输入图片说明](https://www.xyry.org/authorize/2.png "在这里输入图片标题")
 ![输入图片说明](https://www.xyry.org/authorize/3.png "在这里输入图片标题")
 ![输入图片说明](https://www.xyry.org/authorize/4.png "在这里输入图片标题")
+![输入图片说明](https://www.xyry.org/authorize/5.png "在这里输入图片标题")
 
 ## Participate in contribution
 

diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ make FLAGS=CleanAll 清理编译
 ![输入图片说明](https://www.xyry.org/authorize/2.png "在这里输入图片标题")
 ![输入图片说明](https://www.xyry.org/authorize/3.png "在这里输入图片标题")
 ![输入图片说明](https://www.xyry.org/authorize/4.png "在这里输入图片标题")
+![输入图片说明](https://www.xyry.org/authorize/5.png "在这里输入图片标题")
 
 ## 参与贡献
 

diff --git a/XEngine_Apps/Authorize_APPLocal/Authorize_APPLocal.cpp b/XEngine_Apps/Authorize_APPLocal/Authorize_APPLocal.cpp
@@ -26,7 +26,7 @@ LPCTSTR lpszFile = _T("D:\\XEngine_Authorize\\XEngine_Apps\\Debug\\XEngine_Autho
 LPCTSTR lpszFile = _T("XEngine_Authorize.key");
 #endif
 
-#define _ENCRYPTO
+//#define _ENCRYPTO
 
 int main()
 {
@@ -56,12 +56,6 @@ int main()
 
 	strcpy(st_AuthLocal.st_AuthUserInfo.tszUserName, "XEngine");
 	strcpy(st_AuthLocal.st_AuthUserInfo.tszUserContact, "[email protected]");
-
-#if XENGINE_VERSION_BIT <= 7310001001
-	//7.30版本必须填充
-	_tcscpy(st_AuthLocal.st_AuthUserInfo.tszCustom, "none");
-	Authorize_Local_BuildKeyTime(&st_AuthLocal, 5);
-#endif
 	//生成完毕后可以交给服务端来对key本地验证进行授权
 	if (!Authorize_Local_WriteKey(lpszFile, &st_AuthLocal))
 	{

diff --git a/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/CDialog_Local.cpp b/XEngine_Source/XEngine_APPService/XEngine_AuthorizeApp/Authorize_Dialog/CDialog_Local.cpp
@@ -91,10 +91,10 @@ void CDialog_Local::OnBnClickedButton2()
 {
 	// TODO: 在此添加控件通知处理程序代码
 	CString m_StrPass;
-	UCHAR tszEnBuffer[2048];
-	TCHAR tszDeBuffer[2048];
 	XENGINE_AUTHORIZE_LOCAL st_AuthLocal;
 
+	memset(&st_AuthLocal, '\0', sizeof(XENGINE_AUTHORIZE_LOCAL));
+
 	m_EditPass.GetWindowText(m_StrPass);
 	m_BtnKeySave.EnableWindow(FALSE);
 
@@ -106,12 +106,14 @@ void CDialog_Local::OnBnClickedButton2()
 	CString m_StrFile = m_FileDlg.GetPathName();
 	m_EditKeyFile.SetWindowText(m_StrFile);
 
-	memset(tszDeBuffer, '\0', sizeof(tszDeBuffer));
-	memset(tszEnBuffer, '\0', sizeof(tszEnBuffer));
-	memset(&st_AuthLocal, '\0', sizeof(XENGINE_AUTHORIZE_LOCAL));
-
 	if (!m_StrPass.IsEmpty())
 	{
+		UCHAR tszEnBuffer[2048];
+		TCHAR tszDeBuffer[2048];
+
+		memset(tszDeBuffer, '\0', sizeof(tszDeBuffer));
+		memset(tszEnBuffer, '\0', sizeof(tszEnBuffer));
+
 		FILE* pSt_File = fopen(m_StrFile.GetBuffer(), "rb");
 		if (NULL == pSt_File)
 		{

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