V3.20 Merge to release

.github/workflows/Alma_build.yml

@@ -0,0 +1,95 @@
+name: alma build workflows
+
+on:
+  push:
+    branches:
+      - 'develop'
+    paths:
+      - 'XEngine_Source/**'
+      - 'XEngine_Release/**'
+      - '.github/**'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ${{ matrix.runner }}
+    container:
+      image: almalinux:${{ matrix.version }}
+      options: --platform ${{ matrix.platform }}
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            version: 9
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            version: 10
+          - arch: arm64
+            runner: ubuntu-24.04-arm 
+            platform: linux/arm64
+            artifact: Arm64
+            version: 9
+          - arch: arm64
+            runner: ubuntu-24.04-arm 
+            platform: linux/arm64
+            artifact: Arm64
+            version: 10
+
+    steps:
+      - name: Checkout main repository code
+        uses: actions/checkout@v4
+
+      - name: Checkout dependency repository (xengine)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/libxengine
+          path: libxengine
+
+      - name: sub module checkout (opensource)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_OPenSource
+          path: XEngine_Source/XEngine_DependLibrary
+
+      - name: Set TERM variable
+        run: echo "TERM=xterm" >> $GITHUB_ENV
+
+      - name: install system package
+        run: |
+            dnf update -y
+            dnf install gcc g++ make git jq unzip wget -y
+
+      - name: install xengine library
+        run: |
+            latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
+            unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
+            cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
+
+            chmod 777 *
+            ./XEngine_LINEnv.sh -i 3
+
+      - name: make
+        run: |
+            cd XEngine_Source
+            make RELEASE=1
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll
+            cd ..
+      - name: test
+        run: |
+            cd XEngine_Release
+            ./XEngine_AuthorizeService -t
+
+      - name: Upload folder as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_AuthorizeService-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
+          path: XEngine_Release/

.github/workflows/Centos_build.yml

@@ -0,0 +1,99 @@
+name: centos build workflows
+
+on:
+  push:
+    branches:
+      - 'develop'
+    paths:
+      - 'XEngine_Source/**'
+      - 'XEngine_Release/**'
+      - '.github/**'
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ${{ matrix.runner }}
+    container:
+      image: quay.io/centos/centos:${{ matrix.stream }}
+      options: --platform ${{ matrix.platform }}
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            version: 9
+            stream: stream9
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            version: 10
+            stream: stream10
+          - arch: arm64
+            runner: ubuntu-24.04-arm
+            platform: linux/arm64
+            artifact: Arm64
+            version: 9
+            stream: stream9
+          - arch: arm64
+            runner: ubuntu-24.04-arm
+            platform: linux/arm64
+            artifact: Arm64
+            version: 10
+            stream: stream10
+
+    steps:
+      - name: Checkout main repository code
+        uses: actions/checkout@v4
+
+      - name: Checkout dependency repository (xengine)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/libxengine
+          path: libxengine
+
+      - name: sub module checkout (opensource)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_OPenSource
+          path: XEngine_Source/XEngine_DependLibrary
+
+      - name: Set TERM variable
+        run: echo "TERM=xterm" >> $GITHUB_ENV
+
+      - name: install system package
+        run: |
+            dnf update -y
+            dnf install gcc g++ make git jq unzip wget -y
+
+      - name: install xengine library
+        run: |
+            latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
+            unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
+            cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
+
+            chmod 777 *
+            ./XEngine_LINEnv.sh -i 3
+
+      - name: make
+        run: |
+            cd XEngine_Source
+            make RELEASE=1
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll
+            cd ..
+      - name: test
+        run: |
+            cd XEngine_Release
+            ./XEngine_AuthorizeService -t
+
+      - name: Upload folder as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_AuthorizeService-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
+          path: XEngine_Release/

.github/workflows/debian_build.yml

@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ${{ matrix.runner }}
     container:
-      image: debian:bookworm
+      image: debian:${{ matrix.name }}
       options: --platform ${{ matrix.platform }}
     strategy:
       matrix:
@@ -25,6 +25,14 @@ jobs:
             runner: ubuntu-24.04
             platform: linux/amd64
             artifact: x86-64
+            name: bookworm
+            version: 12
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            name: trixie
+            version: 13
 
     steps:
       - name: Checkout main repository code
@@ -53,20 +61,16 @@ jobs:
       - name: install xengine library
         run: |
             latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
-            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_12_${{ matrix.artifact }}.zip
-            unzip ./XEngine_Debian_12_${{ matrix.artifact }}.zip -d ./XEngine_Debian_12_${{ matrix.artifact }}
-            cd XEngine_Debian_12_${{ matrix.artifact }}
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip
+            unzip ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
+            cd XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
 
             chmod 777 *
             ./XEngine_LINEnv.sh -i 3
 
       - name: make
         run: |
             cd XEngine_Source
-            make
-            make FLAGS=InstallAll
-            make FLAGS=CleanAll
-
             make RELEASE=1
             make FLAGS=InstallAll
             make FLAGS=CleanAll
@@ -79,6 +83,6 @@ jobs:
       - name: Upload folder as artifact
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_AuthorizeService-Debian_12_x86-64
+          name: XEngine_AuthorizeService-Debian_${{ matrix.version }}_x86-64
           path: XEngine_Release/
           retention-days: 1

.github/workflows/macbuild.yml

@@ -14,8 +14,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-13
-          - os: macos-14
+          - os: macos-15-intel
+          - os: macos-15
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -43,13 +43,13 @@ jobs:
         run: echo "TERM=xterm" >> $GITHUB_ENV
 
       - name: Set up Dependency x86_64 Environment 
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel'
         run: |
             cd libxengine
             chmod 777 *
             ./XEngine_LINEnv.sh -i 3
       - name: Set up Dependency Arm64 Environment 
-        if: matrix.os == 'macos-14'
+        if: matrix.os == 'macos-15'
         run: |
             cd libxengine
             chmod 777 *
@@ -84,14 +84,14 @@ jobs:
             ./XEngine_AuthorizeService -t
 
       - name: Upload folder as artifact with mac x64
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel'
         uses: actions/upload-artifact@v4
         with:
           name: XEngine_AuthorizeService-Mac_x86-64
           path: XEngine_Release/
           retention-days: 1
       - name: Upload folder as artifact with mac arm
-        if: matrix.os == 'macos-14'
+        if: matrix.os == 'macos-15'
         uses: actions/upload-artifact@v4
         with:
           name: XEngine_AuthorizeService-Mac_Arm64

.github/workflows/release.yml

@@ -70,6 +70,24 @@ jobs:
           skip_unpack: true
           if_no_artifact_found: fail
           path: ./XRelease/
+      - name: Download Alma Linux
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: Alma_build.yml
+          workflow_conclusion: success
+          check_artifacts: false
+          skip_unpack: true
+          if_no_artifact_found: fail
+          path: ./XRelease/
+      - name: Download CentOS
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          workflow: Centos_build.yml
+          workflow_conclusion: success
+          check_artifacts: false
+          skip_unpack: true
+          if_no_artifact_found: fail
+          path: ./XRelease/
 
       - name: Display structure of downloaded files
         run: ls -al ./XRelease/

CHANGELOG

@@ -1,3 +1,29 @@
+XEngine_Authorize V3.20.0.1001
+
+ci:centos and alma linux and debian 13 system support
+modify:cdkey module to verification module from depend library
+modify:delete push serial and use custom serial insert instead
+modify:re generator serial key when cdkey network create
+fixed:http verification status incorrect
+fixed:sometimes memory leak when read configure
+update:depend library
+delete:client module
+delete:cd key module
+delete:more protocol define
+delete:parse cdkey protocol and use verification read instead
+
+工作流:支持centos和alma以及debian13系统支持
+修改:cdkey模块功能使用了依赖库的验证模块替换
+修改:序列号现在使用自定义序列号替换了
+修改:网络验证创建的CDKEY现在需要通过服务器重新生成的序列号
+修正:http验证状态错误
+修正:某些时候读取配置内存溢出
+更新:依赖库
+删除:客户端模块
+删除:cdkey模块
+删除:多余的协议定义
+删除:解析CDKEY协议并且使用验证模块读取替换
+================================================================
 XEngine_Authorize V3.19.0.1001
 
 added:more system support

XEngine_Apps/Authorize_APPClient.sln

@@ -7,10 +7,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_APPClient", "Auth
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_APPLocal", "Authorize_APPLocal\Authorize_APPLocal.vcxproj", "{767151F7-230E-431B-AC6D-683F19F43C13}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_ClientModule", "Authorize_ClientModule\Authorize_ClientModule.vcxproj", "{82B923A9-2F4A-4784-A245-BAA6ABF5A358}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_CDKeyNetVer", "Authorize_CDKeyNetVer\Authorize_CDKeyNetVer.vcxproj", "{1D584651-5E93-43BA-9A48-E7D199DC587F}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Authorize_ClientModule", "Authorize_ClientModule\Authorize_ClientModule.vcxproj", "{82B923A9-2F4A-4784-A245-BAA6ABF5A358}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -35,14 +35,6 @@ Global
 		{767151F7-230E-431B-AC6D-683F19F43C13}.Release|x64.Build.0 = Release|x64
 		{767151F7-230E-431B-AC6D-683F19F43C13}.Release|x86.ActiveCfg = Release|Win32
 		{767151F7-230E-431B-AC6D-683F19F43C13}.Release|x86.Build.0 = Release|Win32
-		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.ActiveCfg = Debug|x64
-		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.Build.0 = Debug|x64
-		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.ActiveCfg = Debug|Win32
-		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.Build.0 = Debug|Win32
-		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.ActiveCfg = Release|x64
-		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.Build.0 = Release|x64
-		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.ActiveCfg = Release|Win32
-		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.Build.0 = Release|Win32
 		{1D584651-5E93-43BA-9A48-E7D199DC587F}.Debug|x64.ActiveCfg = Debug|x64
 		{1D584651-5E93-43BA-9A48-E7D199DC587F}.Debug|x64.Build.0 = Debug|x64
 		{1D584651-5E93-43BA-9A48-E7D199DC587F}.Debug|x86.ActiveCfg = Debug|Win32
@@ -51,6 +43,14 @@ Global
 		{1D584651-5E93-43BA-9A48-E7D199DC587F}.Release|x64.Build.0 = Release|x64
 		{1D584651-5E93-43BA-9A48-E7D199DC587F}.Release|x86.ActiveCfg = Release|Win32
 		{1D584651-5E93-43BA-9A48-E7D199DC587F}.Release|x86.Build.0 = Release|Win32
+		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.ActiveCfg = Debug|x64
+		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x64.Build.0 = Debug|x64
+		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.ActiveCfg = Debug|Win32
+		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Debug|x86.Build.0 = Debug|Win32
+		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.ActiveCfg = Release|x64
+		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x64.Build.0 = Release|x64
+		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.ActiveCfg = Release|Win32
+		{82B923A9-2F4A-4784-A245-BAA6ABF5A358}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE