Merge pull request #18 from libxengine/develop

V3.2.0.1001 Merge

Author: xengine-qyt

CHANGELOG

@@ -1,3 +1,31 @@
+XEngine_APIService V3.2.0.1001
+
+增加:编译开关日志提示
+增加:lua脚本功能开关编译选项
+修改:LUA,二维码和图像处理现在默认关闭
+修改:LUA,二维码和图像处理没有启用的时候返回501了
+修改:现在makefile支持linux和macos的编译开关了
+修改:不在需要bank和id处理的utf转换了
+修改:重新设计了语言翻译从有道改为百度
+修改:翻译语言日志提示
+修改:翻译类型使用枚举型替代
+修复:没有启用音频还开始录制的问题
+删除:lua init 变量
+删除:OPENCC库和相关代码已经被移除使用翻译替代
+
+added:build switch tips
+added:lua buid switch
+modify:lua and qr and image switch defualt is close
+modify:lua and qr and image reply is 501 when they is disable
+modify:makefile support linux and macos for build switch
+modify:does not need utf convert for bank and idcard
+modify:Redesigning translation from youdao to baidu
+modify:translation language tips
+modify:translation type used enum instead.
+fixed:not enable audio then start
+delete:lua init value
+delete:opencc library and code,use translation instead
+======================================================================================
 XEngine_APIService V3.1.0.1001
 
 增加:为opencv和qr增加自定义编译开关

README.en.md

@@ -35,21 +35,20 @@ Support privatization deployment, free, safe, open source, controllable
 14. Bank card verification
 15. Exchange rate calculation (planned)
 16. QR code generation and parse
-17. Simplified and Traditional Conversion
-18. Twenty-four solar terms (planned)
-19. Xinhua Dictionary
-20. Metering Conversion
-21. network test
-22. Distributed lock
-23. short url creator and forward
-24. local system time
-25. math Calculation
-26. log service
-27. Plugin hot reload
-28. Sensitive word detection
-29. remote control(back management)
-30. Image Process
-31. process deamon
+17. Twenty-four solar terms (planned)
+18. Translation
+19. Metering Conversion
+20. network test
+21. Distributed lock
+22. short url creator and forward
+23. local system time
+24. math Calculation
+25. log service
+26. Plugin hot reload
+27. Sensitive word detection
+28. remote control(back management)
+29. Image Process
+30. process deamon
 
 ## install
 
@@ -69,18 +68,18 @@ MYSQL database version 8.0 or above is required. Create a table through CreateDa
 Modify the database configuration in XSQL in the configuration file to your  
 
 #### Windows
-need to vcpkg configure third-part env.refer vcpkg install guide.after installed and execution:vcpkg.exe install lua:x86-windows opencc:x86-windows opencv[contrib]:x86-windows libqrencode:x86-windows lua:x64-windows opencc: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]:x86-windows libqrencode:x86-windows lua:x64-windows opencv[contrib]:x64-windows libqrencode:x64-windows  
 use vs open and compile,suport windows 7sp1 and above  
 Just Run it
 
 #### Linux
-ubuntu:sudo apt install libopencc-dev  
+ubuntu:sudo apt install sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev  
 centos:compile by self  
 use makefile compile,UBUNTU22.04 x64 or RockyLinux 9 x64
 Run it on the terminal
 
 #### Macos
-install opencc:brew install opencc opencc opencv qrencode  
+install opencc:brew install lua opencv qrencode  
 use makefile compile,mac 13 and above  
 Run it on the terminal
 
@@ -165,28 +164,16 @@ api:http://app.xyry.org:5501/api?function=bank&params1=6214832830000000
     "msg":"success"
 }
 ```
-language  
-api:http://app.xyry.org:5501/api?function=language&params1=简体到繁体&params2=1
-```json
-{
-    "code":0,
-    "data":{
-        "enType":1,
-        "tszDestStr":"簡體到繁體",
-        "tszSourceStr":"简体到繁体"
-    },
-    "msg":"success"
-}
-```
 translation  
-api:http://app.xyry.org:5501/api?function=translation&params1=中国&params2=0
+api:http://127.0.0.1:5501/api?function=translation&msg=中文翻译成英文&src=1&dst=2
 ```json
 {
     "code":0,
     "data":{
-        "enType":0,
-        "tszDestStr":"China",
-        "tszSourceStr":"中国"
+        "tszDestStr":"Translate from Chinese to English",
+        "tszFromStr":"zh",
+        "tszSourceStr":"中文翻译成英文",
+        "tszToStr":"en"
     },
     "msg":"success"
 }

README.md

@@ -34,21 +34,20 @@ c c++ interface api service
 14. 银行卡验证
 15. 汇率计算(计划中)
 16. 二维码生成解析
-17. 简繁转换
-18. 二十四节气(计划中)
-19. 新华词典
-20. 计量转换
-21. 网络测试
-22. 分布式锁API
-23. 短连接生成和转发
-24. 本地标准时间
-25. 数学计算
-26. 日志服务
-27. 插件脚本热重载
-28. 敏感词检测
-29. 远程控制(后台管理)
-30. 图像处理
-31. 进程守护
+17. 二十四节气(计划中)
+18. 翻译
+19. 计量转换
+20. 网络测试
+21. 分布式锁API
+22. 短连接生成和转发
+23. 本地标准时间
+24. 数学计算
+25. 日志服务
+26. 插件脚本热重载
+27. 敏感词检测
+28. 远程控制(后台管理)
+29. 图像处理
+30. 进程守护
 
 ## 安装教程
 
@@ -68,18 +67,18 @@ macos执行:./XEngine_LINEnv.sh -i 3
 修改配置文件里面XSQL里面的数据库配置为你的  
 
 #### Windows
-需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x86-windows opencc:x86-windows opencv[contrib]:x86-windows libqrencode:x86-windows lua:x64-windows opencc:x64-windows opencv[contrib]:x64-windows libqrencode:x64-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以上系统  
 直接运行即可
 
 #### Linux
-ubuntu:sudo apt install liblua5.3-dev libopencc-dev libopencv-dev libopencv-contrib-dev libqrencode-dev  
+ubuntu:sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev  
 centos:需要自己编译  
 Linux使用Makefile编译,UBUNTU22.04 x64或者RockyLinux 9 x64
 在控制台运行
 
 #### Macos
-安装opencc,执行命令:brew install lua opencc opencv qrencode  
+安装opencc,执行命令:brew install lua opencv qrencode  
 使用makefile编译,控制台运行,需要mac 13以及以上版本  
 在控制台运行
 
@@ -163,28 +162,16 @@ make FLAGS=CleanAll 清理编译
     "msg":"success"
 }
 ```
-语言转换  
-接口:http://app.xyry.org:5501/api?function=language&params1=简体到繁体&params2=1
-```json
-{
-    "code":0,
-    "data":{
-        "enType":1,
-        "tszDestStr":"簡體到繁體",
-        "tszSourceStr":"简体到繁体"
-    },
-    "msg":"success"
-}
-```
 翻译  
-接口:http://app.xyry.org:5501/api?function=translation&params1=中国&params2=0
+接口:http://127.0.0.1:5501/api?function=translation&msg=中文翻译成英文&src=1&dst=2
 ```json
 {
     "code":0,
     "data":{
-        "enType":0,
-        "tszDestStr":"China",
-        "tszSourceStr":"中国"
+        "tszDestStr":"Translate from Chinese to English",
+        "tszFromStr":"zh",
+        "tszSourceStr":"中文翻译成英文",
+        "tszToStr":"en"
     },
     "msg":"success"
 }

XEngine_Docment/Docment_en.docx

@@ -30,15 +30,18 @@
     },
     "XApi":{
         "tszBankUrl":"https://ccdcapi.alipay.com/validateAndCacheCardInfo.json?cardNo=%s&cardBinCheck=true",
-        "tszTranslationUrl":"http://fanyi.youdao.com/translate?&doctype=json&type=%s&i=%s"
+        "tszTranslationUrl":"https://fanyi-api.baidu.com/api/trans/vip/translate",
+        "st_TranslationInfo":{
+            "appid":"20231228001924304",
+            "key":"udXGjpmNVeQHml1FjT8E"
+        }
     },
     "XPlugin":{
         "bEnable":true,
         "tszPluginLib":"./XEngine_Config/XEngine_PluginLib.json",
         "tszPluginLua":"./XEngine_Config/XEngine_PluginLua.json"
     },
     "XConfig":{
-        "tszConfigOPencc":"./XEngine_Config/XEngine_OPenccConfig.json",
         "tszConfigQRCode":"./XEngine_Config/XEngine_QRCode.json",
         "tszConfigDeamon":"./XEngine_Config/XEngine_DeamonConfig.json",
         "tszConfigHTTPMime":"./XEngine_Config/HttpMime.types",
@@ -52,11 +55,12 @@
         "tszUserName":"xyry",
         "tszUserPass":"11",
         "st_VerSwitch":{
-            "bBackService":false,
-            "bDeamon":false
+            "bBackService":true,
+            "bDeamon":true
         }
     },
     "XVer":[
+        "3.2.0.1001 Build20231229",
         "3.1.0.1001 Build20231102",
         "3.0.0.1001 Build20230908",
         "2.11.0.1001 Build20230829",