V3.12 Merge

.github/workflows/Rocky_build.yml

@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ${{ matrix.runner }}
     container:
-      image: rockylinux/rockylinux:9.5
+      image: rockylinux/rockylinux:${{ matrix.os_version }}
       options: --platform ${{ matrix.platform }}
     strategy:
       matrix:
@@ -25,10 +25,22 @@ jobs:
             runner: ubuntu-24.04
             platform: linux/amd64
             artifact: x86-64
+            os_version: 9
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+            os_version: 10
           - arch: arm64
             runner: ubuntu-24.04-arm
             platform: linux/arm64
             artifact: Arm64
+            os_version: 9
+          - arch: arm64
+            runner: ubuntu-24.04-arm
+            platform: linux/arm64
+            artifact: Arm64
+            os_version: 10
 
     steps:
       - name: Checkout main repository code
@@ -46,36 +58,39 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: libxengine/XEngine_OPenSource
-          path: XEngine_Source/XEngine_Depend
+          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_DBDepend/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_DBDepend/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 clean all
+            dnf makecache
+            dnf distro-sync -y
             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_9_${{ matrix.artifact }}.zip
-            unzip ./XEngine_RockyLinux_9_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_9_${{ matrix.artifact }}
-            cd XEngine_RockyLinux_9_${{ matrix.artifact }}
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}.zip
+            unzip ./XEngine_RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}
+            cd XEngine_RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}
 
             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
@@ -100,6 +115,6 @@ jobs:
       - name: Upload folder as artifact with RockyLinux
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_APIServiceApp-RockyLinux_9_${{ matrix.artifact }}
+          name: XEngine_APIServiceApp-RockyLinux_${{ matrix.os_version }}_${{ matrix.artifact }}
           path: XEngine_Release/
           retention-days: 1

.github/workflows/debian_build.yml

@@ -38,25 +38,25 @@ jobs:
           repository: libxengine/libxengine
           path: libxengine
 
+      - name: Set TERM variable
+        run: echo "TERM=xterm" >> $GITHUB_ENV
+
       - name: sub module checkout (XEngine_OPenSource)
         uses: actions/checkout@v4
         with:
           repository: libxengine/XEngine_OPenSource
-          path: XEngine_Source/XEngine_Depend
+          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_DBDepend/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_DBDepend/XEngine_IPMacData
+          path: XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData
 
-      - name: Set TERM variable
-        run: echo "TERM=xterm" >> $GITHUB_ENV
-
       - name: install system package
         run: |
             apt update -y

.github/workflows/fedora_build.yml

@@ -35,6 +35,8 @@ jobs:
     steps:
       - name: Checkout main repository code
         uses: actions/checkout@v4
+        with:
+          ref: 'develop'
 
       - name: Checkout dependency repository (xengine)
         uses: actions/checkout@v4
@@ -46,18 +48,18 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: libxengine/XEngine_OPenSource
-          path: XEngine_Source/XEngine_Depend
+          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_DBDepend/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_DBDepend/XEngine_IPMacData
-
+          path: XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData
+          
       - name: install system package
         run: |
             dnf update -y

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 0 
 
       - name: Download ubuntu build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v11
         with:
           workflow: Ubuntu_build.yml
           workflow_conclusion: success
@@ -26,7 +26,7 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/
       - name: Download debian build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v11
         with:
           workflow: debian_build.yml
           workflow_conclusion: success
@@ -35,7 +35,7 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/
       - name: Download fedora build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v11
         with:
           workflow: fedora_build.yml
           workflow_conclusion: success
@@ -44,7 +44,7 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/
       - name: Download Rocky build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v11
         with:
           workflow: Rocky_build.yml
           workflow_conclusion: success
@@ -53,7 +53,7 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/  
       - name: Download macbuild
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v11
         with:
           workflow: macbuild.yml
           workflow_conclusion: success
@@ -62,7 +62,7 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/
       - name: Download msbuild
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v11
         with:
           workflow: msbuild.yml
           workflow_conclusion: success

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "XEngine_Source/XEngine_Depend"]
-	path = XEngine_Source/XEngine_Depend
+[submodule "XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource"]
+	path = XEngine_Source/XEngine_DependLibrary/XEngine_OPenSource
 	url = https://github.com/libxengine/XEngine_OPenSource.git
-[submodule "XEngine_Source/XEngine_DBDepend/phonedata"]
-	path = XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
-	url = https://github.com/libxengine/XEngine_PhoneData.git
-[submodule "XEngine_Source/XEngine_DBDepend/XEngine_IPMacData"]
-	path = XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
+[submodule "XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData"]
+	path = XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData
 	url = https://github.com/libxengine/XEngine_IPMacData.git
+[submodule "XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData"]
+	path = XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData
+	url = https://github.com/libxengine/XEngine_PhoneData.git

CHANGELOG

@@ -1,3 +1,31 @@
+XEngine_APIService V3.12.0.1001
+
+增加:rockylinux 10 支持
+增加:后台服务完成通知
+增加:macos屏幕录像
+优化:大内存操作统一采用内存池
+修改:内存缓冲警告和优化
+修改:调整信息获取和存储方法
+修改:git的子模块目录修改
+修改:可以为后台服务报告api完成信息了
+修正:后台服务下载操作问题
+修正:后台服务上传文件无效
+修正:屏幕推流不工作
+删除:不需要的后台编码句柄
+
+added:rocky linux 10 support
+added:completed notify for back service
+added:record screen macos support
+improved:All large memory operations use memory pool instead
+modify:memory buffer warn and improved
+modify:Adjust the information acquisition and storage method
+modify:git submodule move to new dir
+modify:create new field for api address report for back service
+fixed:download operator not work for back service protocol
+fixed:upload file not work for back service
+fixed:screen stream push not work
+delete:audio and video encoder code for back service
+======================================================================================
 XEngine_APIService V3.11.0.1001
 
 增加:更多发布系统支持

README.en.md

@@ -58,6 +58,7 @@ It allows you to save 90% of information service costs in a year.
 35. NTP Time Sync Protocol
 36. mac address vendor query
 37. ORC Get TEXT With image
+38. P2P
 
 ## install
 

README.md

@@ -61,6 +61,7 @@ c c++ interface api service
 35. NTP时间同步协议
 36. 支持MAC地址厂商查询
 37. ORC图像文本提取
+38. P2P
 
 ## 安装教程
 

XEngine_Release/XEngine_Config/XEngine_VersionConfig.json

@@ -1,5 +1,6 @@
 {
     "XVer":[
+        "3.12.0.1001 Build20250703",
         "3.11.0.1001 Build20250506",
         "3.10.0.1001 Build20250416",
         "3.9.0.1001 Build20250224",

XEngine_Release/copydb.bat

@@ -1,4 +1,4 @@
-copy /y "..\XEngine_Source\XEngine_DBDepend\XEngine_IPMacData\XEngine_DBFile\GeoLite2-ASN.mmdb" "./XEngine_DBFile"
-copy /y "..\XEngine_Source\XEngine_DBDepend\XEngine_IPMacData\XEngine_DBFile\GeoLite2-City.mmdb" "./XEngine_DBFile"
-copy /y "..\XEngine_Source\XEngine_DBDepend\XEngine_IPMacData\XEngine_DBFile\macaddr.xdb" "./XEngine_DBFile"
-copy /y "..\XEngine_Source\XEngine_DBDepend\XEngine_PhoneData\Data\phone_utf.dat" "./XEngine_DBFile/phone.xdb"
+copy /y "..\XEngine_Source\XEngine_DependLibrary\XEngine_IPMacData\XEngine_DBFile\GeoLite2-ASN.mmdb" "./XEngine_DBFile"
+copy /y "..\XEngine_Source\XEngine_DependLibrary\XEngine_IPMacData\XEngine_DBFile\GeoLite2-City.mmdb" "./XEngine_DBFile"
+copy /y "..\XEngine_Source\XEngine_DependLibrary\XEngine_IPMacData\XEngine_DBFile\macaddr.xdb" "./XEngine_DBFile"
+copy /y "..\XEngine_Source\XEngine_DependLibrary\XEngine_PhoneData\Data\phone_utf.dat" "./XEngine_DBFile/phone.xdb"

XEngine_Release/copydb.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cp -f ../XEngine_Source/XEngine_DBDepend/XEngine_IPMacData/XEngine_DBFile/GeoLite2-ASN.mmdb ./XEngine_DBFile/
-cp -f ../XEngine_Source/XEngine_DBDepend/XEngine_IPMacData/XEngine_DBFile/GeoLite2-City.mmdb ./XEngine_DBFile/
-cp -f ../XEngine_Source/XEngine_DBDepend/XEngine_IPMacData/XEngine_DBFile/macaddr.xdb ./XEngine_DBFile/
-cp -f ../XEngine_Source/XEngine_DBDepend/XEngine_PhoneData/Data/phone_utf.dat ./XEngine_DBFile/phone.xdb
+cp -f ../XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData/XEngine_DBFile/GeoLite2-ASN.mmdb ./XEngine_DBFile/
+cp -f ../XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData/XEngine_DBFile/GeoLite2-City.mmdb ./XEngine_DBFile/
+cp -f ../XEngine_Source/XEngine_DependLibrary/XEngine_IPMacData/XEngine_DBFile/macaddr.xdb ./XEngine_DBFile/
+cp -f ../XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData/Data/phone_utf.dat ./XEngine_DBFile/phone.xdb

XEngine_SQL/XEngine_APIMachine.sql

@@ -1,17 +1,17 @@
 /*
- Navicat Premium Data Transfer
+ Navicat Premium Dump SQL
 
- Source Server         : mysql
+ Source Server         : QQCloud
  Source Server Type    : MySQL
- Source Server Version : 80037 (8.0.37-0ubuntu0.22.04.3)
- Source Host           : 10.0.3.154:3306
+ Source Server Version : 80042 (8.0.42-0ubuntu0.24.04.1)
+ Source Host           : 118.25.14.242:3306
  Source Schema         : XEngine_APIMachine
 
  Target Server Type    : MySQL
- Target Server Version : 80037 (8.0.37-0ubuntu0.22.04.3)
+ Target Server Version : 80042 (8.0.42-0ubuntu0.24.04.1)
  File Encoding         : 65001
 
- Date: 20/06/2024 17:32:50
+ Date: 03/07/2025 14:49:40
 */
 
 SET NAMES utf8mb4;
@@ -27,11 +27,12 @@ CREATE TABLE `XEngine_MachineList`  (
   `tszMachineName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '机器名称',
   `tszMachineUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '机器用户',
   `tszMachineSystem` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '系统名称',
-  `tszMachineText` varchar(2048) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '机器信息',
+  `tszMachineSoftware` varchar(4096) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '软件信息',
+  `tszMachineHardware` varchar(4096) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '硬件信息',
   `nTimeNumber` bigint NOT NULL COMMENT '启动次数',
   `tszLastTime` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
   `tszCreateTime` datetime NOT NULL COMMENT '注册时间',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 0 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = DYNAMIC;
 
 SET FOREIGN_KEY_CHECKS = 1;

XEngine_Source/Makefile

@@ -17,11 +17,11 @@ PLUGIN_MODULE_TIMEZONE = ./XEngine_PluginModule/ModulePlugin_Timezone
 PLUGIN_MODULE_BMINDEX = ./XEngine_PluginModule/ModulePlugin_BMIndex
 PLUGIN_MODULE_METER = ./XEngine_PluginModule/ModulePlugin_Meter
 
-THIRDPART_MODULE_JSONCPP = ./XEngine_Depend/XEngine_Module/jsoncpp
-THIRDPART_MODULE_REPORT = ./XEngine_Depend/XEngine_Module/XEngine_InfoReport
+THIRDPART_MODULE_JSONCPP = ./XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
+THIRDPART_MODULE_REPORT = ./XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_InfoReport
 
-APIMODULE_PHONE_PATH = ./XEngine_DBDepend/XEngine_PhoneData/Source/C/XEngine_APIModulePhone
-APIMODULE_IPMAC_PATH = ./XEngine_DBDepend/XEngine_IPMacData/XEngine_Source/XEngine_APIModuleIPMac
+APIMODULE_PHONE_PATH = ./XEngine_DependLibrary/XEngine_PhoneData/Source/C/XEngine_APIModulePhone
+APIMODULE_IPMAC_PATH = ./XEngine_DependLibrary/XEngine_IPMacData/XEngine_Source/XEngine_APIModuleIPMac
 
 APP_HTTP_PATH = ./XEngine_ServiceApp/XEngine_HttpApp
 

XEngine_Source/VSClean.bat

@@ -5,6 +5,7 @@ FOR /R . %%d IN (.) DO rd /s /q "%%d\Release" 2>nul
 FOR /R . %%d IN (.) DO rd /s /q "%%d\x64" 2>nul
 FOR /R . %%d IN (.) DO rd /s /q "%%d\Debug" 2>nul
 FOR /R . %%d IN (.) DO rd /s /q "%%d\ipch" 2>nul
+FOR /R . %%d IN (.) DO rd /s /q "%%d\ARM64" 2>nul
 
 rem If the Properties directory is empty, remove it
 FOR /R . %%d in (.) do rd /q "%%d\Properties" 2> nul