Skip to content

Commit 2427b47

Browse files
committed
fixed:configure parse failed
1 parent 5b69f07 commit 2427b47

File tree

3 files changed

+18
-17
lines changed

3 files changed

+18
-17
lines changed

XEngine_Release/XEngine_Config/XEngine_Config.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"tszWeatherUrl":"https://restapi.amap.com/v3/weather/weatherInfo?city=%s&key=3239fc302d6480ce49973f4d1c59e5d8",
3535
"tszBankUrl":"https://ccdcapi.alipay.com/validateAndCacheCardInfo.json?cardNo=%s&cardBinCheck=true",
3636
"tszOilUrl":"https://www.iamwawa.cn/oilprice/api?area=%s",
37-
"tszTranslationUrl":"https://fanyi-api.baidu.com/api/trans/vip/translate",
3837
"st_TranslationInfo":{
38+
"url":"https://fanyi-api.baidu.com/api/trans/vip/translate",
3939
"appid":"20231228001924304",
4040
"key":"udXGjpmNVeQHml1FjT8E"
4141
}
@@ -55,11 +55,6 @@
5555
"tszConfigHTTPMime":"./XEngine_Config/HttpMime.types",
5656
"tszConfigHTTPCode":"./XEngine_Config/HttpCode.types"
5757
},
58-
"XImageText":{
59-
"bEnable":true,
60-
"tszImagePath":"./XEngine_Config/tessdata",
61-
"tszImageLanguage":"chi_sim+eng"
62-
},
6358
"XShortLink":{
6459
"tszHostUrl":"url.xyry.org",
6560
"nHTTPCode":301
@@ -72,16 +67,21 @@
7267
"bDeamon":false
7368
}
7469
},
70+
"XReport":{
71+
"bEnable":true,
72+
"tszAPIUrl":"http://app.xyry.org:5501/api?function=machine",
73+
"tszServiceName":"XEngine_APIService"
74+
},
75+
"XImageText":{
76+
"bEnable":true,
77+
"tszImagePath":"./XEngine_Config/tessdata",
78+
"tszImageLanguage":"chi_sim+eng"
79+
},
7580
"XAPIModule": {
7681
"bEnable": true,
7782
"tszDBPhone": "./XEngine_DBFile/phone.xdb",
7883
"tszDBMac": "./XEngine_DBFile/macaddr.xdb",
7984
"tszDBIPAddr": "./XEngine_DBFile/GeoLite2-City.mmdb",
8085
"tszDBISPAddr": "./XEngine_DBFile/GeoLite2-ASN.mmdb"
81-
},
82-
"XReport":{
83-
"bEnable":true,
84-
"tszAPIUrl":"http://app.xyry.org:5501/api?function=machine",
85-
"tszServiceName":"XEngine_APIService"
8686
}
8787
}

XEngine_Release/XEngine_Config/XEngine_VersionConfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"XVer":[
3+
"3.10.0.1001 Build20250416",
34
"3.9.0.1001 Build20250224",
45
"3.8.0.1001 Build20241227",
56
"3.7.0.1001 Build20240927",

XEngine_Source/XEngine_ModuleConfigure/ModuleConfigure_Json/ModuleConfigure_Json.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,16 +172,16 @@ bool CModuleConfigure_Json::ModuleConfigure_Json_File(LPCXSTR lpszConfigFile, XE
172172
return false;
173173
}
174174
Json::Value st_JsonXConfig = st_JsonRoot["XConfig"];
175-
176-
_tcsxcpy(pSt_ServerConfig->st_XConfig.st_ConfigQRCodec.tszModelDetect, st_JsonXConfig["st_ConfigQRCode"]["tszModelDetect"].asCString());
177-
_tcsxcpy(pSt_ServerConfig->st_XConfig.st_ConfigQRCodec.tszModelSr, st_JsonXConfig["st_ConfigQRCode"]["tszModelSr"].asCString());
178-
_tcsxcpy(pSt_ServerConfig->st_XConfig.st_ConfigQRCodec.tszProtoDetect, st_JsonXConfig["st_ConfigQRCode"]["tszProtoDetect"].asCString());
179-
_tcsxcpy(pSt_ServerConfig->st_XConfig.st_ConfigQRCodec.tszProtoSr, st_JsonXConfig["st_ConfigQRCode"]["tszProtoSr"].asCString());
180-
181175
_tcsxcpy(pSt_ServerConfig->st_XConfig.tszConfigDeamon, st_JsonXConfig["tszConfigDeamon"].asCString());
182176
_tcsxcpy(pSt_ServerConfig->st_XConfig.tszConfigHTTPMime, st_JsonXConfig["tszConfigHTTPMime"].asCString());
183177
_tcsxcpy(pSt_ServerConfig->st_XConfig.tszConfigHTTPCode, st_JsonXConfig["tszConfigHTTPCode"].asCString());
184178

179+
Json::Value st_JsonXConfigQRCode = st_JsonXConfig["st_ConfigQRCode"];
180+
_tcsxcpy(pSt_ServerConfig->st_XConfig.st_ConfigQRCodec.tszModelDetect, st_JsonXConfigQRCode["tszModelDetect"].asCString());
181+
_tcsxcpy(pSt_ServerConfig->st_XConfig.st_ConfigQRCodec.tszModelSr, st_JsonXConfigQRCode["tszModelSr"].asCString());
182+
_tcsxcpy(pSt_ServerConfig->st_XConfig.st_ConfigQRCodec.tszProtoDetect, st_JsonXConfigQRCode["tszProtoDetect"].asCString());
183+
_tcsxcpy(pSt_ServerConfig->st_XConfig.st_ConfigQRCodec.tszProtoSr, st_JsonXConfigQRCode["tszProtoSr"].asCString());
184+
185185
if (st_JsonRoot["XShortLink"].empty() || (2 != st_JsonRoot["XShortLink"].size()))
186186
{
187187
Config_IsErrorOccur = true;

0 commit comments

Comments
 (0)