no message

app/Http/Controllers/IndexController.php

@@ -237,6 +237,29 @@ class IndexController extends InvokeController
                     'url' => Base::fillUrl($path . $fileName),
                 ];
             }
+            //
+            $path = "uploads/android";
+            $dirPath = public_path($path);
+            $lists = Base::readDir($dirPath);
+            $ipkFile = null;
+            foreach ($lists as $file) {
+                if (!str_ends_with($file, '.ipk')) {
+                    continue;
+                }
+                if ($ipkFile && strtotime($ipkFile['time']) > fileatime($file)) {
+                    continue;
+                }
+                $fileName = Base::leftDelete($file, $dirPath);
+                $ipkFile = [
+                    'name' => substr($fileName, 1),
+                    'time' => date("Y-m-d H:i:s", fileatime($file)),
+                    'size' => Base::readableBytes(filesize($file)),
+                    'url' => Base::fillUrl($path . $fileName),
+                ];
+            }
+            if ($ipkFile) {
+                $files = array_merge([$ipkFile], $files);
+            }
             return view('desktop', ['version' => $name, 'files' => $files]);
         }
         // 下载

app/Models/Meeting.php

@@ -12,7 +12,7 @@ namespace App\Models;
  * @property int|null $userid 创建人
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $end_at
+ * @property string|null $end_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @method static \Illuminate\Database\Eloquent\Builder|Meeting newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|Meeting newQuery()

app/Models/ProjectTaskPushLog.php

@@ -16,17 +16,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int|null $type 提醒类型：0 任务开始提醒，1 距离到期提醒，2到期超时提醒
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
- * @property \Illuminate\Support\Carbon|null $deleted_at
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog newQuery()
  * @method static \Illuminate\Database\Query\Builder|ProjectTaskPushLog onlyTrashed()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog query()
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereCreatedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereDeletedAt($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereEmail($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereIsSend($value)
- * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereSendError($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereTaskId($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereType($value)
  * @method static \Illuminate\Database\Eloquent\Builder|ProjectTaskPushLog whereUpdatedAt($value)

app/Models/UserDelete.php

@@ -11,9 +11,9 @@ use App\Module\Base;
  * @property int $id
  * @property int|null $operator 操作人员
  * @property int|null $userid 用户id
- * @property string|null $email 邮箱账号
+ * @property string|null $email 邮箱帐号
  * @property string|null $reason 注销原因
- * @property string|null $cache 会员资料缓存
+ * @property string $cache 会员资料缓存
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|UserDelete newModelQuery()

app/Models/WebSocketDialogMsgRead.php

@@ -10,7 +10,7 @@ use Carbon\Carbon;
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $msg_id 消息ID
- * @property int|null $userid 发送会员ID
+ * @property int|null $userid 接收会员ID
  * @property int|null $mention 是否提及（被@）
  * @property int|null $email 是否发了邮件
  * @property int|null $after 在阅读之后才添加的记录

app/Models/clearHelper.php

@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * 清除模型class注释
+ */
+
+@error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+
+$path = dirname(__FILE__). '/';
+$lists = scandir($path);
+//
+foreach ($lists AS $item) {
+    $fillPath = $path . $item;
+    if (!in_array($item, ['AbstractModel.php', 'clearHelper.php']) && str_ends_with($item, '.php')) {
+        $content = file_get_contents($fillPath);
+        preg_match("/\/\*\*([\s\S]*?)class\s*(.*?)\s*extends\s*AbstractModel/i", $content, $matchs);
+        if ($matchs[0]) {
+            $content = str_replace($matchs[0], 'class ' . $matchs[2] . ' extends AbstractModel', $content);
+            file_put_contents($fillPath, $content);
+        }
+    }
+}
+echo "Success \n";

cmd

@@ -437,6 +437,7 @@ if [ $# -gt 0 ]; then
         e="supervisorctl $@" && run_exec php "$e"
     elif [[ "$1" == "models" ]]; then
         shift 1
+        run_exec php "php app/Models/clearHelper.php"
         run_exec php "php artisan ide-helper:models -W"
     elif [[ "$1" == "test" ]]; then
         shift 1

resources/assets/js/components/RightBottom.vue

@@ -112,6 +112,7 @@ export default {
         showPrivacy() {
             return [
                 '127.0.0.1:2222',
+                '192.168.100.88:2222',
                 'dootask.com',
                 'www.dootask.com',
                 't.hitosea.com',

resources/assets/js/pages/manage/setting/index.vue

@@ -78,6 +78,7 @@ export default {
 
             if ([
                 '127.0.0.1:2222',
+                '192.168.100.88:2222',
                 'dootask.com',
                 'www.dootask.com',
                 't.hitosea.com',

resources/assets/js/pages/manage/setting/system.vue

@@ -45,6 +45,7 @@ export default {
     mounted() {
         if ([
             '127.0.0.1:2222',
+            '192.168.100.88:2222',
             'dootask.com',
             'www.dootask.com',
             't.hitosea.com',

resources/mobile

@@ -1 +1 @@
-Subproject commit 35f6c38481bc1abacecbd26317286c691a279f78
+Subproject commit bfecdb441ab81fee42a63f28008709fab7e1186e