no message

app/Models/Meeting.php

@@ -16,7 +16,7 @@ use Illuminate\Support\Carbon;
  * @property int|null $userid 创建人
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
- * @property string|null $end_at
+ * @property Carbon|null $end_at
  * @property Carbon|null $deleted_at
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()

app/Models/Project.php

@@ -22,7 +22,7 @@ use Request;
  * @property int|null $personal 是否个人项目
  * @property string|null $user_simple 成员总数|1,2,3
  * @property int|null $dialog_id 聊天会话ID
- * @property string|null $archived_at 归档时间
+ * @property \Illuminate\Support\Carbon|null $archived_at 归档时间
  * @property int|null $archived_userid 归档会员
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at

app/Models/ProjectPermission.php

@@ -10,7 +10,7 @@ use App\Module\Base;
  *
  * @property int $id
  * @property int|null $project_id 项目ID
- * @property array|string $permissions 权限
+ * @property array $permissions 权限
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()

app/Models/ProjectTask.php

@@ -26,12 +26,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string|null $name 标题
  * @property string|null $color 颜色
  * @property string|null $desc 描述
- * @property string|null $start_at 计划开始时间
- * @property string|null $end_at 计划结束时间
- * @property string|null $archived_at 归档时间
+ * @property \Illuminate\Support\Carbon|null $start_at 计划开始时间
+ * @property \Illuminate\Support\Carbon|null $end_at 计划结束时间
+ * @property \Illuminate\Support\Carbon|null $archived_at 归档时间
  * @property int|null $archived_userid 归档会员
  * @property int|null $archived_follow 跟随项目归档（项目取消归档时任务也取消归档）
- * @property string|null $complete_at 完成时间
+ * @property \Illuminate\Support\Carbon|null $complete_at 完成时间
  * @property int|null $userid 创建人
  * @property int|null $visibility 任务可见性：1-项目人员 2-任务人员 3-指定成员
  * @property int|null $p_level 优先级
@@ -39,7 +39,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string|null $p_color 优先级颜色
  * @property int|null $sort 排序(ASC)
  * @property string|null $loop 重复周期
- * @property string|null $loop_at 下一次重复时间
+ * @property \Illuminate\Support\Carbon|null $loop_at 下一次重复时间
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at

app/Models/ProjectUser.php

@@ -9,7 +9,7 @@ namespace App\Models;
  * @property int|null $project_id 项目ID
  * @property int|null $userid 成员ID
  * @property int|null $owner 是否负责人
- * @property string|null $top_at 置顶时间
+ * @property \Illuminate\Support\Carbon|null $top_at 置顶时间
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property-read \App\Models\Project|null $project

app/Models/ReportReceive.php

@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
  *
  * @property int $id
  * @property int $rid
- * @property string|null $receive_at 接收时间
+ * @property \Illuminate\Support\Carbon|null $receive_at 接收时间
  * @property int $userid 接收人
  * @property int $read 是否已读
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()

app/Models/TaskWorker.php

@@ -10,8 +10,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int $id
  * @property string|null $args
  * @property string|null $error
- * @property string|null $start_at 开始时间
- * @property string|null $end_at 结束时间
+ * @property \Illuminate\Support\Carbon|null $start_at 开始时间
+ * @property \Illuminate\Support\Carbon|null $end_at 结束时间
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at

app/Models/User.php

@@ -13,26 +13,26 @@ use Carbon\Carbon;
  * App\Models\User
  *
  * @property int $userid
- * @property array $identity 身份
- * @property array $department 所属部门
+ * @property array $identity
+ * @property array $department
  * @property string|null $az A-Z
  * @property string|null $pinyin 拼音（主要用于搜索）
- * @property string|null $email 邮箱
+ * @property string|null $email
  * @property string|null $tel 联系电话
- * @property string $nickname 昵称
- * @property string|null $profession 职位/职称
- * @property string $userimg 头像
+ * @property string $nickname
+ * @property string|null $profession
+ * @property string $userimg
  * @property string|null $encrypt
  * @property string|null $password 登录密码
  * @property int|null $changepass 登录需要修改密码
  * @property int|null $login_num 累计登录次数
  * @property string|null $last_ip 最后登录IP
- * @property string|null $last_at 最后登录时间
+ * @property \Illuminate\Support\Carbon|null $last_at 最后登录时间
  * @property string|null $line_ip 最后在线IP（接口）
- * @property string|null $line_at 最后在线时间（接口）
+ * @property \Illuminate\Support\Carbon|null $line_at 最后在线时间（接口）
  * @property int|null $task_dialog_id 最后打开的任务会话ID
  * @property string|null $created_ip 注册IP
- * @property string|null $disable_at 禁用时间（离职时间）
+ * @property \Illuminate\Support\Carbon|null $disable_at
  * @property int|null $email_verity 邮箱是否已验证
  * @property int|null $bot 是否机器人
  * @property \Illuminate\Support\Carbon|null $created_at

app/Models/UserBot.php

@@ -16,7 +16,7 @@ use Carbon\Carbon;
  * @property int|null $userid 所属人ID
  * @property int|null $bot_id 机器人ID
  * @property int|null $clear_day 消息自动清理天数
- * @property string|null $clear_at 下一次清理时间
+ * @property \Illuminate\Support\Carbon|null $clear_at 下一次清理时间
  * @property string|null $webhook_url 消息webhook地址
  * @property int|null $webhook_num 消息webhook请求次数
  * @property \Illuminate\Support\Carbon|null $created_at

app/Models/UserCheckinFace.php

@@ -16,9 +16,15 @@ use App\Module\Ihttp;
  * @property string|null $remark 备注
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel change($array)
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel getKeyValue()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace query()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel remove()
+ * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel saveOrIgnore()
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereFaceimg($value)
  * @method static \Illuminate\Database\Eloquent\Builder|UserCheckinFace whereId($value)

app/Models/WebSocketDialogMsgRead.php

@@ -16,7 +16,7 @@ use Carbon\Carbon;
  * @property int|null $email 是否发了邮件
  * @property int|null $after 在阅读之后才添加的记录
  * @property int|null $dot 红点标记
- * @property string|null $read_at 阅读时间
+ * @property \Illuminate\Support\Carbon|null $read_at 阅读时间
  * @property-read \App\Models\WebSocketDialogMsg|null $webSocketDialogMsg
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()

app/Models/WebSocketDialogMsgTodo.php

@@ -9,7 +9,7 @@ namespace App\Models;
  * @property int|null $dialog_id 对话ID
  * @property int|null $msg_id 消息ID
  * @property int|null $userid 接收会员ID
- * @property string|null $done_at 完成时间
+ * @property \Illuminate\Support\Carbon|null $done_at 完成时间
  * @property-read array|mixed $msg_data
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelHidden()

app/Models/WebSocketDialogUser.php

@@ -10,8 +10,8 @@ use Carbon\Carbon;
  * @property int $id
  * @property int|null $dialog_id 对话ID
  * @property int|null $userid 会员ID
- * @property string|null $top_at 置顶时间
- * @property string|null $last_at 最后消息时间
+ * @property \Illuminate\Support\Carbon|null $top_at 置顶时间
+ * @property \Illuminate\Support\Carbon|null $last_at 最后消息时间
  * @property int|null $mark_unread 是否标记为未读：0否，1是
  * @property int|null $silence 是否免打扰：0否，1是
  * @property int|null $hide 不显示会话：0否，1是

cmd

@@ -253,11 +253,19 @@ stream {
     }
 }
 EOF
-        read -rp "请输入代理端口（3300-65500）：" inputport
+        default_value="$(env_get DB_PORT_OPEN)"
+        if [ -n "$default_value" ]; then
+            read_tip="请输入代理端口 (3300-65500, 默认: ${default_value}): "
+        else
+            read_tip="请输入代理端口 (3300-65500): "
+        fi
+        read -rp "$read_tip" inputport
+        inputport=${inputport:-$default_value}
         if [ $inputport -lt 3300 ] || [ $inputport -gt 65500 ]; then
             error "端口范围不正确！"
             exit 1
         fi
+        env_set DB_PORT_OPEN $inputport
         run_mysql rm-port
         docker run --name ${container_name}-port \
             --network dootask-networks-$(env_get APP_ID) \

language/original-web.txt

@@ -201,7 +201,6 @@
 签到设置 (Beta)
 不能对话自己
 任务完成时间
-会话以外成员
 修改任务时间
 修改协助人员
 全员群组禁言
@@ -283,7 +282,6 @@ html转markdown
 任务负责人
 会员不存在
 会议创建人
-会话内成员
 使用现有群
 保存到本地
 修改负责人
@@ -446,7 +444,6 @@ SMTP服务器
 团队管理
 图片信息
 在职状态
-复制代码
 复制成功
 安装说明
 完成时间
@@ -1697,3 +1694,5 @@ WiFi签到延迟时长为±1分钟。
 清除任务时间
 请输入清除备注
 
+群内成员
+群外成员

language/translate.json

@@ -3239,18 +3239,6 @@
         "id": "Waktu penyelesaian tugas",
         "ru": "Время завершения задачи"
     },
-    {
-        "key": "会话以外成员",
-        "zh": "",
-        "zh-CHT": "會話以外成員",
-        "en": "Members outside the conversation",
-        "ko": "대화 외 구성원",
-        "ja": "会話外のメンバー",
-        "de": "Mitglieder außerhalb des Gesprächs",
-        "fr": "Membres en dehors de la conversation",
-        "id": "Anggota di luar percakapan",
-        "ru": "Участники вне разговора"
-    },
     {
         "key": "修改任务时间",
         "zh": "",
@@ -4115,18 +4103,6 @@
         "id": "Pembuat rapat",
         "ru": "Создатель встречи"
     },
-    {
-        "key": "会话内成员",
-        "zh": "",
-        "zh-CHT": "會話內成員",
-        "en": "Members in conversation",
-        "ko": "대화 내 멤버",
-        "ja": "会話内のメンバー",
-        "de": "Mitglieder im Gespräch",
-        "fr": "Membres dans la conversation",
-        "id": "Anggota dalam percakapan",
-        "ru": "Участники в разговоре"
-    },
     {
         "key": "使用现有群",
         "zh": "",
@@ -6071,18 +6047,6 @@
         "id": "Status kepegawaian",
         "ru": "Статус занятости"
     },
-    {
-        "key": "复制代码",
-        "zh": "",
-        "zh-CHT": "複製代碼",
-        "en": "Copy code",
-        "ko": "코드 복사",
-        "ja": "コードをコピー",
-        "de": "Code kopieren",
-        "fr": "Copier le code",
-        "id": "Salin kode",
-        "ru": "Копировать код"
-    },
     {
         "key": "复制成功",
         "zh": "",
@@ -9267,13 +9231,13 @@
         "key": "群成员",
         "zh": "",
         "zh-CHT": "群成員",
-        "en": "Group Members",
+        "en": "Group members",
         "ko": "그룹 멤버",
         "ja": "グループメンバー",
         "de": "Gruppenmitglieder",
         "fr": "Membres du groupe",
-        "id": "Anggota Grup",
-        "ru": "Участники группы"
+        "id": "Anggota grup",
+        "ru": "Члены группы"
     },
     {
         "key": "群类型",
@@ -24730,5 +24694,29 @@
         "fr": "Veuillez saisir une note d'effacement",
         "id": "Silakan masukkan catatan penghapusan",
         "ru": "Пожалуйста, введите примечание для очистки"
+    },
+    {
+        "key": "群内成员",
+        "zh": "",
+        "zh-CHT": "群內成員",
+        "en": "Group members",
+        "ko": "그룹 멤버",
+        "ja": "グループメンバー",
+        "de": "Gruppenmitglieder",
+        "fr": "Membres du groupe",
+        "id": "Anggota grup",
+        "ru": "Члены группы"
+    },
+    {
+        "key": "群外成员",
+        "zh": "",
+        "zh-CHT": "群外成員",
+        "en": "External members",
+        "ko": "그룹 외 멤버",
+        "ja": "グループ外メンバー",
+        "de": "Externe Mitglieder",
+        "fr": "Membres externes",
+        "id": "Anggota luar grup",
+        "ru": "Внешние участники"
     }
 ]

public/docs/index.html

@@ -5,15 +5,15 @@
   <meta name="description" content="APP接口文档">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <link href="assets/bootstrap.min.css?v=1717150455591" rel="stylesheet" media="screen">
-  <link href="assets/prism.css?v=1717150455591" rel="stylesheet" />
-  <link href="assets/prism-toolbar.css?v=1717150455591" rel="stylesheet" />
-  <link href="assets/prism-diff-highlight.css?v=1717150455591" rel="stylesheet" />
-  <link href="assets/main.css?v=1717150455591" rel="stylesheet" media="screen, print">
-  <link href="assets/favicon.ico?v=1717150455591" rel="icon" type="image/x-icon">
-  <link href="assets/apple-touch-icon.png?v=1717150455591" rel="apple-touch-icon" sizes="180x180">
-  <link href="assets/favicon-32x32.png?v=1717150455591" rel="icon" type="image/png" sizes="32x32">
-  <link href="assets/favicon-16x16.png?v=1717150455591" rel="icon" type="image/png" sizes="16x16">
+  <link href="assets/bootstrap.min.css?v=1729670534966" rel="stylesheet" media="screen">
+  <link href="assets/prism.css?v=1729670534966" rel="stylesheet" />
+  <link href="assets/prism-toolbar.css?v=1729670534966" rel="stylesheet" />
+  <link href="assets/prism-diff-highlight.css?v=1729670534966" rel="stylesheet" />
+  <link href="assets/main.css?v=1729670534966" rel="stylesheet" media="screen, print">
+  <link href="assets/favicon.ico?v=1729670534966" rel="icon" type="image/x-icon">
+  <link href="assets/apple-touch-icon.png?v=1729670534966" rel="apple-touch-icon" sizes="180x180">
+  <link href="assets/favicon-32x32.png?v=1729670534966" rel="icon" type="image/png" sizes="32x32">
+  <link href="assets/favicon-16x16.png?v=1729670534966" rel="icon" type="image/png" sizes="16x16">
 </head>
 
 <body class="container-fluid">
@@ -1042,6 +1042,6 @@
   </div>
 </div>
 
-<script src="assets/main.bundle.js?v=1717150455591"></script>
+<script src="assets/main.bundle.js?v=1729670534966"></script>
 </body>
 </html>