Merge pull request #44 from libxengine/develop

V3.13 Release

Author: xengine-qyt

.github/workflows/Centos_build.yml

@@ -0,0 +1,119 @@
+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 (XEngine_OPenSource)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_OPenSource
+          path: XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource
+      - name: sub module checkout (XEngine_PhoneData)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_PhoneData
+          path: XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData
+      - name: sub module checkout (XEngine_IPMacData)
+        uses: actions/checkout@v4
+        with:
+          repository: libxengine/XEngine_IPMacData
+          path: XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData
+
+      - 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: install build package
+        run: |
+            dnf install lua-devel opencv-devel qrencode-devel leptonica-devel tesseract-devel -y
+
+      - name: make
+        run: |
+            cd XEngine_Source
+            make
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll
+
+            make RELEASE=1
+            make FLAGS=InstallAll
+            make FLAGS=CleanAll
+      - name: test
+        run: |
+            cd XEngine_Release
+            chmod 777 copydb.sh
+            ./copydb.sh
+            ./XEngine_APIServiceApp -t
+
+      - name: Upload folder as artifact with CentOS
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_MQServiceApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
+          path: XEngine_Release/
+          retention-days: 1

.github/workflows/Rocky_build.yml

@@ -75,9 +75,6 @@ jobs:
 
       - name: install system package
         run: |
-            dnf clean all
-            dnf makecache
-            dnf distro-sync -y
             dnf update -y
             dnf install gcc g++ make git jq unzip wget -y
           
@@ -90,10 +87,11 @@ jobs:
             
             chmod 777 *
             ./XEngine_LINEnv.sh -i 3
-            dnf install libavdevice -y
+
       - name: install build package
         run: |
             dnf install lua-devel opencv-devel qrencode-devel leptonica-devel tesseract-devel -y
+            
       - name: make
         run: | 
             cd XEngine_Source

.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
@@ -66,9 +74,9 @@ 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
@@ -93,6 +101,6 @@ jobs:
       - name: Upload folder as artifact
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_APIServiceApp-Debian_12_x86-64
+          name: XEngine_APIServiceApp-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
+          - os: macos-15-intel
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -44,13 +44,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: |
             latest_tag=$(git ls-remote --tags --sort="v:refname" https://github.com/libxengine/libxengine.git | awk '{print $2}' | sed 's/refs\/tags\///' | tail -n 1)
             wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
@@ -80,14 +80,14 @@ jobs:
             ./XEngine_APIServiceApp -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_APIServiceApp-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_APIServiceApp-Mac_Arm64

.github/workflows/release.yml

@@ -52,6 +52,15 @@ jobs:
           skip_unpack: true
           if_no_artifact_found: fail
           path: ./XRelease/  
+      - name: Download CentOS build
+        uses: dawidd6/action-download-artifact@v11
+        with:
+          workflow: Centos_build.yml
+          workflow_conclusion: success
+          check_artifacts: false
+          skip_unpack: true
+          if_no_artifact_found: fail
+          path: ./XRelease/  
       - name: Download macbuild
         uses: dawidd6/action-download-artifact@v11
         with:

README.en.md

@@ -59,6 +59,7 @@ It allows you to save 90% of information service costs in a year.
 36. mac address vendor query
 37. ORC Get TEXT With image
 38. P2P
+39. DNS protocol support
 
 ## install
 
@@ -83,12 +84,12 @@ Modify the database configuration in XSQL in the configuration file to your
 The default configuration does not enable database support. If the database interface is required, you need to enable the database yourself
 
 #### Windows
-need to vcpkg configure third-part env.refer vcpkg install guide.after installed and execution:vcpkg.exe install lua:x86-windows opencv[contrib]:x86-windows libqrencode:x86-windows lua:x64-windows opencv[contrib]:x64-windows libqrencode:x64-windows  
+need to vcpkg configure third-part env.refer vcpkg install guide.after installed and execution:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows  
 use vs open and compile,suport windows 7sp1 and above  
 Just Run it
 
 #### sub module
-Due to the dependent sub-modules, after you checkout the warehouse, execute the following command in the warehouse directory to pull the sub-modules  
+Due to the dependent sub-modules, after you checkout the resprepository, execute the following command in the resprepository directory to pull the sub-modules  
 git submodule init  
 git submodule update  
 

README.md

@@ -62,6 +62,7 @@ c c++ interface api service
 36. 支持MAC地址厂商查询
 37. ORC图像文本提取
 38. P2P
+39. DNS协议支持
 
 ## 安装教程
 
@@ -86,16 +87,16 @@ macos执行:./XEngine_LINEnv.sh -i 3
 默认配置没有开启数据库支持,如果需要数据库接口支持,需要自己开启数据库  
 
 #### sub module
-由于依赖的子模块,在你checkout仓库后,在仓库目录下执行下面的命令拉取子模块  
+由于依赖的子模块,在你clone仓库后,在仓库目录下执行下面的命令拉取子模块  
 git submodule init  
 git submodule update  
 如果github访问失败,你也可以clone该项目,在主目录下使用命令:  
-git clone https://gitee.com/xengine/XEngine_OPenSource.git XEngine_Source/XEngine_Depend  
-git clone https://gitee.com/xengine/XEngine_IPMacData.git XEngine_Source/XEngine_DBDepend/XEngine_IPMacData  
-git clone https://gitee.com/xengine/XEngine_PhoneData.git XEngine_Source/XEngine_DBDepend/XEngine_PhoneData  
+git clone https://gitee.com/xengine/XEngine_OPenSource.git XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource
+git clone https://gitee.com/xengine/XEngine_IPMacData.git XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData  
+git clone https://gitee.com/xengine/XEngine_PhoneData.git XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData  
 
 #### Windows
-需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x86-windows opencv[contrib]:x86-windows libqrencode:x86-windows lua:x64-windows opencv[contrib]:x64-windows libqrencode:x64-windows  
+需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows  
 使用VS打开并且编译,支持WINDOWS 7SP1以上系统  
 直接运行即可
 

XEngine_APPClient/APPClient_APIQueryExample/APPClient_APIQueryExample.vcxproj

@@ -71,11 +71,11 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
+    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
     <LibraryPath>$(XEngine_Lib32);../../XEngine_Source/Debug;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
+    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
     <LibraryPath>$(XEngine_Lib64);../../XEngine_Source/x64/Debug;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

XEngine_APPClient/APPClient_BackExample/APPClient_BackExample.vcxproj

@@ -71,11 +71,11 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
+    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
     <LibraryPath>$(XEngine_Lib64);../../XEngine_Source/x64/Debug;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
+    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
     <LibraryPath>$(XEngine_Lib32);../../XEngine_Source/Debug;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

XEngine_APPClient/APPClient_BankExample/APPClient_BankExample.vcxproj

@@ -72,7 +72,7 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_Depend/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
+    <IncludePath>$(XEngine_Include);../../XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp;$(IncludePath)</IncludePath>
     <LibraryPath>$(XEngine_Lib32);../../XEngine_Source/Debug;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">