xinyouhe/crm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
HESU\HESU
2025-07-21 09:46:26 +08:00
parent 0d59666ca4 fa4ade4b35
commit ac35fccbbf
10 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/model/Follow.php
+10 -6
View File
@@ -38,8 +38,6 @@ class Follow extends Model
*/
public $timestamps = true;
protected $dates = ['created_at', 'updated_at', 'follow_time'];
protected $casts = [
'updated_at' => 'datetime:Y-m-d H:i:s', // 指定序列化格式
'created_at' => 'datetime:Y-m-d H:i:s', // 指定序列化格式
@@ -51,10 +49,16 @@ class Follow extends Model
public static function getFollow($follow,$domain = 'https://vehicle-album.oss-cn-beijing.aliyuncs.com')
{
$follow['type_txt'] = Constants::FOLLOW[$follow['type']];
$follow['firstFollowtime'] = $follow['follow_time'];
$ossservice = new OssService();
$oss_picture = $ossservice->generatePrivateUrl($follow['picture'],86400);
$follow['oss_picture'] = $oss_picture;
$follow['firstFollowtime'] = $follow['follow_time'];
if (isset($follow['picture']) && !empty($follow['picture'])) {
$ossservice = new OssService();
$oss_picture = $ossservice->generatePrivateUrl($follow['picture'],86400);
$follow['oss_picture'] = $oss_picture;
}else {
$follow['oss_picture'] = '';
}
$follow['created_at'] = date('Y-m-d H:i:s',strtotime($follow['created_at'])+(3600*8));
$follow['updated_at'] = date('Y-m-d H:i:s',strtotime($follow['updated_at'])+(3600*8));
// $follow = Util::formatDate($follow);
return $follow;
}