Skip to content

Commit ce73426

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #23 from libxengine/develop
V3.10.0.1001 Merge
2 parents b6a59d8 + 434c040 commit ce73426

File tree

75 files changed

+2341
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+2341
-138
lines changed

‎CHANGELOG‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
XEngine_Authorize V3.10.0.1001
2+
3+
增加:临时验证超时时间字段支持
4+
增加:临时验证TOKEN权限检查
5+
增加:临时验证增加管理代码,支持枚举,删除和修改
6+
增加:编译选项支持客户端链接和客户端临时验证
7+
增加:验证客户端模块,支持网络授权和临时试用
8+
修正:超时时间一直为1的问题
9+
修正:超时时间处理不正确的问题
10+
修正:试用时间类型不正确并且修改过期时间
11+
修正:试用删除数据库语法错误
12+
修正:临时验证过期时间计算方法不正确
13+
14+
added:temp ver left time field supported
15+
added:temporary verification token ver supported
16+
added:mangement code for temporary verification
17+
added:build switch supported and added client connect and temp ver supported
18+
added:auth client module
19+
fixed:The remaining time after timeout is 1
20+
fixed:try type time handle is incorrent
21+
fixed:try time type is incorrent and modify to left time
22+
fixed:try delete sql syntax is incorrent
23+
fixed:temp ver left time cal is incorrent
24+
================================================================
125
XEngine_Authorize V3.9.1.1001
226

327
修改:管理程序禁用了天数卡生成选项

‎README.en.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ After modification, directly copy the database to the new version to overwrite,
125125
Use this software must be open source and indicate the source,If you want closed source and commercial,Then need to be authorized by the author.
126126

127127
## Follow us
128-
If you think this software is helpful to you, please give us a START
128+
If you think this software is helpful to you, please give us a START
129+
and wechat qr scan to follow us
130+
![qrcode](https://www.xyry.org/qrcode.jpg)
129131

130132
## post issues
131133

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
c c++网络验证服务器 网络授权服务器
88
c c++network Authorize service
99
这是网络授权验证服务器的代码库,这个服务主要提供网络授权验证功能.支持本地和网络两种验证模式
10-
网络验证支持TCP和WEBSOCKET以及HTTP协议验证,也就是说,支持APP程序和WEB网页端
10+
网络验证支持TCP和WEBSOCKET验证,也就是说,支持APP程序和WEB网页端
1111
全国首款开源C/C++ 网络验证服务器,支持各种语言各种平台进行网络验证和授时服务
1212
这是一个跨平台简单高性能网络授权服务器,提供了完整的演示代码
1313

@@ -125,7 +125,9 @@ V3版本为全新版本,为了适应过多环境要求开发
125125
使用此软件必须开源并且注明出处,如果想闭源商用,那么需要经过作者授权.
126126

127127
## 关注我们
128-
如果你觉得这个软件对你有帮助,请你给我们一个START吧
128+
如果你觉得这个软件对你有帮助,请你给我们一个START吧
129+
也可以通过微信关注我们
130+
![qrcode](https://www.xyry.org/qrcode.jpg)
129131

130132
## 提交问题
131133

@@ -151,4 +153,5 @@ mysql支持
151153
支持绑定自定义内容
152154
自动售卡(支付宝,微信)
153155
MQTT协议支持,让你的嵌入式设备也用上授时验证
154-
支持三方验证(其他服务也可以发送验证请求给验证服务来做验证)
156+
支持三方验证(其他服务也可以发送验证请求给验证服务来做验证)
157+
优化第三方验证(密码系统的适配问题修改)

‎XEngine_Apps/Authorize_APPClient.e‎

-981 Bytes
Binary file not shown.

‎XEngine_Apps/Authorize_APPClient.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_APPClient", "Auth
77
EndProject
88
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_APPLocal", "Authorize_APPLocal\Authorize_APPLocal.vcxproj", "{767151F7-230E-431B-AC6D-683F19F43C13}"
99
EndProject
10+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_ClientModule", "Authorize_ClientModule\Authorize_ClientModule.vcxproj", "{82B923A9-2F4A-4784-A245-BAA6ABF5A358}"
11+
EndProject
1012
Global
1113
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1214
Debug|x64 = Debug|x64
@@ -31,6 +33,14 @@ Global
3133
{767151F7-230E-431B-AC6D-683F19F43C13}.Release|x64.Build.0 = Release|x64
3234
{767151F7-230E-431B-AC6D-683F19F43C13}.Release|x86.ActiveCfg = Release|Win32
3335
{767151F7-230E-431B-AC6D-683F19F43C13}.Release|x86.Build.0 = Release|Win32
36+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.ActiveCfg = Debug|x64
37+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.Build.0 = Debug|x64
38+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.ActiveCfg = Debug|Win32
39+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.Build.0 = Debug|Win32
40+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.ActiveCfg = Release|x64
41+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.Build.0 = Release|x64
42+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.ActiveCfg = Release|Win32
43+
{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.Build.0 = Release|Win32
3444
EndGlobalSection
3545
GlobalSection(SolutionProperties) = preSolution
3646
HideSolutionNode = FALSE

‎XEngine_Apps/Authorize_ClientModule/Authorize_ClientModule.cpp‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#ifdef _MSC_BUILD
2+
#include <Windows.h>
3+
#include <tchar.h>
4+
#pragma comment(lib,"Ws2_32.lib")
5+
#pragma comment(lib,"../../XEngine_Source/Debug/AuthorizeModule_Client")
6+
#endif
7+
#include <stdio.h>
8+
#include <stdlib.h>
9+
#include <string.h>
10+
#include <thread>
11+
using namespace std;
12+
#include <XEngine_Include/XEngine_CommHdr.h>
13+
#include "../../XEngine_Source/XAuth_BuildSwitch.h"
14+
#include "../../XEngine_Source/AuthorizeModule_Client/AuthClient_Define.h"
15+
#include "../../XEngine_Source/AuthorizeModule_Client/AuthClient_Error.h"
16+
17+
//Windows::vs2022 x86 debug 编译即可
18+
//Linux MACOS::g++ -std=c++17 -Wall -g Authorize_ClientModule.cpp -o Authorize_ClientModule.exe -L ../../XEngine_Release -lAuthorizeModule_Client -ljsoncpp
19+
20+
int main()
21+
{
22+
//插入查询
23+
LPCXSTR lpszTryInsert = _X("http://127.0.0.1:5302/auth/user/try");
24+
25+
if (AuthClient_HTTPVer_TryRequest(lpszTryInsert))
26+
{
27+
printf("ok\n");
28+
}
29+
else
30+
{
31+
printf("failed\n");
32+
}
33+
return 0;
34+
}

‎XEngine_Apps/Authorize_ClientModule/Authorize_ClientModule.vcxproj‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<VCProjectVersion>17.0</VCProjectVersion>
23+
<Keyword>Win32Proj</Keyword>
24+
<ProjectGuid>{82b923a9-2f4a-4784-a245-baa6abf5a358}</ProjectGuid>
25+
<RootNamespace>AuthorizeClientModule</RootNamespace>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
27+
</PropertyGroup>
28+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
30+
<ConfigurationType>Application</ConfigurationType>
31+
<UseDebugLibraries>true</UseDebugLibraries>
32+
<PlatformToolset>v143</PlatformToolset>
33+
<CharacterSet>Unicode</CharacterSet>
34+
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
36+
<ConfigurationType>Application</ConfigurationType>
37+
<UseDebugLibraries>false</UseDebugLibraries>
38+
<PlatformToolset>v143</PlatformToolset>
39+
<WholeProgramOptimization>true</WholeProgramOptimization>
40+
<CharacterSet>Unicode</CharacterSet>
41+
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
43+
<ConfigurationType>Application</ConfigurationType>
44+
<UseDebugLibraries>true</UseDebugLibraries>
45+
<PlatformToolset>v143</PlatformToolset>
46+
<CharacterSet>Unicode</CharacterSet>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
49+
<ConfigurationType>Application</ConfigurationType>
50+
<UseDebugLibraries>false</UseDebugLibraries>
51+
<PlatformToolset>v143</PlatformToolset>
52+
<WholeProgramOptimization>true</WholeProgramOptimization>
53+
<CharacterSet>Unicode</CharacterSet>
54+
</PropertyGroup>
55+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
56+
<ImportGroup Label="ExtensionSettings">
57+
</ImportGroup>
58+
<ImportGroup Label="Shared">
59+
</ImportGroup>
60+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
61+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
62+
</ImportGroup>
63+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
64+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65+
</ImportGroup>
66+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68+
</ImportGroup>
69+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
70+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71+
</ImportGroup>
72+
<PropertyGroup Label="UserMacros" />
73+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
74+
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
75+
</PropertyGroup>
76+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
77+
<ClCompile>
78+
<WarningLevel>Level3</WarningLevel>
79+
<SDLCheck>true</SDLCheck>
80+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81+
<ConformanceMode>true</ConformanceMode>
82+
</ClCompile>
83+
<Link>
84+
<SubSystem>Console</SubSystem>
85+
<GenerateDebugInformation>true</GenerateDebugInformation>
86+
</Link>
87+
</ItemDefinitionGroup>
88+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
89+
<ClCompile>
90+
<WarningLevel>Level3</WarningLevel>
91+
<FunctionLevelLinking>true</FunctionLevelLinking>
92+
<IntrinsicFunctions>true</IntrinsicFunctions>
93+
<SDLCheck>true</SDLCheck>
94+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
<ConformanceMode>true</ConformanceMode>
96+
</ClCompile>
97+
<Link>
98+
<SubSystem>Console</SubSystem>
99+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
100+
<OptimizeReferences>true</OptimizeReferences>
101+
<GenerateDebugInformation>true</GenerateDebugInformation>
102+
</Link>
103+
</ItemDefinitionGroup>
104+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
105+
<ClCompile>
106+
<WarningLevel>Level3</WarningLevel>
107+
<SDLCheck>true</SDLCheck>
108+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109+
<ConformanceMode>true</ConformanceMode>
110+
</ClCompile>
111+
<Link>
112+
<SubSystem>Console</SubSystem>
113+
<GenerateDebugInformation>true</GenerateDebugInformation>
114+
</Link>
115+
</ItemDefinitionGroup>
116+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
117+
<ClCompile>
118+
<WarningLevel>Level3</WarningLevel>
119+
<FunctionLevelLinking>true</FunctionLevelLinking>
120+
<IntrinsicFunctions>true</IntrinsicFunctions>
121+
<SDLCheck>true</SDLCheck>
122+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123+
<ConformanceMode>true</ConformanceMode>
124+
</ClCompile>
125+
<Link>
126+
<SubSystem>Console</SubSystem>
127+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
128+
<OptimizeReferences>true</OptimizeReferences>
129+
<GenerateDebugInformation>true</GenerateDebugInformation>
130+
</Link>
131+
</ItemDefinitionGroup>
132+
<ItemGroup>
133+
<ClCompile Include="Authorize_ClientModule.cpp" />
134+
</ItemGroup>
135+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
136+
<ImportGroup Label="ExtensionTargets">
137+
</ImportGroup>
138+
</Project>

‎XEngine_Apps/Authorize_ClientModule/Authorize_ClientModule.vcxproj.filters‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="源文件">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="头文件">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="资源文件">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ClCompile Include="Authorize_ClientModule.cpp">
19+
<Filter>源文件</Filter>
20+
</ClCompile>
21+
</ItemGroup>
22+
</Project>

‎XEngine_Apps/Authorize_ClientModule/Authorize_ClientModule.vcxproj.user‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
</Project>

‎XEngine_Apps/VSCopy_x86.bat‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,4 @@ copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_OPenSsl.dll" "./"
55
copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Socket.dll" "./"
66

77
copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_APIClient.dll" "./"
8-
copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
9-
10-
copy /y "%XEngine_Lib32%\XEngine_HelpComponents\zlib1.dll" "./"
11-
copy /y "%XEngine_Lib32%\XEngine_LibEx\libcrypto-3.dll" "./"
12-
copy /y "%XEngine_Lib32%\XEngine_LibEx\libssl-3.dll" "./"
13-
copy /y "%XEngine_Lib32%\XEngine_NetHelp\libcurl.dll" "./"
14-
copy /y "%XEngine_Lib32%\XEngine_NetHelp\nghttp2.dll" "./"
8+
copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"

0 commit comments

Comments
 (0)