Merge branch 'master' into develop

.idea/www.iml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/webman/." isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/webman/./app" isTestSource="false" packagePrefix="app\" />
-      <sourceFolder url="file://$MODULE_DIR$/webman/./app/view/components" isTestSource="false" packagePrefix="app\View\Components\" />
-      <excludeFolder url="file://$MODULE_DIR$/webman/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/webman/vendor/monolog/monolog" />
-      <excludeFolder url="file://$MODULE_DIR$/webman/vendor/nikic/fast-route" />
-      <excludeFolder url="file://$MODULE_DIR$/webman/vendor/psr/container" />
-      <excludeFolder url="file://$MODULE_DIR$/webman/vendor/psr/log" />
-      <excludeFolder url="file://$MODULE_DIR$/webman/vendor/workerman/coroutine" />
-      <excludeFolder url="file://$MODULE_DIR$/webman/vendor/workerman/webman-framework" />
-      <excludeFolder url="file://$MODULE_DIR$/webman/vendor/workerman/workerman" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

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';

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'],

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'));
         }

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;
     }

app/view/index/privacy.html

@@ -97,7 +97,7 @@
         </ul>
 
         <div class="footer">
-            <p>© 2024 河南晋海科技环保有限公司. 保留所有权利。</p>
+            <p>© 2024 河南新友合科技环保有限公司. 保留所有权利。</p>
         </div>
     </div>
 </body>

app/view/index/user.html

@@ -90,7 +90,7 @@
         <p>2. 如因本协议产生争议，双方应友好协商解决；协商不成的，任何一方可向 管辖地 有管辖权的人民法院提起诉讼。</p>
 
         <div class="footer">
-            <p>© 2024 河南晋海科技环保有限公司. 保留所有权利。</p>
+            <p>© 2024 河南新友合科技有限公司. 保留所有权利。</p>
         </div>
     </div>
 </body>

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',

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' => ' Каналы не могут быть пустыми',

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' => ' 渠道不能为空',