Skip to content

Commit

Permalink
build
Browse files Browse the repository at this point in the history
  • Loading branch information
kuaifan committed Jan 15, 2024
1 parent 80af981 commit bb8a698
Show file tree
Hide file tree
Showing 87 changed files with 403 additions and 348 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/node_modules
/public/hot
/public/tmp
/public/summary
/public/uploads/*
/public/.well-known
/public/.user.ini
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

All notable changes to this project will be documented in this file.

## [0.34.46]

### Bug Fixes

- 重复通知
- 修复投票进度的算法

### Performance

- 优化发送消息接口
- 优化搜索提示
- 优化消息列表
- 优化消息保存覆盖
- 优化快捷表情发送消息时关闭延迟的问题
- 升级okr

## [0.34.28]

### Features
Expand Down
21 changes: 8 additions & 13 deletions app/Http/Controllers/Api/UsersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2098,6 +2098,13 @@ public function annual__report()
}
}

// 最晚在线时间
$timezone = config('app.timezone');
$latestOnline = UserCheckinRecord::whereUserid($user->userid)
->whereYear(DB::raw('from_unixtime(report_time)'), $year)
->orderByRaw("TIME_FORMAT(DATE_ADD(CONVERT_TZ(from_unixtime(report_time), 'UTC', '$timezone'), INTERVAL 18 HOUR), '%H%i%s') desc")
->first();

//
$_A["__annual__report_".$user->userid] = [
// 本人信息
Expand All @@ -2112,19 +2119,7 @@ public function annual__report()
// 在职时间(天为单位)
'tenure_days' => floor((strtotime(date('Y-m-d')) - $hireTimestamp) / (24 * 60 * 60)),
// 最晚在线时间
'latest_online_time' => date(
'Y-m-d H:i:s',
UserCheckinRecord::whereUserid($user->userid)
->whereYear(DB::raw('from_unixtime(report_time)'), $year)
->where(function ($query) {
$query->where(function ($query) {
$query->whereRaw('HOUR(FROM_UNIXTIME(report_time)) < 6');
$query->whereRaw('DATE(FROM_UNIXTIME(report_time)) = CURDATE() - INTERVAL 1 DAY');
})->orWhere(function ($query) {
$query->whereRaw('DATE(FROM_UNIXTIME(report_time)) = CURDATE()');
});
})->max('report_time')
),
'latest_online_time' => date("Y-m-d H:i:s", $latestOnline->report_time),
// 跟谁聊天最多(发消息的次数。可以是群、私聊、机器人除外)
'longest_chat_user' => $longestChat,
// 跟所有ai机器人聊天的次数
Expand Down
3 changes: 2 additions & 1 deletion language/original-web.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,8 @@ ID、任务名...
语音
群头像
修改头像
没有任何与(*)相关的会话
没有任何联系人
没有任何与(*)相关的结果
未读消息(*)条
帐号相关
项目相关
Expand Down
22 changes: 22 additions & 0 deletions language/translate.json
Original file line number Diff line number Diff line change
Expand Up @@ -19567,5 +19567,27 @@
"de": "Die server-version ist zu niedrig und teilweise unbrauchbar.",
"fr": "La version de l’interface du serveur est trop basse, certaines fonctions peuvent ne pas fonctionner correctement.",
"id": "Versi antarmuka server yang rendah, sebagian fungsinya mungkin tidak berfungsi dengan baik."
},
{
"key": "没有任何联系人",
"zh": "",
"zh-CHT": "沒有任何聯繫人",
"en": "Without any contacts",
"ko": "연락처가 없습니다.",
"ja": "連絡先はありません",
"de": "Haben sie jemanden angerufen?",
"fr": "Sans aucun contact",
"id": "Tidak ada kontak"
},
{
"key": "没有任何与(*)相关的结果",
"zh": "",
"zh-CHT": "沒有任何與(*)相關的結果",
"en": "There are no results related to (*)",
"ko": "(*)와 관련된 결과가 없습니다",
"ja": "(*)に関する結果はありませんでした",
"de": "Kein ergebnis in irgendeiner beziehung (*)",
"fr": "Aucun résultat associé à (*)",
"id": "Tidak ada hasil yang berhubungan dengan (*)"
}
]
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "DooTask",
"version": "0.34.28",
"version": "0.34.46",
"description": "DooTask is task management system.",
"scripts": {
"start": "./cmd dev",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bb8a698

Please sign in to comment.