wesmiler

app/Services/Api/ArticleService.php

@@ -168,7 +168,7 @@ class ArticleService extends BaseService
         if($locale == 'zh-cn'){
             $field = ['id','title','cover','views','author','publish_at','file_url','show_type','type','content'];
         }else{
-            $field = ['id',"title_{$locale} as title",'cover','views','author','publish_at','file_url','show_type','type',"content_{$locale} as content"];
+            $field = ['id','title as title_all',"title_{$locale} as title",'cover','views','author','publish_at','file_url','show_type','type',"content_{$locale} as content"];
         }
 
         $info = $this->model->where(['id'=> $id,'status'=>1,'mark'=>1])
@@ -179,6 +179,7 @@ class ArticleService extends BaseService
         if($info){
             $info['time_text'] = $info['publish_at']? datetime(strtotime($info['publish_at'])) : '';
             $info['author']= $info['author']? $info['author'] : ConfigService::make()->getConfigByCode('app_name','星链社交');
+            $info['title'] = $info['title']? $info['title'] : $info['title_all'];
             $info['cover'] = get_image_url($info['cover']);
             $info['file_url'] = get_image_url($info['file_url']);
             $info['content'] = htmlspecialchars_decode($info['content']);

app/Services/Api/MerchantCategoryService.php

@@ -55,21 +55,33 @@ class MerchantCategoryService extends BaseService
      * @param int $num
      * @return array|mixed
      */
-    public function getMenuList($num=8)
+    public function getMenuList($num=8, $userId=0)
     {
-        $cacheKey = "caches:merchantCategory:{$num}";
+        $locale = RedisService::get("caches:locale:lang_{$userId}");
+        $locale = $locale? $locale : session('locale_lang');
+        $locale = $locale? $locale :'zh-cn';
+
+        $cacheKey = "caches:merchantCategory:{$num}_{$userId}_{$locale}";
         $datas = RedisService::get($cacheKey);
         if($datas){
             return $datas;
         }
+
+        if($locale == 'zh-cn'){
+            $field = ['id','name','icon','pages','sort','is_menu'];
+        }else{
+            $field = ['id','name',"name_{$locale}",'icon','pages','sort','is_menu'];
+        }
         $datas = $this->model->where(['is_menu'=> 1,'status'=> 1,'mark'=>1])
-            ->select(['id','icon','name','pages','sort'])
+            ->select($field)
             ->limit($num)
             ->orderBy('sort','asc')
             ->orderBy('id','desc')
             ->get()
-            ->each(function($item, $k){
+            ->each(function($item, $k) use($locale){
                 $item['icon'] = $item['icon']? get_image_url($item['icon']) : '';
+                $name = isset($item['name'])? $item['name'] : '';
+                $item['name'] = isset($item['name_'.$locale])? $item['name_'.$locale] : $name;
             });
         $datas = $datas? $datas->toArray() : [];
         if($datas){
@@ -85,20 +97,30 @@ class MerchantCategoryService extends BaseService
      * @param int $num
      * @return array|mixed
      */
-    public function getOptions($showType=0,$num=99)
+    public function getOptions($showType=0,$num=99, $userId=0)
     {
-        $cacheKey = "caches:merchantCategory:option_{$showType}_{$num}";
+        $locale = RedisService::get("caches:locale:lang_{$userId}");
+        $locale = $locale? $locale : session('locale_lang');
+        $locale = $locale? $locale :'zh-cn';
+
+        $cacheKey = "caches:merchantCategory:option_{$showType}_{$num}_{$userId}_{$locale}";
         $datas = RedisService::get($cacheKey);
         if($datas){
             return $datas;
         }
+        if($locale == 'zh-cn'){
+            $field = ['id','name','icon','sort'];
+        }else{
+            $field = ['id','name',"name_{$locale}",'icon','sort'];
+        }
+
         $datas = $this->model->where(['is_menu'=> 1,'status'=> 1,'mark'=>1])
             ->where(function($query) use($showType){
                 if($showType == 1){
                     $query->whereNotIn('type',[3]);
                 }
             })
-            ->select(['id','name','icon'])
+            ->select($field)
             ->limit($num)
             ->orderBy('sort','desc')
             ->orderBy('id','desc')
@@ -108,6 +130,8 @@ class MerchantCategoryService extends BaseService
             foreach($datas as &$item){
                 if(isset($item['icon'])){
                     $item['icon'] = $item['icon']? get_image_url($item['icon']) : '';
+                    $name = isset($item['name'])? $item['name'] : '';
+                    $item['name'] = isset($item['name_'.$locale])? $item['name_'.$locale] : $name;
                 }
                 unset($item);
             }

storage/logs/laravel.log

@@ -1622,3 +1622,63 @@ Stack trace:
 [stacktrace]
 #0 {main}
 "} 
+[2024-03-19 18:56:31] local.ERROR: read error on connection to 47.112.222.163:16379 {"exception":"[object] (RedisException(code: 0): read error on connection to 47.112.222.163:16379 at /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Redis/Connections/Connection.php:116)
+[stacktrace]
+#0 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Redis/Connections/Connection.php(116): Redis->del('caches:wallet:l...')
+#1 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Redis/Connections/PhpRedisConnection.php(533): Illuminate\\Redis\\Connections\\Connection->command('del', Array)
+#2 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Redis/Connections/Connection.php(220): Illuminate\\Redis\\Connections\\PhpRedisConnection->command('del', Array)
+#3 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Redis/Connections/PhpRedisConnection.php(575): Illuminate\\Redis\\Connections\\Connection->__call('del', Array)
+#4 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Redis/RedisManager.php(277): Illuminate\\Redis\\Connections\\PhpRedisConnection->__call('del', Array)
+#5 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php(261): Illuminate\\Redis\\RedisManager->__call('del', Array)
+#6 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/app/Services/RedisService.php(117): Illuminate\\Support\\Facades\\Facade::__callStatic('del', Array)
+#7 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/app/Http/Controllers/Admin/IndexController.php(100): App\\Services\\RedisService::keyDel('caches:wallet:l...')
+#8 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/Controller.php(54): App\\Http\\Controllers\\Admin\\IndexController->clearCache()
+#9 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/ControllerDispatcher.php(45): Illuminate\\Routing\\Controller->callAction('clearCache', Array)
+#10 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/Route.php(262): Illuminate\\Routing\\ControllerDispatcher->dispatch(Object(Illuminate\\Routing\\Route), Object(App\\Http\\Controllers\\Admin\\IndexController), 'clearCache')
+#11 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/Route.php(205): Illuminate\\Routing\\Route->runController()
+#12 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/Router.php(721): Illuminate\\Routing\\Route->run()
+#13 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Routing\\Router->Illuminate\\Routing\\{closure}(Object(Illuminate\\Http\\Request))
+#14 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/app/Http/Controllers/Admin/Backend.php(65): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#15 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(149): App\\Http\\Controllers\\Admin\\Backend->App\\Http\\Controllers\\Admin\\{closure}(Object(Illuminate\\Http\\Request), Object(Closure))
+#16 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/Middleware/SubstituteBindings.php(50): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#17 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Routing\\Middleware\\SubstituteBindings->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#18 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/app/Http/Middleware/UserLogin.php(25): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#19 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): App\\Http\\Middleware\\UserLogin->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#20 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/View/Middleware/ShareErrorsFromSession.php(49): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#21 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\View\\Middleware\\ShareErrorsFromSession->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#22 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(121): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#23 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php(64): Illuminate\\Session\\Middleware\\StartSession->handleStatefulRequest(Object(Illuminate\\Http\\Request), Object(Illuminate\\Session\\Store), Object(Closure))
+#24 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Session\\Middleware\\StartSession->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#25 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/AddQueuedCookiesToResponse.php(37): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#26 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\AddQueuedCookiesToResponse->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#27 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Cookie/Middleware/EncryptCookies.php(67): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#28 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Cookie\\Middleware\\EncryptCookies->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#29 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#30 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/Router.php(723): Illuminate\\Pipeline\\Pipeline->then(Object(Closure))
+#31 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/Router.php(698): Illuminate\\Routing\\Router->runRouteWithinStack(Object(Illuminate\\Routing\\Route), Object(Illuminate\\Http\\Request))
+#32 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/Router.php(662): Illuminate\\Routing\\Router->runRoute(Object(Illuminate\\Http\\Request), Object(Illuminate\\Routing\\Route))
+#33 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Routing/Router.php(651): Illuminate\\Routing\\Router->dispatchToRoute(Object(Illuminate\\Http\\Request))
+#34 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(167): Illuminate\\Routing\\Router->dispatch(Object(Illuminate\\Http\\Request))
+#35 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(128): Illuminate\\Foundation\\Http\\Kernel->Illuminate\\Foundation\\Http\\{closure}(Object(Illuminate\\Http\\Request))
+#36 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/app/Http/Middleware/EnableCrossRequestMiddleware.php(35): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#37 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): App\\Http\\Middleware\\EnableCrossRequestMiddleware->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#38 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#39 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ConvertEmptyStringsToNull.php(31): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#40 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\ConvertEmptyStringsToNull->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#41 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TransformsRequest.php(21): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#42 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php(40): Illuminate\\Foundation\\Http\\Middleware\\TransformsRequest->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#43 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\TrimStrings->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#44 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/ValidatePostSize.php(27): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#45 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\ValidatePostSize->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#46 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Foundation/Http/Middleware/PreventRequestsDuringMaintenance.php(86): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#47 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Illuminate\\Foundation\\Http\\Middleware\\PreventRequestsDuringMaintenance->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#48 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/fruitcake/laravel-cors/src/HandleCors.php(38): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#49 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Fruitcake\\Cors\\HandleCors->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#50 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/fideloper/proxy/src/TrustProxies.php(57): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#51 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(167): Fideloper\\Proxy\\TrustProxies->handle(Object(Illuminate\\Http\\Request), Object(Closure))
+#52 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Pipeline/Pipeline.php(103): Illuminate\\Pipeline\\Pipeline->Illuminate\\Pipeline\\{closure}(Object(Illuminate\\Http\\Request))
+#53 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(142): Illuminate\\Pipeline\\Pipeline->then(Object(Closure))
+#54 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/vendor/laravel/framework/src/Illuminate/Foundation/Http/Kernel.php(111): Illuminate\\Foundation\\Http\\Kernel->sendRequestThroughRouter(Object(Illuminate\\Http\\Request))
+#55 /usr/local/develop/php/www/waibao/NN2024010801/NN2024010801/public/index.php(60): Illuminate\\Foundation\\Http\\Kernel->handle(Object(Illuminate\\Http\\Request))
+#56 {main}
+"}