Merge pull request #12 from libxengine/develop

V3.1.0.1001 Merge

CHANGELOG

@@ -1,3 +1,67 @@
+XEngine_Authorize V3.1.0.1001
+
+添加:删除TOKEN会话功能
+添加:更新会话TOKEN时间功能
+添加:HTTP管理端支持自动刷新
+添加:HTTP管理客户端的登录功能
+添加:TOKEN功能的支持
+添加:http快速验证功能
+添加:http解析和打包协议到协议模块
+修改:移动TCP协议处理代码到HTTP用户处理中
+修改:分割序列号和客户端管理器接口到单独文件
+修改:modify:Protocol_Packet_SendPkt 名称到 Protocol_Packet_HDRComm function
+修改:发送消息函数的参数
+修改:移动用户协议到用户文件从客户端代码
+修改:HTTPPOST和GET任务区别
+修改:统一错误定义
+修改:HTTP的API请求TOKEN验证
+修改:支持仅仅展示在线客户端了
+修改:禁用HTTP重复登录
+修改:登录必须填写设备类型了
+修复:用户注册结构不正确的问题
+修复:分钟不支持快速验证的问题
+修复:HTTP管理端刷新客户端列表在线程中崩溃的问题
+修复:打包客户端列表协议崩溃
+修复:获取客户端列表时间不正确的问题
+修复:超时通知不正确的问题
+修复:验证客户端重读登录的问题
+优化:TCP登录代码
+删除:重复的打包和解析websocket协议代码
+删除:没有使用的websocket任务代码
+删除:无用的代码
+删除:HTTP登录代码
+
+added:close token msg send server
+added:update session token time
+added:auto flush user list
+added:http management client login support
+added:token function support
+added:fast ver for http protocol
+added:http parse and packet protocol for protocol module
+modify:move tcp protocol process code to http user cpp
+modify:Split serial and client management interface into separate files
+modify:Protocol_Packet_SendPkt to Protocol_Packet_HDRComm function
+modify:Parameters of the send message function
+modify:move user protocol to user file from client file
+modify:http task distinguishes between post and get
+modify:error define
+modify:http api required token
+modify:only show online client now
+modify:Disable repeated HTTP user logins
+modify:must set enDeviceType when you login
+fixed:user register struct is incorrent
+fixed:minute not support fast ver
+fixed:the problem that flush list client crashed in thread
+fixed:packet client list is crashed
+fixed:get client list time is incorrent
+fixed:timeout notify send msg is failed
+fixed:auth client is repeat login
+improved:TCP login code
+delete:redundant packet and parse websocket code for protocol module
+delete:websocket task not use code
+delete:useless code
+delete:login for http
+======================================================================================
 XEngine_Authorize V3.0.0.1001PT
 
 添加:帮助模块

README.en.md

@@ -11,6 +11,9 @@ network verification support tcp and websocket protocol verification.it is means
 first open source C/C++ network authentication server, supporting various languages ​​and platforms for network authentication and authorization
 This is a cross-platform simple high-performance network authorization server that provides a complete demo code  
 
+#### Version difference
+V3 version, the protocol is basically reimplemented. It is no longer compatible with the V2 protocol. V3 is basically changed to the HTTP interface for management. The compatibility is better. Please check the documentation for more.  
+
 ## Software feature
 A simple and high-performance cross-platform network authentication and authorization server developed and implemented based on XEngine  
 feature list:  
@@ -64,11 +67,9 @@ address:app.xyry.org or 159.75.200.173
 port :tcp port 5300,websocket port 5301,Transmission verification password: no encryption
 
 ## Screenshot of the program
-![输入图片说明](https://www.xyry.org/authorize/1.png "在这里输入图片标题")
-![输入图片说明](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 "在这里输入图片标题")
+![输入图片说明](https://www.xyry.org/XEngine_StructPic/authorize/1.png "在这里输入图片标题")
+![输入图片说明](https://www.xyry.org/XEngine_StructPic/authorize/2.png "在这里输入图片标题")
+![输入图片说明](https://www.xyry.org/XEngine_StructPic/authorize/3.png "在这里输入图片标题")
 
 ## Participate in contribution
 

README.md

@@ -11,6 +11,9 @@ c c++network Authorize service
 全国首款开源C/C++ 网络验证服务器,支持各种语言各种平台进行网络验证和授时服务  
 这是一个跨平台简单高性能网络授权服务器,提供了完整的演示代码  
 
+#### 版本区别
+V3版本后协议基本重新实现,不在兼容V2协议,V3基本改为HTTP接口进行管理.兼容性更好.请查看文档获取更多.  
+
 ## 软件特性
 基于XEngine开发并实现的一套简洁高性能跨平台网络验证授权服务器  
 软件特性:  
@@ -64,11 +67,9 @@ make FLAGS=CleanAll 清理编译
 端口:tcp端口 5300,websocket端口 5301,传输验证密码:无加密
 
 ## 程序截图
-![输入图片说明](https://www.xyry.org/authorize/1.png "在这里输入图片标题")
-![输入图片说明](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 "在这里输入图片标题")
+![输入图片说明](https://www.xyry.org/XEngine_StructPic/authorize/1.png "在这里输入图片标题")
+![输入图片说明](https://www.xyry.org/XEngine_StructPic/authorize/2.png "在这里输入图片标题")
+![输入图片说明](https://www.xyry.org/XEngine_StructPic/authorize/3.png "在这里输入图片标题")
 
 ## 参与贡献
 
@@ -88,8 +89,8 @@ make FLAGS=CleanAll 清理编译
 如果你有问题,可以在issues中提交
 
 ## 开发计划 
-重新设计界面版本,服务使用跨平台,管理端使用接口  
 mfc转qt界面库(我们需要会Qt的人员加入一起开发)  
+支持多端登录  
 生成会话TOKEN分布式鉴权  
 支持OAuth验证  
 mysql支持  

XEngine_Apps/Authorize_APPClient.sln

@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31410.357
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32804.467
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_APPClient", "Authorize_APPClient\Authorize_APPClient.vcxproj", "{4F263EAF-A748-46AF-A10E-8A25626E0571}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_APPLocal", "Authorize_APPLocal\Authorize_APPLocal.vcxproj", "{82D0E5EB-42B7-4A68-9896-20146F13E91E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -23,14 +21,6 @@ Global
 		{4F263EAF-A748-46AF-A10E-8A25626E0571}.Release|x64.Build.0 = Release|x64
 		{4F263EAF-A748-46AF-A10E-8A25626E0571}.Release|x86.ActiveCfg = Release|Win32
 		{4F263EAF-A748-46AF-A10E-8A25626E0571}.Release|x86.Build.0 = Release|Win32
-		{82D0E5EB-42B7-4A68-9896-20146F13E91E}.Debug|x64.ActiveCfg = Debug|x64
-		{82D0E5EB-42B7-4A68-9896-20146F13E91E}.Debug|x64.Build.0 = Debug|x64
-		{82D0E5EB-42B7-4A68-9896-20146F13E91E}.Debug|x86.ActiveCfg = Debug|Win32
-		{82D0E5EB-42B7-4A68-9896-20146F13E91E}.Debug|x86.Build.0 = Debug|Win32
-		{82D0E5EB-42B7-4A68-9896-20146F13E91E}.Release|x64.ActiveCfg = Release|x64
-		{82D0E5EB-42B7-4A68-9896-20146F13E91E}.Release|x64.Build.0 = Release|x64
-		{82D0E5EB-42B7-4A68-9896-20146F13E91E}.Release|x86.ActiveCfg = Release|Win32
-		{82D0E5EB-42B7-4A68-9896-20146F13E91E}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE