From 6e68f399b4e1f2dfa6beef060f348f3f466ab5b2 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 20 Mar 2024 02:49:30 +0900
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/UsersController.php  | 11 +++-
 ...24_03_20_024119_add_umeng_alias_device.php | 38 +++++++++++++
 resources/assets/js/App.vue                   |  8 ++-
 .../components/DialogGroupWordChain.vue       | 57 ++++++++++---------
 4 files changed, 81 insertions(+), 33 deletions(-)
 create mode 100644 database/migrations/2024_03_20_024119_add_umeng_alias_device.php

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 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUmengAliasDevice extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+        Schema::table('umeng_alias', function (Blueprint $table) {
+            if (!Schema::hasColumn('umeng_alias', 'device')) {
+                $table->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 @@
 
 <script>
 import {mapState} from "vuex";
+
 export default {
     name: 'DialogDroupWordChain',
 
@@ -85,46 +86,46 @@ export default {
     computed: {
         ...mapState(['dialogDroupWordChain', 'userInfo', 'dialogMsgs', 'cacheDialogs']),
 
-        isFullscreen({ windowWidth }) {
+        isFullscreen({windowWidth}) {
             return windowWidth < 576;
         },
 
-        num(){
-            return this.list.filter(h=>h.type != 'case')?.length || 0;
+        num() {
+            return this.list.filter(h => h.type != 'case')?.length || 0;
         },
 
-        allList(){
+        allList() {
             const msg = this.dialogDroupWordChain.msgData?.msg || {};
             let list = JSON.parse(JSON.stringify(msg.list || []));
-            this.dialogMsgs.filter(h=>{
+            this.dialogMsgs.filter(h => {
                 return h.type == "word-chain" && h.msg?.uuid == msg.uuid
-            }).forEach((h)=>{
-                (h.msg.list || []).forEach(k=>{
-                    if (k.type != 'case' && list.map(j=>j.id).indexOf(k.id) == -1) {
+            }).forEach((h) => {
+                (h.msg.list || []).forEach(k => {
+                    if (k.type != 'case' && list.map(j => j.id).indexOf(k.id) == -1) {
                         list.push(k)
                     }
                 })
             });
-            return list.filter(h=>(h.text || '').trim());
+            return list.filter(h => (h.text || '').trim());
         },
 
-        isEdit(){
+        isEdit() {
             return this.oldData != JSON.stringify(this.list);
         },
 
-        dialog(){
-            return this.cacheDialogs.find(h=>h.id == this.dialogDroupWordChain.dialog_id) || {}
+        dialog() {
+            return this.cacheDialogs.find(h => h.id == this.dialogDroupWordChain.dialog_id) || {}
         },
     },
 
     watch: {
-        show(val){
-            if(!val){
+        show(val) {
+            if (!val) {
                 this.value = "#" + this.$L('接龙') + " \n";
                 this.list = [];
-            }else{
-                if(this.dialogDroupWordChain.type == 'create'){
-                    this.$nextTick(()=>{
+            } else {
+                if (this.dialogDroupWordChain.type == 'create') {
+                    this.$nextTick(() => {
                         this.$refs.wordChainTextareaRef.focus()
                     })
                 }
@@ -133,7 +134,7 @@ export default {
         },
 
         dialogDroupWordChain(data) {
-            if(data.type == 'create' && data.dialog_id){
+            if (data.type == 'create' && data.dialog_id) {
                 this.show = true;
                 this.createId = this.userId;
                 this.list = [];
@@ -150,18 +151,18 @@ export default {
                     text: this.userInfo.nickname
                 });
             }
-            if(data.type == 'participate' && data.dialog_id && data.msgData){
+            if (data.type == 'participate' && data.dialog_id && data.msgData) {
                 this.show = true;
                 this.createId = data.msgData.msg.createid || data.msgData.msg.userid;
                 this.value = data.msgData.msg.text;
-                this.list =  this.allList;
+                this.list = this.allList;
                 this.oldData = JSON.stringify(this.list);
             }
         }
     },
 
     methods: {
-        onAdd(){
+        onAdd() {
             this.list.push({
                 id: Date.now(),
                 type: 'text',
@@ -171,8 +172,8 @@ export default {
             this.scrollTo();
         },
 
-        scrollTo(){
-            this.$nextTick(()=>{
+        scrollTo() {
+            this.$nextTick(() => {
                 this.$refs.wordChainListRef.scrollTo(0, 99999);
             });
         },
@@ -186,14 +187,14 @@ export default {
                 return;
             }
             //
-            const texts = this.list.map(h=> h.text);
-            if( texts.length != [...new Set(texts)].length ){
+            const texts = this.list.map(h => h.text);
+            if (texts.length != [...new Set(texts)].length) {
                 $A.modalConfirm({
                     content: '重复内容将不再计入接龙结果',
                     cancelText: '返回编辑',
                     okText: '继续发送',
                     onOk: () => {
-                       this.send()
+                        this.send()
                     }
                 })
                 return;
@@ -206,8 +207,8 @@ export default {
          */
         send() {
             const list = [];
-            this.list.forEach(h=>{
-                if ((h.text || h.type != "case") && list.map(h=> h.text).indexOf(h.text) == -1) {
+            this.list.forEach(h => {
+                if ((h.text || h.type != "case") && list.map(h => h.text).indexOf(h.text) == -1) {
                     list.push(h);
                 }
             });