@@ -147,8 +147,8 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG
147147 }
148148 Json::Value st_JsonXStorage = st_JsonRoot[" XStorage" ];
149149 pSt_ServerConfig->st_XStorage .nHashMode = st_JsonXStorage[" nHashMode" ].asInt ();
150- pSt_ServerConfig->st_XStorage .bUPHash = st_JsonXStorage[" bUPHash" ].asInt ();
151- pSt_ServerConfig->st_XStorage .bResumable = st_JsonXStorage[" bResumable" ].asInt ();
150+ pSt_ServerConfig->st_XStorage .bUPHash = st_JsonXStorage[" bUPHash" ].asBool ();
151+ pSt_ServerConfig->st_XStorage .bResumable = st_JsonXStorage[" bResumable" ].asBool ();
152152
153153 if (st_JsonRoot[" XProxy" ].empty () || (6 != st_JsonRoot[" XProxy" ].size ()))
154154 {
@@ -209,20 +209,20 @@ bool CConfig_Json::Config_Json_File(LPCXSTR lpszConfigFile, XENGINE_SERVERCONFIG
209209 return false ;
210210 }
211211 Json::Value st_JsonCert = st_JsonRoot[" XCert" ];
212- pSt_ServerConfig->st_XCert .bDLEnable = st_JsonCert[" bDLEnable" ].asInt ();
213- pSt_ServerConfig->st_XCert .bUPEnable = st_JsonCert[" bUPEnable" ].asInt ();
214- pSt_ServerConfig->st_XCert .bCHEnable = st_JsonCert[" bCHEnable" ].asInt ();
215- if (!st_JsonP2xp [" tszCertChain" ].isNull ())
212+ pSt_ServerConfig->st_XCert .bDLEnable = st_JsonCert[" bDLEnable" ].asBool ();
213+ pSt_ServerConfig->st_XCert .bUPEnable = st_JsonCert[" bUPEnable" ].asBool ();
214+ pSt_ServerConfig->st_XCert .bCHEnable = st_JsonCert[" bCHEnable" ].asBool ();
215+ if (!st_JsonCert [" tszCertChain" ].isNull ())
216216 {
217- _tcsxcpy (pSt_ServerConfig->st_XCert .tszCertChain , st_JsonP2xp [" tszCertChain" ].asCString ());
217+ _tcsxcpy (pSt_ServerConfig->st_XCert .tszCertChain , st_JsonCert [" tszCertChain" ].asCString ());
218218 }
219- if (!st_JsonP2xp [" tszCertServer" ].isNull ())
219+ if (!st_JsonCert [" tszCertServer" ].isNull ())
220220 {
221- _tcsxcpy (pSt_ServerConfig->st_XCert .tszCertServer , st_JsonP2xp [" tszCertServer" ].asCString ());
221+ _tcsxcpy (pSt_ServerConfig->st_XCert .tszCertServer , st_JsonCert [" tszCertServer" ].asCString ());
222222 }
223- if (!st_JsonP2xp [" tszCertKey" ].isNull ())
223+ if (!st_JsonCert [" tszCertKey" ].isNull ())
224224 {
225- _tcsxcpy (pSt_ServerConfig->st_XCert .tszCertKey , st_JsonP2xp [" tszCertKey" ].asCString ());
225+ _tcsxcpy (pSt_ServerConfig->st_XCert .tszCertKey , st_JsonCert [" tszCertKey" ].asCString ());
226226 }
227227
228228 if (st_JsonRoot[" XReport" ].empty () || (2 != st_JsonRoot[" XReport" ].size ()))
0 commit comments