Merge pull request #21 from libxengine/develop

V3.5.0.1001 Merge

Author: xengine-qyt

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "XEngine_Source/XEngine_Depend"]
+	path = XEngine_Source/XEngine_Depend
+	url = https://github.com/libxengine/XEngine_OPenSource.git

CHANGELOG

@@ -1,3 +1,25 @@
+XEngine_APIService V3.5.0.1001
+
+增加:机器信息收集增加服务名字段
+增加:机器信息报告查询
+增加:RFC的UDP服务端口的STUN协议代码支持
+增加:信息报告配置支持
+增加:NTP时间同步协议支持
+增加:油价查询支持
+修改:jsoncpp现在使用子模块方式加载
+修改:分离了版本信息从配置文件中
+修复:图像扩展名没有处理的问题
+
+added:rfc witch udp port and stun protocol supported
+added:query info for report
+added:service name for machine
+added:info report supported
+added:NTP time sync protocol supported
+added:oil price query supported
+modify:jsoncpp is depend sub module
+modify:detach version configure file
+fixed:image process ext name is incorrect
+======================================================================================
 XEngine_APIService V3.4.0.1001
 
 增加:lua脚本心跳协议支持

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[email protected].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

README.en.md

@@ -30,7 +30,7 @@ Support privatization deployment, free, safe, open source, controllable
 9. Zodiac Constellation
 10. Password generator
 11. World Time Zones
-12. Oil price inquiry (planned)
+12. Oil price inquiry
 13. Administrative zip code
 14. Bank card verification
 15. Exchange rate calculation (planned)
@@ -52,6 +52,8 @@ Support privatization deployment, free, safe, open source, controllable
 31. Region ID Convert
 32. Machine Information Collect
 33. heartbeat 
+34. STUN NAT Protocol 
+35. NTP Time Sync Protocol
 
 ## install
 
@@ -75,6 +77,11 @@ need to vcpkg configure third-part env.refer vcpkg install guide.after installed
 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  
+git submodule init  
+git submodule update  
+
 #### Linux
 ubuntu:sudo apt install sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev  
 centos:compile by self  
@@ -213,6 +220,25 @@ Api:http://app.xyry.org:5501/api?function=log&params1=1
     "nLogLevel":4
 }
 ```
+Oil Query  
+API:http://app.xyry.org:5501/api?function=oil&addr=四川  
+```json
+{
+    "code": 0,
+    "data": {
+        "dlValue0": 7.9100000000000001,
+        "dlValue10": 8.3800000000000008,
+        "dlValue20": 8.6899999999999995,
+        "dlValue35": 0,
+        "dlValue92": 8.2799999999999994,
+        "dlValue95": 8.8499999999999996,
+        "dlValue98": 9.6199999999999992,
+        "tszCityStr": "四川",
+        "tszUPTime": "2024-05-08 14:39:53"
+    },
+    "msg": "success"
+}
+```
 ## Participate in contribution
 I hope you will submit more code to participate in the contribution  
 

README.md

@@ -29,7 +29,7 @@ c c++ interface api service
 9. 生肖星座
 10. 密码生成器
 11. 世界时区
-12. 油价查询(计划中)
+12. 油价查询
 13. 行政邮编
 14. 银行卡验证
 15. 汇率计算(计划中)
@@ -51,6 +51,8 @@ c c++ interface api service
 31. 行政区域ID转换
 32. 机器信息收集
 33. 心跳处理
+34. STUN NAT协议
+35. NTP时间同步协议
 
 ## 安装教程
 
@@ -69,6 +71,11 @@ macos执行:./XEngine_LINEnv.sh -i 3
 需要MYSQL数据库8.0以上版本.通过CreateDatabase.sql创建表,然后导入剩余的表  
 修改配置文件里面XSQL里面的数据库配置为你的  
 
+#### sub module
+由于依赖的子模块,在你checkout仓库后,在仓库目录下执行下面的命令拉取子模块  
+git submodule init  
+git submodule update  
+
 #### 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  
 使用VS打开并且编译,支持WINDOWS 7SP1以上系统  
@@ -214,6 +221,25 @@ make FLAGS=CleanAll 清理编译
     "nLogLevel":4
 }
 ```
+油价查询  
+接口:http://app.xyry.org:5501/api?function=oil&addr=四川  
+```json
+{
+    "code": 0,
+    "data": {
+        "dlValue0": 7.9100000000000001,
+        "dlValue10": 8.3800000000000008,
+        "dlValue20": 8.6899999999999995,
+        "dlValue35": 0,
+        "dlValue92": 8.2799999999999994,
+        "dlValue95": 8.8499999999999996,
+        "dlValue98": 9.6199999999999992,
+        "tszCityStr": "四川",
+        "tszUPTime": "2024-05-08 14:39:53"
+    },
+    "msg": "success"
+}
+```
 ## 参与贡献
 希望大家多多提交代码参与贡献  
 

SECURITY.md

@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| >= 3.x  | :white_check_mark: |
+| <= 2.x  | :x:                |
+
+## Reporting a Vulnerability
+
+www.xyry.org or [email protected]

XEngine_APPClient/APPClient_ImageExample/APPClient_ImageExample.cpp

@@ -79,12 +79,14 @@ int test_imgzoom()
 		FILE* pSt_File = _xtfopen(pptszListFile[i], _X("rb"));
 		int nRet = (int)fread(ptszFileBuffer, 1, XENGINE_MEMORY_SIZE_MAX, pSt_File);
 		fclose(pSt_File);
+		
 		APPClient_ImageExample_GetAttr(ptszFileBuffer, nRet, &nWidth, &nHeight);
 
-		XCHAR tszAPIUrl[MAX_PATH];
-		memset(tszAPIUrl, '\0', sizeof(tszAPIUrl));
+		XCHAR tszAPIUrl[MAX_PATH] = {};
+		XCHAR tszFileExt[64] = {};
 
-		_xstprintf(tszAPIUrl, _X("http://127.0.0.1:5501/api?function=image&type=1&ext=png&width=%d&height=%d"), nWidth / 2, nHeight / 2);
+		BaseLib_OperatorString_GetFileAndPath(pptszListFile[i], NULL, NULL, NULL, tszFileExt);
+		_xstprintf(tszAPIUrl, _X("http://127.0.0.1:5501/api?function=image&type=1&ext=%s&width=%d&height=%d"), tszFileExt, nWidth / 2, nHeight / 2);
 
 		XCHAR* ptszMsgBuffer = NULL;
 		if (!APIClient_Http_Request(_X("POST"), tszAPIUrl, ptszFileBuffer, &nCode, &ptszMsgBuffer, &nRet))