Merge pull request #29 from libxengine/develop

V3.6.0.1001 Merge

Author: xengine-qyt

.github/workflows/msbuild.yml

@@ -0,0 +1,50 @@
+name: C++ Build with Dependencies
+
+#on: [push] # 触发条件，推送和拉取请求时，
+on:
+  workflow_dispatch:  # 添加这行来启用手动触发
+  
+permissions:
+  contents: write
+  
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+        platform: [x86]
+
+    runs-on: windows-latest # 最新的 Windows 环境
+
+    steps:
+       # 检出您的主仓库代码
+      - name: Checkout main repository code
+        uses: actions/checkout@v3
+        
+       # 检出依赖的xengine仓库到指定的xengine目录
+      - name: Checkout dependency repository (xengine)
+        uses: actions/checkout@v3
+        with:
+          repository: libxengine/xengine
+          path: xengine
+
+      - name: Checkout dependency repository (vcpkg)
+        uses: actions/checkout@v3
+        with:
+          repository: https://github.com/microsoft/vcpkg.git
+          path: vcpkg
+
+      # 设置依赖库的环境变量
+      - name: Set up Dependency Environment Variables
+        run: |
+          echo "XENGINE_INCLUDE=${{ github.workspace }}/xengine" | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo "XENGINE_LIB32=${{ github.workspace }}/xengine/XEngine_Windows/x86" | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo "XENGINE_LIB64=${{ github.workspace }}/xengine/XEngine_Windows/x64" | Out-File -FilePath $env:GITHUB_ENV -Append
+        shell: pwsh
+        
+      # 配置 MSBuild 的路径，准备构建 VC++ 项目
+      - name: Setup MSBuild
+        uses: microsoft/[email protected]
+      #编译
+      - name: Build Solution
+        run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "XEngine_Source/XEngine_Depend"]
 	path = XEngine_Source/XEngine_Depend
 	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
+	url = https://github.com/libxengine/XEngine_IPMacData.git

CHANGELOG

@@ -1,3 +1,27 @@
+XEngine_APIService V3.6.0.1001
+
+增加:mac地址供应商查询
+增加:ip和phone子模块替换插件模块
+增加:机器信息最后更新日期
+更新:ip和phone数据库并且添加mac数据库
+更新:配置文件以及增加数据库配置
+修改:机器信息的编码改为用户信息
+修改:机器信息不在兼容以往的版本
+修正:机器信息数据查询错误
+修正:windows石油查询名称乱码问题
+修正:windows下翻译乱码问题
+
+added:mac address vendor query
+added:ip sub module to plugin instead
+added:last update time for machine
+update:ip phone database and added mac addr database
+update:configure file and added apimodule database
+modify:code to user for machine info
+modify:not compatible with previous version
+fixed:sql query is incorrect for machine
+fixed:oil query name is Garbled on window
+fixed:transfer language chinese Garbled characters on windows
+======================================================================================
 XEngine_APIService V3.5.0.1001
 
 增加:机器信息收集增加服务名字段

README.en.md

@@ -54,6 +54,7 @@ Support privatization deployment, free, safe, open source, controllable
 33. heartbeat 
 34. STUN NAT Protocol 
 35. NTP Time Sync Protocol
+36. mac address vendor query
 
 ## install
 

README.md

@@ -53,6 +53,7 @@ c c++ interface api service
 33. 心跳处理
 34. STUN NAT协议
 35. NTP时间同步协议
+36. 支持MAC地址厂商查询
 
 ## 安装教程
 

XEngine_Docment/Docment_en.docx

@@ -62,6 +62,12 @@
             "bDeamon":false
         }
     },
+    "XAPIModule": {
+        "bEnable": true,
+        "tszDBPhone": "./XEngine_DBFile/phone.xdb",
+        "tszDBMac": "./XEngine_DBFile/macaddr.xdb",
+        "tszDBIPAddr": "./XEngine_DBFile/ip2region.xdb"
+    },
     "XReport":{
         "bEnable":true,
         "tszAPIUrl":"http://app.xyry.org:5501/api?function=machine",

XEngine_Docment/Docment_zh.docx

@@ -24,16 +24,6 @@
             "PluginEnable":true,
             "PluginMethod":"meter",
             "PluginFile":"./XEngine_LibPlugin/libModulePlugin_Meter"
-        },
-        {
-            "PluginEnable":true,
-            "PluginMethod":"phone",
-            "PluginFile":"./XEngine_LibPlugin/libModulePlugin_Phone"
-        },
-        {
-            "PluginEnable":true,
-            "PluginMethod":"ip",
-            "PluginFile":"./XEngine_LibPlugin/libModulePlugin_IPAddr"
         }
     ]
 }

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -1,5 +1,6 @@
 {
     "XVer":[
+        "3.6.0.1001 Build20240705",
         "3.5.0.1001 Build20240510",
         "3.4.0.1001 Build20240411",
         "3.3.0.1001 Build20240308",