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/controller/FollowController.php b/app/controller/FollowController.php
index 5e26ced..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/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'));
}
diff --git a/app/model/Follow.php b/app/model/Follow.php
index 8e7ea62..4298133 100644
--- a/app/model/Follow.php
+++ b/app/model/Follow.php
@@ -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;
}
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 @@