diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index a0af87810..7cc58cf06 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -1152,6 +1152,7 @@ class UsersController extends AbstractController * - remove: 删除 * @apiParam {String} alias 别名 * @apiParam {String} [userAgent] 浏览器信息 + * @apiParam {String} [osVersion] 应用的版本号 * @apiParam {String} [deviceModel] 设备型号 * @apiParam {String} [isNotified] 是否有通知权限(0不通知、1通知) * @@ -1190,6 +1191,7 @@ class UsersController extends AbstractController if ($row->exists()) { $row->update([ 'ua' => $data['userAgent'], + 'version' => $data['osVersion'], 'device' => $data['deviceModel'], 'is_notified' => $isNotified, 'updated_at' => Carbon::now() @@ -1198,6 +1200,7 @@ class UsersController extends AbstractController } $row = UmengAlias::createInstance(array_merge($inArray, [ 'ua' => $data['userAgent'], + 'version' => $data['osVersion'], 'device' => $data['deviceModel'], 'is_notified' => $isNotified, ])); diff --git a/app/Models/UmengAlias.php b/app/Models/UmengAlias.php index 1d4016348..40df0e17c 100644 --- a/app/Models/UmengAlias.php +++ b/app/Models/UmengAlias.php @@ -15,6 +15,7 @@ use Hedeqiang\UMeng\IOS; * @property string|null $alias 别名 * @property string|null $platform 平台类型 * @property string|null $device 设备类型 + * @property string|null $version 应用版本号 * @property string|null $ua userAgent * @property int|null $is_notified 通知权限 * @property \Illuminate\Support\Carbon|null $created_at @@ -31,6 +32,7 @@ use Hedeqiang\UMeng\IOS; * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereAlias($value) * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereDevice($value) + * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereVersion($value) * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias whereIsNotified($value) * @method static \Illuminate\Database\Eloquent\Builder|UmengAlias wherePlatform($value) diff --git a/database/migrations/2024_12_13_122606_add_version_to_umeng_alias.php b/database/migrations/2024_12_13_122606_add_version_to_umeng_alias.php new file mode 100644 index 000000000..86207e42a --- /dev/null +++ b/database/migrations/2024_12_13_122606_add_version_to_umeng_alias.php @@ -0,0 +1,36 @@ +string('version', 50)->nullable()->default('')->after('device')->comment('应用版本号'); + } + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('umeng_alias', function (Blueprint $table) { + if (Schema::hasColumn('umeng_alias', 'version')) { + $table->dropColumn('version'); + } + }); + } +}