From a8041c478510006b44d9ed0acde816de1c6ba31d Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Mon, 23 Jun 2025 13:44:55 +0800
Subject: [PATCH 1/8] 1
---
app/model/Follow.php | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/app/model/Follow.php b/app/model/Follow.php
index 8e7ea62..93a8c7a 100644
--- a/app/model/Follow.php
+++ b/app/model/Follow.php
@@ -51,10 +51,14 @@ 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['follow_time']) && !empty($follow['follow_time'])) {
+ $ossservice = new OssService();
+ $oss_picture = $ossservice->generatePrivateUrl($follow['picture'],86400);
+ $follow['oss_picture'] = $oss_picture;
+ }else {
+ $follow['oss_picture'] = '';
+ }
// $follow = Util::formatDate($follow);
return $follow;
}
From 7ab9151e4ab0125d31051a202eb678d38df4702d Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Mon, 23 Jun 2025 13:46:11 +0800
Subject: [PATCH 2/8] 1
---
app/controller/FollowController.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/controller/FollowController.php b/app/controller/FollowController.php
index 5e26ced..f418015 100644
--- a/app/controller/FollowController.php
+++ b/app/controller/FollowController.php
@@ -123,10 +123,10 @@ class FollowController
if(Util::isEmpty($type)){
return Util::fail([],'type'.trans('not_null'));
}
- $picture = Util::getParam($request,'picture');
- if(Util::isEmpty($picture)){
- return Util::fail([],trans('picture_not_null'));
- }
+ // $picture = Util::getParam($request,'picture');
+ // if(Util::isEmpty($picture)){
+ // return Util::fail([],trans('picture_not_null'));
+ // }
$data = [
'user_id'=>$request->user['id'],
From c9674a6ad915069df3758e91e9c344f9c083045e Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Mon, 23 Jun 2025 14:06:39 +0800
Subject: [PATCH 3/8] 1
---
app/model/Follow.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/model/Follow.php b/app/model/Follow.php
index 93a8c7a..f0cb9ae 100644
--- a/app/model/Follow.php
+++ b/app/model/Follow.php
@@ -52,7 +52,7 @@ class Follow extends Model
{
$follow['type_txt'] = Constants::FOLLOW[$follow['type']];
$follow['firstFollowtime'] = $follow['follow_time'];
- if (isset($follow['follow_time']) && !empty($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;
From 7711b76ac3b8554ae4fc12d11cda831a6b4d1096 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Tue, 24 Jun 2025 13:43:45 +0800
Subject: [PATCH 4/8] 1
---
app/controller/FollowController.php | 11 +++++++----
resource/translations/en/messages.php | 1 +
resource/translations/ru/messages.php | 1 +
resource/translations/zh_CN/messages.php | 1 +
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/app/controller/FollowController.php b/app/controller/FollowController.php
index f418015..fd6aa72 100644
--- a/app/controller/FollowController.php
+++ b/app/controller/FollowController.php
@@ -123,10 +123,13 @@ class FollowController
if(Util::isEmpty($type)){
return Util::fail([],'type'.trans('not_null'));
}
- // $picture = Util::getParam($request,'picture');
- // if(Util::isEmpty($picture)){
- // return Util::fail([],trans('picture_not_null'));
- // }
+
+ $picture = Util::getParam($request,'picture');
+ $audio_text = Util::getParam($request,'audio_text');
+ $remark = Util::getParam($request,'remark');
+ if(Util::isEmpty($picture) && Util::isEmpty($audio_text) && Util::isEmpty($remark)){
+ return Util::fail([],trans('follow_not_null'));
+ }
$data = [
'user_id'=>$request->user['id'],
diff --git a/resource/translations/en/messages.php b/resource/translations/en/messages.php
index 14f43de..21bb0ff 100644
--- a/resource/translations/en/messages.php
+++ b/resource/translations/en/messages.php
@@ -22,6 +22,7 @@ return [
'param_error' => ' param error',
'required_not_null' => ' required not_ ull',
'picture_not_null' => ' picture not null',
+ 'follow_not_null' => ' The image and follow-up content cannot be empty at the same time',
'contacts_not_null' => ' Contact person, email, and phone cannot be empty at the same time',
'car_type_not_null' => ' preference_not_null',
'channel_not_null' => ' channel not null',
diff --git a/resource/translations/ru/messages.php b/resource/translations/ru/messages.php
index c96f0ab..67617df 100644
--- a/resource/translations/ru/messages.php
+++ b/resource/translations/ru/messages.php
@@ -22,6 +22,7 @@ return [
'param_error' => ' Ошибка параметра',
'required_not_null' => ' Обязательное заполнение не может быть пустым.',
'picture_not_null' => ' Фотографии не могут быть пустыми',
+ 'follow_not_null' => ' Изображение и последующий контент не могут быть пустыми одновременно.X',
'contacts_not_null' => ' Контакты, почтовый ящик, телефон не может быть одновременно пустым',
'car_type_not_null' => ' Предпочтения не могут быть пустыми',
'channel_not_null' => ' Каналы не могут быть пустыми',
diff --git a/resource/translations/zh_CN/messages.php b/resource/translations/zh_CN/messages.php
index 07f384d..98cdfcb 100644
--- a/resource/translations/zh_CN/messages.php
+++ b/resource/translations/zh_CN/messages.php
@@ -22,6 +22,7 @@ return [
'param_error' => ' 参数错误',
'required_not_null' => ' 必填项不能为空',
'picture_not_null' => ' 图片不能为空',
+ 'follow_not_null' => ' 图片与跟进内容不能同时为空',
'contacts_not_null' => ' 联系人，邮箱，电话不能同时为空',
'car_type_not_null' => ' 偏好不能为空',
'channel_not_null' => ' 渠道不能为空',
From d42167bf14e0b07f70195a7725301221e8c29996 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Fri, 11 Jul 2025 14:04:16 +0800
Subject: [PATCH 5/8] 1
---
app/controller/UserController.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/controller/UserController.php b/app/controller/UserController.php
index e05b2fd..f6556bf 100644
--- a/app/controller/UserController.php
+++ b/app/controller/UserController.php
@@ -47,11 +47,12 @@ class UserController
$userPassword = $user['password'];
//加密
- $hashedPassword = password_hash($password, PASSWORD_DEFAULT);
+// $hashedPassword = password_hash($password, PASSWORD_DEFAULT);
//验证密码
// if (!password_verify($userPassword, $hashedPassword)) {
- if ($userPassword == $hashedPassword) {
+// if ($userPassword == $hashedPassword) {
+ if (!password_verify($password, $userPassword)) {
locale($language);
return Util::fail([], trans('password_error'));
}
From bfd458aeb7980849b190ec5c4b7cbb11e7d81ebd Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Wed, 16 Jul 2025 10:35:07 +0800
Subject: [PATCH 6/8] 1
---
app/model/Follow.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/model/Follow.php b/app/model/Follow.php
index f0cb9ae..fcbdad6 100644
--- a/app/model/Follow.php
+++ b/app/model/Follow.php
@@ -39,6 +39,8 @@ class Follow extends Model
public $timestamps = true;
protected $dates = ['created_at', 'updated_at', 'follow_time'];
+
+ protected $timezone = 'Asia/Shanghai';
protected $casts = [
'updated_at' => 'datetime:Y-m-d H:i:s', // 指定序列化格式
From 1ccaced113c6d1f3daf095aa9beb515eff8296c9 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Wed, 16 Jul 2025 13:58:51 +0800
Subject: [PATCH 7/8] 1
---
app/model/Follow.php | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/app/model/Follow.php b/app/model/Follow.php
index fcbdad6..4298133 100644
--- a/app/model/Follow.php
+++ b/app/model/Follow.php
@@ -38,10 +38,6 @@ class Follow extends Model
*/
public $timestamps = true;
- protected $dates = ['created_at', 'updated_at', 'follow_time'];
-
- protected $timezone = 'Asia/Shanghai';
-
protected $casts = [
'updated_at' => 'datetime:Y-m-d H:i:s', // 指定序列化格式
'created_at' => 'datetime:Y-m-d H:i:s', // 指定序列化格式
@@ -61,6 +57,8 @@ class Follow extends Model
}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;
}
From fa4ade4b35c11de9a64384fb20f4429f6f774ae2 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Mon, 21 Jul 2025 09:45:07 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=89=88=E6=9D=83=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/www.iml | 20 --------------------
app/controller/AreaController.php | 20 ++++++++++----------
app/view/index/privacy.html | 2 +-
app/view/index/user.html | 2 +-
4 files changed, 12 insertions(+), 32 deletions(-)
delete mode 100644 .idea/www.iml
diff --git a/.idea/www.iml b/.idea/www.iml
deleted file mode 100644
index 946c4f1..0000000
--- a/.idea/www.iml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/controller/AreaController.php b/app/controller/AreaController.php
index c935393..349ebc2 100644
--- a/app/controller/AreaController.php
+++ b/app/controller/AreaController.php
@@ -47,17 +47,17 @@ class AreaController
{
$list = RedisHelper::get("rpc_country");
$list = null;
- if(!$list){
- $res = HttpClient::get(config('const.rpc_domain') . '/country/all');
- if ($res['code'] != 200 && $res['data']['code'] != 0){
- Log::info('register_rpc',$res);
- return Util::fail($res, trans('register_fail'));
- }
- $list = $res['data']['data']['data'];
- RedisHelper::set("rpc_country", $list, 600);
- }
+// if(!$list){
+// $res = HttpClient::get(config('const.rpc_domain') . '/country/all');
+// if ($res['code'] != 200 && $res['data']['code'] != 0){
+// Log::info('register_rpc',$res);
+// return Util::fail($res, trans('register_fail'));
+// }
+// $list = $res['data']['data']['data'];
+// RedisHelper::set("rpc_country", $list, 600);
+// }
-// $list = Country::get()->toArray();
+ $list = Country::get()->toArray();
$language = 'en_addr';
if($request->user['language'] == 'zh_CN'){
$language = 'cn_addr';
diff --git a/app/view/index/privacy.html b/app/view/index/privacy.html
index 8663cc6..75a5db6 100644
--- a/app/view/index/privacy.html
+++ b/app/view/index/privacy.html
@@ -97,7 +97,7 @@
diff --git a/app/view/index/user.html b/app/view/index/user.html
index c438ff1..361a863 100644
--- a/app/view/index/user.html
+++ b/app/view/index/user.html
@@ -90,7 +90,7 @@