Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '814a488801b328daf67f86c33ac422704303dceb' into pro

Browse Source 
# Conflicts:
#	app/Http/Controllers/Api/SystemController.php
#	public/site/en/about.html
#	public/site/en/download.html
#	public/site/en/help.html
#	public/site/en/index.html
#	public/site/en/log.html
#	public/site/en/price.html
#	public/site/en/product.html
#	public/site/en/solutions.html
#	public/site/zh/about.html
#	public/site/zh/download.html
#	public/site/zh/help.html
#	public/site/zh/index.html
#	public/site/zh/log.html
#	public/site/zh/price.html
#	public/site/zh/product.html
#	public/site/zh/solutions.html
#	resources/mobile
This commit is contained in:
kuaifan
2024-10-21 14:14:45 +08:00
parent d1766e52b6 814a488801
commit 2284788366
11 changed files with 406 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/SystemController.php
+8 -1
View File
@@ -399,6 +399,7 @@ class SystemController extends AbstractController
'remindin',
'remindexceed',
'edit',
'faceupload',
'modes',
'key',
])) {
@@ -407,6 +408,7 @@ class SystemController extends AbstractController
}
if ($all['open'] === 'close') {
$all['key'] = md5(Base::generatePassword(32));
$all['face_key'] = md5(Base::generatePassword(32));
} else {
$botUser = User::botGetOrCreate('check-in');
if (!$botUser) {
@@ -414,7 +416,7 @@ class SystemController extends AbstractController
}
}
if ($all['modes']) {
$all['modes'] = array_intersect($all['modes'], ['auto', 'manual', 'location']);
$all['modes'] = array_intersect($all['modes'], ['auto', 'manual', 'location', 'face']);
}
$setting = Base::setting('checkinSetting', Base::newTrim($all));
} else {
@@ -425,8 +427,13 @@ class SystemController extends AbstractController
$setting['key'] = md5(Base::generatePassword(32));
Base::setting('checkinSetting', $setting);
}
if (empty($setting['face_key'])) {
$setting['face_key'] = md5(Base::generatePassword(32));
Base::setting('checkinSetting', $setting);
}
//
$setting['open'] = $setting['open'] ?: 'close';
$setting['faceupload'] = $setting['faceupload'] ?: 'close';
$setting['time'] = $setting['time'] ? Base::json2array($setting['time']) : ['09:00', '18:00'];
$setting['advance'] = intval($setting['advance']) ?: 120;
$setting['delay'] = intval($setting['delay']) ?: 120;