@@ -153,7 +153,6 @@ BOOL CConfig_Json::Config_Json_File(LPCTSTR lpszConfigFile, XENGINE_SERVERCONFIG
153153 pSt_ServerConfig->st_XStorage .nHashMode = st_JsonXStorage[" nHashMode" ].asInt ();
154154 pSt_ServerConfig->st_XStorage .bUPHash = st_JsonXStorage[" bUPHash" ].asInt ();
155155 pSt_ServerConfig->st_XStorage .bResumable = st_JsonXStorage[" bResumable" ].asInt ();
156- _tcscpy (pSt_ServerConfig->st_XStorage .tszFileDir , st_JsonXStorage[" tszFileDir" ].asCString ());
157156
158157 if (st_JsonRoot[" XProxy" ].empty () || (2 != st_JsonRoot[" XProxy" ].size ()))
159158 {
@@ -317,20 +316,38 @@ BOOL CConfig_Json::Config_Json_LoadBalance(LPCTSTR lpszConfigFile, XENGINE_LBCON
317316 {
318317 pSt_ServerConfig->st_LoadBalance .pStl_ListUseMode ->push_back (st_JsonLoadBalance[" nUseMode" ][i].asInt ());
319318 }
319+
320320 pSt_ServerConfig->st_LoadBalance .pStl_ListCenter = new list<string>;
321321 for (unsigned int i = 0 ; i < st_JsonLoadBalance[" CenterAddr" ].size (); i++)
322322 {
323323 pSt_ServerConfig->st_LoadBalance .pStl_ListCenter ->push_back (st_JsonLoadBalance[" CenterAddr" ][i].asCString ());
324324 }
325+
325326 pSt_ServerConfig->st_LoadBalance .pStl_ListDownload = new list<string>;
326327 for (unsigned int i = 0 ; i < st_JsonLoadBalance[" DownloadAddr" ].size (); i++)
327328 {
328329 pSt_ServerConfig->st_LoadBalance .pStl_ListDownload ->push_back (st_JsonLoadBalance[" DownloadAddr" ][i].asCString ());
329330 }
331+
330332 pSt_ServerConfig->st_LoadBalance .pStl_ListUPLoader = new list<string>;
331333 for (unsigned int i = 0 ; i < st_JsonLoadBalance[" UPLoaderAddr" ].size (); i++)
332334 {
333335 pSt_ServerConfig->st_LoadBalance .pStl_ListUPLoader ->push_back (st_JsonLoadBalance[" UPLoaderAddr" ][i].asCString ());
334336 }
337+
338+ Json::Value st_JsonBucket = st_JsonLoadBalance[" StorageAddr" ];
339+ pSt_ServerConfig->st_LoadBalance .pStl_ListBucket = new list<XENGINE_STORAGEBUCKET>;
340+ for (unsigned int i = 0 ; i < st_JsonBucket.size (); i++)
341+ {
342+ XENGINE_STORAGEBUCKET st_Bucket;
343+ memset (&st_Bucket, ' \0 ' , sizeof (XENGINE_STORAGEBUCKET));
344+
345+ st_Bucket.bEnable = st_JsonBucket[i][" bEnable" ].asInt ();
346+ st_Bucket.nLevel = st_JsonBucket[i][" nLevel" ].asInt ();
347+ _tcscpy (st_Bucket.tszBuckSize , st_JsonBucket[i][" Size" ].asCString ());
348+ _tcscpy (st_Bucket.tszFilePath , st_JsonBucket[i][" XEngine_File" ].asCString ());
349+
350+ pSt_ServerConfig->st_LoadBalance .pStl_ListBucket ->push_back (st_Bucket);
351+ }
335352 return TRUE ;
336353}
0 commit comments