Skip to content

Commit 5fe0d95

Browse files
jevantangjevantang
committed
chore: api data
1 parent 1883799 commit 5fe0d95

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

‎app/Helpers/DataHelper.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ public static function getFresnsGroups(string $listKey): array
261261
break;
262262
}
263263

264-
$cacheTime = CacheHelper::fresnsCacheTimeByFileType(File::TYPE_ALL, 120);
264+
$cacheTime = CacheHelper::fresnsCacheTimeByFileType(File::TYPE_ALL, 60);
265265
CacheHelper::put($listArr, $cacheKey, $cacheTag, null, $cacheTime);
266266
}
267267

@@ -352,7 +352,7 @@ public static function getFresnsIndexList(string $listKey): array
352352

353353
$listArr = data_get($result, 'data.list', []);
354354

355-
$cacheTime = CacheHelper::fresnsCacheTimeByFileType(File::TYPE_ALL, 120);
355+
$cacheTime = CacheHelper::fresnsCacheTimeByFileType(File::TYPE_ALL, 60);
356356
CacheHelper::put($listArr, $cacheKey, $cacheTag, null, $cacheTime);
357357
}
358358

@@ -443,7 +443,7 @@ public static function getFresnsList(string $listKey): array
443443

444444
$listArr = data_get($result, 'data.list', []);
445445

446-
$cacheTime = CacheHelper::fresnsCacheTimeByFileType(File::TYPE_ALL, 120);
446+
$cacheTime = CacheHelper::fresnsCacheTimeByFileType(File::TYPE_ALL, 60);
447447
CacheHelper::put($listArr, $cacheKey, $cacheTag, null, $cacheTime);
448448
}
449449

‎app/Http/Controllers/ApiController.php‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public function sendVerifyCode(Request $request)
168168
}
169169

170170
// upload file
171-
public function uploadFile()
171+
public function uploadFile(Request $request)
172172
{
173173
$multipart = [];
174174

@@ -193,6 +193,10 @@ public function uploadFile()
193193
'multipart' => $multipart,
194194
]);
195195

196+
if ($request->post('tableName') == 'users') {
197+
DataHelper::cacheForgetAccountAndUser();
198+
}
199+
196200
return \response()->json($response);
197201
}
198202

@@ -231,7 +235,7 @@ public function accountRegister(Request $request)
231235
if ($cacheKey) {
232236
$cacheTags = ['fresnsWeb', 'fresnsWebAccountTokens'];
233237
$cacheData = [
234-
'aid' => data_get($result, 'data.detail.aid'),
238+
'aid' => data_get($result, 'data.sessionToken.aid'),
235239
'aidToken' => data_get($result, 'data.sessionToken.token'),
236240
];
237241
CacheHelper::put($cacheData, $cacheKey, $cacheTags, 3, now()->addMinutes(3));
@@ -241,10 +245,10 @@ public function accountRegister(Request $request)
241245
$accountExpiredHours = data_get($result, 'data.sessionToken.expiredHours') ?? 8760;
242246
$accountTokenMinutes = $accountExpiredHours * 60;
243247

244-
Cookie::queue($fresnsAid, $data['detail']['aid'], $accountTokenMinutes);
248+
Cookie::queue($fresnsAid, $data['sessionToken']['aid'], $accountTokenMinutes);
245249
Cookie::queue($fresnsAidToken, $data['sessionToken']['token'], $accountTokenMinutes);
246250

247-
\request()->offsetSet($fresnsAid, $data['detail']['aid']);
251+
\request()->offsetSet($fresnsAid, $data['sessionToken']['aid']);
248252
\request()->offsetSet($fresnsAidToken, $data['sessionToken']['token']);
249253

250254
// forget cache
@@ -262,7 +266,7 @@ public function accountRegister(Request $request)
262266
$userExpiredHours = data_get($userResult, 'data.sessionToken.expiredHours') ?? 8760;
263267
$userTokenMinutes = $userExpiredHours * 60;
264268

265-
Cookie::queue($fresnsUid, data_get($userResult, 'data.detail.uid'), $userTokenMinutes);
269+
Cookie::queue($fresnsUid, data_get($userResult, 'data.sessionToken.uid'), $userTokenMinutes);
266270
Cookie::queue($fresnsUidToken, data_get($userResult, 'data.sessionToken.token'), $userTokenMinutes);
267271

268272
if ($userResult['code'] != 0) {
@@ -321,7 +325,7 @@ public function accountLogin(Request $request)
321325
if ($cacheKey) {
322326
$cacheTags = ['fresnsWeb', 'fresnsWebAccountTokens'];
323327
$cacheData = [
324-
'aid' => data_get($result, 'data.detail.aid'),
328+
'aid' => data_get($result, 'data.sessionToken.aid'),
325329
'aidToken' => data_get($result, 'data.sessionToken.token'),
326330
];
327331
CacheHelper::put($cacheData, $cacheKey, $cacheTags, 3, now()->addMinutes(3));
@@ -362,7 +366,7 @@ public function accountLogin(Request $request)
362366
return redirect()->intended(fs_route(route('fresns.account.login')));
363367
} else {
364368
// User does not have a password
365-
\request()->offsetSet($fresnsAid, $data['detail']['aid']);
369+
\request()->offsetSet($fresnsAid, $data['sessionToken']['aid']);
366370
\request()->offsetSet($fresnsAidToken, $data['sessionToken']['token']);
367371

368372
DataHelper::cacheForgetAccountAndUser();
@@ -385,7 +389,7 @@ public function accountLogin(Request $request)
385389
$userExpiredHours = data_get($userResult, 'data.sessionToken.expiredHours') ?? 8760;
386390
$userTokenMinutes = $userExpiredHours * 60;
387391

388-
Cookie::queue($fresnsUid, data_get($userResult, 'data.detail.uid'), $userTokenMinutes);
392+
Cookie::queue($fresnsUid, data_get($userResult, 'data.sessionToken.uid'), $userTokenMinutes);
389393
Cookie::queue($fresnsUidToken, data_get($userResult, 'data.sessionToken.token'), $userTokenMinutes);
390394

391395
if ($request->wantsJson()) {
@@ -429,7 +433,7 @@ public function accountConnectLogin(Request $request)
429433
$redirectURL = $request->redirectURL;
430434

431435
// check api code
432-
if ($accountCode != 0 || empty(data_get($accountData, 'detail.aid')) || empty(data_get($accountData, 'sessionToken.token'))) {
436+
if ($accountCode != 0 || empty(data_get($accountData, 'sessionToken.aid')) || empty(data_get($accountData, 'sessionToken.token'))) {
433437
return back()->with([
434438
'code' => $accountCode,
435439
'failure' => $accountMessage,
@@ -448,7 +452,7 @@ public function accountConnectLogin(Request $request)
448452
if ($cacheKey) {
449453
$cacheTags = ['fresnsWeb', 'fresnsWebAccountTokens'];
450454
$cacheData = [
451-
'aid' => data_get($accountData, 'detail.aid'),
455+
'aid' => data_get($accountData, 'sessionToken.aid'),
452456
'aidToken' => data_get($accountData, 'sessionToken.token'),
453457
];
454458
CacheHelper::put($cacheData, $cacheKey, $cacheTags, 3, now()->addMinutes(3));
@@ -458,7 +462,7 @@ public function accountConnectLogin(Request $request)
458462
$accountExpiredHours = data_get($accountData, 'sessionToken.expiredHours') ?? 8760;
459463
$accountTokenMinutes = $accountExpiredHours * 60;
460464

461-
Cookie::queue($fresnsAid, data_get($accountData, 'detail.aid'), $accountTokenMinutes);
465+
Cookie::queue($fresnsAid, data_get($accountData, 'sessionToken.aid'), $accountTokenMinutes);
462466
Cookie::queue($fresnsAidToken, data_get($accountData, 'sessionToken.token'), $accountTokenMinutes);
463467

464468
// Number of users under the account
@@ -486,7 +490,7 @@ public function accountConnectLogin(Request $request)
486490
return redirect()->intended(fs_route(route('fresns.account.login')));
487491
} else {
488492
// User does not have a password
489-
\request()->offsetSet($fresnsAid, $accountData['detail']['aid']);
493+
\request()->offsetSet($fresnsAid, $accountData['sessionToken']['aid']);
490494
\request()->offsetSet($fresnsAidToken, $accountData['sessionToken']['token']);
491495

492496
DataHelper::cacheForgetAccountAndUser();
@@ -509,7 +513,7 @@ public function accountConnectLogin(Request $request)
509513
$userExpiredHours = data_get($userResult, 'data.sessionToken.expiredHours') ?? 8760;
510514
$userTokenMinutes = $userExpiredHours * 60;
511515

512-
Cookie::queue($fresnsUid, data_get($userResult, 'data.detail.uid'), $userTokenMinutes);
516+
Cookie::queue($fresnsUid, data_get($userResult, 'data.sessionToken.uid'), $userTokenMinutes);
513517
Cookie::queue($fresnsUidToken, data_get($userResult, 'data.sessionToken.token'), $userTokenMinutes);
514518

515519
if ($request->wantsJson()) {

0 commit comments

Comments
 (0)