github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-18 05:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2024-12-13 15:59:24 +08:00
parent 49aa1434aa
commit 4ae6ca945b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Api/UsersController.php
View File

@ -1152,7 +1152,6 @@ class UsersController extends AbstractController
* - remove: 删除 * - remove: 删除
* @apiParam {String} alias 别名 * @apiParam {String} alias 别名
* @apiParam {String} [userAgent] 浏览器信息 * @apiParam {String} [userAgent] 浏览器信息
* @apiParam {String} [osVersion] 应用的版本号
* @apiParam {String} [deviceModel] 设备型号 * @apiParam {String} [deviceModel] 设备型号
* @apiParam {String} [isNotified] 是否有通知权限（0不通知、1通知） * @apiParam {String} [isNotified] 是否有通知权限（0不通知、1通知）
* *
@ -1186,13 +1185,14 @@ class UsersController extends AbstractController
'alias' => $data['alias'], 'alias' => $data['alias'],
'platform' => Base::platform(), 'platform' => Base::platform(),
]; ];
$version = $data['appVersion'] ? ($data['appVersionName'] . " ({$data['appVersion']})") : '';
$isNotified = trim($data['isNotified']) === 'true' || $data['isNotified'] === true ? 1 : intval($data['isNotified']); $isNotified = trim($data['isNotified']) === 'true' || $data['isNotified'] === true ? 1 : intval($data['isNotified']);
$row = UmengAlias::where($inArray); $row = UmengAlias::where($inArray);
if ($row->exists()) { if ($row->exists()) {
$row->update([ $row->update([
'ua' => $data['userAgent'], 'ua' => $data['userAgent'],
'version' => $data['osVersion'],
'device' => $data['deviceModel'], 'device' => $data['deviceModel'],
'version' => $version,
'is_notified' => $isNotified, 'is_notified' => $isNotified,
'updated_at' => Carbon::now() 'updated_at' => Carbon::now()
]); ]);
@ -1200,8 +1200,8 @@ class UsersController extends AbstractController
} }
$row = UmengAlias::createInstance(array_merge($inArray, [ $row = UmengAlias::createInstance(array_merge($inArray, [
'ua' => $data['userAgent'], 'ua' => $data['userAgent'],
'version' => $data['osVersion'],
'device' => $data['deviceModel'], 'device' => $data['deviceModel'],
'version' => $version,
'is_notified' => $isNotified, 'is_notified' => $isNotified,
])); ]));
if ($row->save()) { if ($row->save()) {

2
resources/mobile

@ -1 +1 @@
Subproject commit 5a7bbcea45ab4444c7394d21cea5ace8a0615221 Subproject commit 0e1939dec7e93aa07a0b65acfabfd14820f9422a