fix : site

app/Aspect/Api/ApiReturnAspect.php

@@ -56,10 +56,10 @@ class ApiReturnAspect extends AbstractAspect
         $this->writeResponseLog(json_encode($result));
 
         //正式服加密 测试服不做处理
-        if (SystemUtil::checkProEnv()) {
-            $cryptoFactory = $this->CryptoFactory->cryptoClass('api', json_encode($result['data']));
-            $result['data'] = $cryptoFactory->encrypt();
-        }
+//        if (SystemUtil::checkProEnv()) {
+//            $cryptoFactory = $this->CryptoFactory->cryptoClass('api', json_encode($result['data']));
+//            $result['data'] = $cryptoFactory->encrypt();
+//        }
 
         return $result;
     }

app/Cache/Redis/Api/GoodCache.php

@@ -180,7 +180,7 @@ class GoodCache
         $imageList = $this->getOssObjects(array_merge($spuImage,$imageIdArr));
 
         $chefIds = array_column($skuList,'chef_id');
-        $chefList = $this->adminUserModel->getDataByIds($chefIds);
+        $chefList = $this->adminUserModel->getChefNameByIds($chefIds);
 
         $skuListArr = [];
         $imageArr = [];

app/Model/AdminUser.php

@@ -107,6 +107,32 @@ class AdminUser extends Model
         return $res;
     }
 
+    /**
+     * @param array $ids
+     * @return array
+     */
+    public function getChefNameByIds(array $ids): array
+    {
+        $data = $this
+            ->join('chef', function ($join) use ($ids) {
+                $join->on('chef.user_id', '=', 'admin_user.id')
+                    ->whereIn('chef.id', $ids)
+                    ->where('admin_user.is_del',UserCode::IS_NO_DEL)
+                    ->select([
+                        'admin_user.chinese_name',
+                        'chef.id',
+                        'admin_user.username',
+                    ]);
+            })
+        ->get();
+
+        if ($data->isEmpty()) return [];
+
+        $data = $data->toArray();
+
+        return array_column($data,null,'id');
+    }
+
     /**
      * @param array $ids
      * @return array

app/Service/Api/System/SiteListService.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 namespace App\Service\Api\System;
 
 use App\Cache\Redis\Api\SiteCache;
+use App\Constants\Common\SiteCode;
 use App\Extend\SystemUtil;
 use App\Model\Site;
 use App\Service\Api\BaseService;
@@ -36,6 +37,7 @@ class SiteListService extends BaseService
                 $query->where('name', 'like', "%$name%");
             })
 //            ->where('name', 'like', '%'.$this->request->input('search_value').'%')
+            ->where('is_del',SiteCode::SITE_NO_DEL)
             ->paginate($limit)
             ->toArray();
 

env.prod

@@ -1,6 +1,6 @@
 # [app] -- 集群配置需一致
 APP_NAME=hhl_meal
-APP_ENV=dev
+APP_ENV=prod
 API_RETURN_KEY=hch@shenzhen
 JWT_KEY=hch@shenzhen
 JWT_EXPIRE=2592000