diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 72f3364e4..6cc56223a 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -1101,10 +1101,17 @@ class UsersController extends AbstractController ]; $row = UmengAlias::where($inArray); if ($row->exists()) { - $row->update(['updated_at' => Carbon::now()]); + $row->update([ + 'ua' => $data['userAgent'], + 'device' => $data['deviceModel'], + 'updated_at' => Carbon::now() + ]); return Base::retSuccess('别名已存在'); } - $row = UmengAlias::createInstance($inArray); + $row = UmengAlias::createInstance(array_merge($inArray, [ + 'ua' => $data['userAgent'], + 'device' => $data['deviceModel'], + ])); if ($row->save()) { return Base::retSuccess('添加成功'); } else { diff --git a/database/migrations/2024_03_20_024119_add_umeng_alias_device.php b/database/migrations/2024_03_20_024119_add_umeng_alias_device.php new file mode 100644 index 000000000..b15db9adc --- /dev/null +++ b/database/migrations/2024_03_20_024119_add_umeng_alias_device.php @@ -0,0 +1,38 @@ +text('ua')->nullable()->after('platform')->comment('userAgent'); + $table->string('device', 100)->nullable()->default('')->after('platform')->comment('设备类型'); + } + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('umeng_alias', function (Blueprint $table) { + $table->dropColumn("ua"); + $table->dropColumn("device"); + }); + } +} diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index 0d4ca65e3..397cb667f 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -101,13 +101,15 @@ export default { // if (this.userId > 0 && this.$isEEUiApp) { $A.eeuiAppSendMessage({ - action: 'intiUmeng', + action: 'initApp', + apiUrl: $A.apiUrl(''), + userid: this.userId, + token: this.userToken, + userAgent: window.navigator.userAgent, }); setTimeout(_ => { $A.eeuiAppSendMessage({ action: 'setUmengAlias', - userid: this.userId, - token: this.userToken, url: $A.apiUrl('users/umeng/alias') }); }, 6000) diff --git a/resources/assets/js/pages/manage/components/DialogGroupWordChain.vue b/resources/assets/js/pages/manage/components/DialogGroupWordChain.vue index 53ab90649..ed221b02e 100644 --- a/resources/assets/js/pages/manage/components/DialogGroupWordChain.vue +++ b/resources/assets/js/pages/manage/components/DialogGroupWordChain.vue @@ -66,6 +66,7 @@