From 4ae6ca945b91a2307989460eb79383ae2aef8657 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 13 Dec 2024 15:59:24 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/Api/UsersController.php | 6 +++---
 resources/mobile                             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 7cc58cf06..710803a31 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -1152,7 +1152,6 @@ class UsersController extends AbstractController
      * - remove: 删除
      * @apiParam {String} alias           别名
      * @apiParam {String} [userAgent]     浏览器信息
-     * @apiParam {String} [osVersion]     应用的版本号
      * @apiParam {String} [deviceModel]   设备型号
      * @apiParam {String} [isNotified]    是否有通知权限（0不通知、1通知）
      *
@@ -1186,13 +1185,14 @@ class UsersController extends AbstractController
             'alias' => $data['alias'],
             'platform' => Base::platform(),
         ];
+        $version = $data['appVersion'] ? ($data['appVersionName'] . " ({$data['appVersion']})") : '';
         $isNotified = trim($data['isNotified']) === 'true' || $data['isNotified'] === true ? 1 : intval($data['isNotified']);
         $row = UmengAlias::where($inArray);
         if ($row->exists()) {
             $row->update([
                 'ua' => $data['userAgent'],
-                'version' => $data['osVersion'],
                 'device' => $data['deviceModel'],
+                'version' => $version,
                 'is_notified' => $isNotified,
                 'updated_at' => Carbon::now()
             ]);
@@ -1200,8 +1200,8 @@ class UsersController extends AbstractController
         }
         $row = UmengAlias::createInstance(array_merge($inArray, [
             'ua' => $data['userAgent'],
-            'version' => $data['osVersion'],
             'device' => $data['deviceModel'],
+            'version' => $version,
             'is_notified' => $isNotified,
         ]));
         if ($row->save()) {
diff --git a/resources/mobile b/resources/mobile
index 5a7bbcea4..0e1939dec 160000
--- a/resources/mobile
+++ b/resources/mobile
@@ -1 +1 @@
-Subproject commit 5a7bbcea45ab4444c7394d21cea5ace8a0615221
+Subproject commit 0e1939dec7e93aa07a0b65acfabfd14820f9422a