CHANGELOG

+XEngine_APIService V2.9.0.1001
+
+增加:短连接生成与转发功能支持
+增加:数据测试API接口
+更新:匹配XEngineV8.x版本
+更新:编译脚本现在对跨平台支持更好
+修改:测试函数名称改为socket
+修改:现在HTTP的任务代码区分get和post了
+修改:mysql默认使用utf8字符集了
+
+added:short link create and forward supported
+added:data test api interface
+update:match xengine v8.x
+update:makefile to support cross platform
+modify:test function name to socket
+modify:The http task now distinguishes between post and get
+modify:mysql used to utf8 charset
+======================================================================================
 XEngine_APIService V2.8.0.1001
 
 添加:二维码识别与创建功能

XEngine_Release/XEngine_Config/XEngine_Config.json

@@ -19,10 +19,10 @@
         "LogLeave":32
     },
     "XSql":{
-        "SQLAddr":"192.168.1.10",
+        "SQLAddr":"42.194.178.57",
         "SQLPort":3306,
         "SQLUser":"root",
-        "SQLPass":"123123aa"
+        "SQLPass":"111"
     },
     "XApi":{
         "tszBankUrl":"https://ccdcapi.alipay.com/validateAndCacheCardInfo.json?cardNo=%s&cardBinCheck=true",
@@ -37,7 +37,12 @@
         "tszConfigOPencc":"./XEngine_Config/XEngine_OPenccConfig.json",
         "tszConfigQRCode":"./XEngine_Config/XEngine_QRCode.json"
     },
+    "XShortLink":{
+        "tszHostUrl":"url.xyry.org",
+        "nHTTPCode":301
+    },
     "XVer":[
+        "2.9.0.1001 Build20230421",
         "2.8.0.1001 Build20230207",
         "2.7.0.1001 Build20230117",
         "2.6.1.1001 Build20221213",

XEngine_SQL/CreateDatabase.sql

@@ -3,5 +3,6 @@
 */
 
 
-CREATE DATABASE `XEngine_APIInfo` DEFAULT CHARACTER SET UTF8MB4 COLLATE utf8mb4_general_ci;
-CREATE DATABASE `XEngine_APILog` DEFAULT CHARACTER SET UTF8MB4 COLLATE utf8mb4_general_ci;
\ No newline at end of file
+CREATE DATABASE `XEngine_APIInfo` DEFAULT CHARACTER SET UTF8MB4 COLLATE utf8mb4_unicode_ci;
+CREATE DATABASE `XEngine_APILog` DEFAULT CHARACTER SET UTF8MB4 COLLATE utf8mb4_unicode_ci;
+CREATE DATABASE `XEngine_APISLink` DEFAULT CHARACTER SET UTF8MB4 COLLATE utf8mb4_unicode_ci;
\ No newline at end of file

XEngine_SQL/XEngine_APIInfo.sql

@@ -22,19 +22,19 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `AdministrativeArea`;
 CREATE TABLE `AdministrativeArea`  (
-  `id` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `pid` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `shortname` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `merger_name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `level` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `pinyin` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `code` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `zip_code` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `first` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `lng` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `lat` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+  `id` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `pid` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `shortname` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `merger_name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `level` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `pinyin` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `code` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `zip_code` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `first` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `lng` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `lat` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of AdministrativeArea
@@ -3795,10 +3795,10 @@ INSERT INTO `AdministrativeArea` VALUES ('3749', '0', '钓鱼岛', '钓鱼岛',
 DROP TABLE IF EXISTS `BankList`;
 CREATE TABLE `BankList`  (
   `ID` int NOT NULL AUTO_INCREMENT,
-  `tszBankAbridge` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `tszBankName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+  `tszBankAbridge` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
+  `tszBankName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 169 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 169 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of BankList
@@ -3977,10 +3977,10 @@ INSERT INTO `BankList` VALUES (168, 'ZZBANK', '郑州银行');
 -- ----------------------------
 DROP TABLE IF EXISTS `RegionID`;
 CREATE TABLE `RegionID`  (
-  `code` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `parentCode` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+  `code` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL,
+  `parentCode` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of RegionID

XEngine_SQL/XEngine_APILog.sql

@@ -23,13 +23,13 @@ SET FOREIGN_KEY_CHECKS = 0;
 DROP TABLE IF EXISTS `XLogTemplate`;
 CREATE TABLE `XLogTemplate`  (
   `ID` int NOT NULL AUTO_INCREMENT,
-  `tszFileName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件名',
-  `tszFuncName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '函数名',
+  `tszFileName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '文件名',
+  `tszFuncName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '函数名',
   `nLogLine` int NULL DEFAULT NULL COMMENT '第几行',
   `nLogLevel` int NULL DEFAULT NULL COMMENT '打印级别',
-  `tszLogBuffer` varchar(8196) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '日志信息',
+  `tszLogBuffer` varchar(8196) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '日志信息',
   `tszLogTime` datetime NOT NULL COMMENT '日志时间',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;

XEngine_SQL/XEngine_APISLink.sql

@@ -23,12 +23,12 @@ SET FOREIGN_KEY_CHECKS = 0;
 DROP TABLE IF EXISTS `XEngine_ShortLink`;
 CREATE TABLE `XEngine_ShortLink`  (
   `ID` int NOT NULL AUTO_INCREMENT COMMENT 'ID',
-  `tszFullUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '要映射的URL',
-  `tszShortUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '短连接URL',
-  `tszKeyUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'URLKey',
-  `tszMapUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '映射到的地址',
+  `tszFullUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '要映射的URL',
+  `tszShortUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '短连接URL',
+  `tszKeyUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'URLKey',
+  `tszMapUrl` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '映射到的地址',
   `tszCreateTime` datetime NOT NULL COMMENT '创建的时间',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;

XEngine_Source/XEngine_ServiceApp/XEngine_HttpApp/XEngine_HttpApp.cpp

@@ -322,7 +322,7 @@ int main(int argc, char** argv)
 	//展示能力
 	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("启动服务中,加载的Lib插件:%d 个,Lua插件:%d 个"), st_PluginLibConfig.pStl_ListPlugin->size(), st_PluginLuaConfig.pStl_ListPlugin->size());
 
-	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动，服务运行中，XEngine版本:%s,发行版本次数:%d,当前版本：%s。。。"), BaseLib_OperatorVer_XGetStr(), st_ServiceConfig.st_XVer.pStl_ListVer->size(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str());
+	XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_INFO, _X("所有服务成功启动，服务运行中，XEngine版本:%s%s,发行版本次数:%d,当前版本：%s。。。"), BaseLib_OperatorVer_XNumberStr(), BaseLib_OperatorVer_XTypeStr(), st_ServiceConfig.st_XVer.pStl_ListVer->size(), st_ServiceConfig.st_XVer.pStl_ListVer->front().c_str());
 	while (true)
 	{
 		std::this_thread::sleep_for(std::chrono::seconds(1));