修复env

app/JsonRpc/ClientService.php

@@ -122,7 +122,7 @@ class ClientService implements ClientServiceInterface
 
         //获取
         // $getpage = $data['base']['getpage'] ?? 'index';
-        
+
 
         var_dump($getpage, 'leixing ');
         // index = 首页
@@ -177,19 +177,19 @@ class ClientService implements ClientServiceInterface
                                 $imgArticles = Db::table('article')
                                     ->leftJoin('article_ignore', function ($join) use ($website_id) {
                                         $join->on('article.id', '=', 'article_ignore.article_id')
-                                        ->where('article_ignore.website_id', '=', $website_id);
+                                            ->where('article_ignore.website_id', '=', $website_id);
                                     })
                                     // ->whereNull('article_ignore.article_id')
                                     ->where(function ($query) {
                                         $query->whereNull('article_ignore.article_id')
-                                        ->orWhere(function ($subQuery) {
-                                            $subQuery->whereNotNull('article_ignore.article_id')
-                                            ->where('article_ignore.is_ignore', 0)
-                                            ->where(function ($subSubQuery) {
-                                            $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
-                                                ->orWhereNull('article_ignore.c_show_time');
+                                            ->orWhere(function ($subQuery) {
+                                                $subQuery->whereNotNull('article_ignore.article_id')
+                                                    ->where('article_ignore.is_ignore', 0)
+                                                    ->where(function ($subSubQuery) {
+                                                        $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
+                                                            ->orWhereNull('article_ignore.c_show_time');
+                                                    });
                                             });
-                                        });
                                     })
                                     ->whereIn('catid', $temp_arr = array_merge([$category_id], $cat_1st_arr[$category_id]))->where('status', 1)
 
@@ -210,14 +210,14 @@ class ClientService implements ClientServiceInterface
                                     // ->whereNull('article_ignore.article_id')
                                     ->where(function ($query) {
                                         $query->whereNull('article_ignore.article_id')
-                                        ->orWhere(function ($subQuery) {
-                                            $subQuery->whereNotNull('article_ignore.article_id')
-                                            ->where('article_ignore.is_ignore', 0)
-                                            ->where(function ($subSubQuery) {
-                                            $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
-                                                ->orWhereNull('article_ignore.c_show_time');
+                                            ->orWhere(function ($subQuery) {
+                                                $subQuery->whereNotNull('article_ignore.article_id')
+                                                    ->where('article_ignore.is_ignore', 0)
+                                                    ->where(function ($subSubQuery) {
+                                                        $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
+                                                            ->orWhereNull('article_ignore.c_show_time');
+                                                    });
                                             });
-                                        });
                                     })
                                     ->whereIn('catid', $temp_arr = array_merge([$category_id], $cat_1st_arr[$category_id]))
                                     ->where('status', 1)
@@ -241,14 +241,14 @@ class ClientService implements ClientServiceInterface
                                     // ->whereNull('article_ignore.article_id')
                                     ->where(function ($query) {
                                         $query->whereNull('article_ignore.article_id')
-                                        ->orWhere(function ($subQuery) {
-                                            $subQuery->whereNotNull('article_ignore.article_id')
-                                            ->where('article_ignore.is_ignore', 0)
-                                            ->where(function ($subSubQuery) {
-                                            $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
-                                                ->orWhereNull('article_ignore.c_show_time');
+                                            ->orWhere(function ($subQuery) {
+                                                $subQuery->whereNotNull('article_ignore.article_id')
+                                                    ->where('article_ignore.is_ignore', 0)
+                                                    ->where(function ($subSubQuery) {
+                                                        $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
+                                                            ->orWhereNull('article_ignore.c_show_time');
+                                                    });
                                             });
-                                        });
                                     })
                                     ->whereRaw('MATCH(level_text) AGAINST(? IN NATURAL LANGUAGE MODE)', [$level])->where('status', 1)->whereIn('catid', $categoryIds)->whereNotNull('imgurl')->where('imgurl', '!=', '')->limit($imgSize)->orderBy('updated_at', 'desc')->get()->toArray();
                                 //拼接上拼音
@@ -265,14 +265,14 @@ class ClientService implements ClientServiceInterface
                                     // ->whereNull('article_ignore.article_id')
                                     ->where(function ($query) {
                                         $query->whereNull('article_ignore.article_id')
-                                        ->orWhere(function ($subQuery) {
-                                            $subQuery->whereNotNull('article_ignore.article_id')
-                                            ->where('article_ignore.is_ignore', 0)
-                                            ->where(function ($subSubQuery) {
-                                            $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
-                                                ->orWhereNull('article_ignore.c_show_time');
+                                            ->orWhere(function ($subQuery) {
+                                                $subQuery->whereNotNull('article_ignore.article_id')
+                                                    ->where('article_ignore.is_ignore', 0)
+                                                    ->where(function ($subSubQuery) {
+                                                        $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
+                                                            ->orWhereNull('article_ignore.c_show_time');
+                                                    });
                                             });
-                                        });
                                     })
                                     ->whereRaw('MATCH(level_text) AGAINST(? IN NATURAL LANGUAGE MODE)', [$level])->whereIn('catid', $categoryIds)->limit($textSize)->orderBy('updated_at', 'desc')->get()->toArray();
                                 //拼接上拼音
@@ -344,7 +344,7 @@ class ClientService implements ClientServiceInterface
                 //将修改后的数据放到template里
                 break;
             case 'class':
-                if(!isset($data['template']['class']['data'][0]['componentList'])){
+                if (!isset($data['template']['class']['data'][0]['componentList'])) {
                     break;
                 }
                 $componetList = $data['template']['class']['data'][0]['componentList'];
@@ -392,14 +392,14 @@ class ClientService implements ClientServiceInterface
                         })
                         ->where(function ($query) {
                             $query->whereNull('article_ignore.article_id')
-                            ->orWhere(function ($subQuery) {
-                                $subQuery->whereNotNull('article_ignore.article_id')
-                                ->where('article_ignore.is_ignore', 0)
-                                ->where(function ($subSubQuery) {
-                                $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
-                                    ->orWhereNull('article_ignore.c_show_time');
+                                ->orWhere(function ($subQuery) {
+                                    $subQuery->whereNotNull('article_ignore.article_id')
+                                        ->where('article_ignore.is_ignore', 0)
+                                        ->where(function ($subSubQuery) {
+                                            $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
+                                                ->orWhereNull('article_ignore.c_show_time');
+                                        });
                                 });
-                            });
                         })
                         // ->select($listType)
                         ->orderBy('updated_at', 'desc')
@@ -419,14 +419,14 @@ class ClientService implements ClientServiceInterface
                         })
                         ->where(function ($query) {
                             $query->whereNull('article_ignore.article_id')
-                            ->orWhere(function ($subQuery) {
-                                $subQuery->whereNotNull('article_ignore.article_id')
-                                ->where('article_ignore.is_ignore', 0)
-                                ->where(function ($subSubQuery) {
-                                $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
-                                    ->orWhereNull('article_ignore.c_show_time');
+                                ->orWhere(function ($subQuery) {
+                                    $subQuery->whereNotNull('article_ignore.article_id')
+                                        ->where('article_ignore.is_ignore', 0)
+                                        ->where(function ($subSubQuery) {
+                                            $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
+                                                ->orWhereNull('article_ignore.c_show_time');
+                                        });
                                 });
-                            });
                         })
                         ->orderBy('updated_at', 'desc')
                         ->get()
@@ -445,7 +445,7 @@ class ClientService implements ClientServiceInterface
                 }
                 break;
             case 'list':
-                if(!isset($data['template']['list']['data'][0]['componentList'])){
+                if (!isset($data['template']['list']['data'][0]['componentList'])) {
                     break;
                 }
                 $componetListdata = $data['template']['list']['data'];
@@ -471,14 +471,14 @@ class ClientService implements ClientServiceInterface
                                 })
                                 ->where(function ($query) {
                                     $query->whereNull('article_ignore.article_id')
-                                    ->orWhere(function ($subQuery) {
-                                        $subQuery->whereNotNull('article_ignore.article_id')
-                                        ->where('article_ignore.is_ignore', 0)
-                                        ->where(function ($subSubQuery) {
-                                        $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
-                                            ->orWhereNull('article_ignore.c_show_time');
+                                        ->orWhere(function ($subQuery) {
+                                            $subQuery->whereNotNull('article_ignore.article_id')
+                                                ->where('article_ignore.is_ignore', 0)
+                                                ->where(function ($subSubQuery) {
+                                                    $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
+                                                        ->orWhereNull('article_ignore.c_show_time');
+                                                });
                                         });
-                                    });
                                 })
                                 ->orderBy('updated_at', 'desc')
                                 ->get();
@@ -514,14 +514,14 @@ class ClientService implements ClientServiceInterface
                                     })
                                     ->where(function ($query) {
                                         $query->whereNull('article_ignore.article_id')
-                                        ->orWhere(function ($subQuery) {
-                                            $subQuery->whereNotNull('article_ignore.article_id')
-                                            ->where('article_ignore.is_ignore', 0)
-                                            ->where(function ($subSubQuery) {
-                                            $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
-                                                ->orWhereNull('article_ignore.c_show_time');
+                                            ->orWhere(function ($subQuery) {
+                                                $subQuery->whereNotNull('article_ignore.article_id')
+                                                    ->where('article_ignore.is_ignore', 0)
+                                                    ->where(function ($subSubQuery) {
+                                                        $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
+                                                            ->orWhereNull('article_ignore.c_show_time');
+                                                    });
                                             });
-                                        });
                                     })
                                     ->limit($imgSize)
                                     ->orderBy('updated_at', 'desc')
@@ -542,14 +542,14 @@ class ClientService implements ClientServiceInterface
                                     })
                                     ->where(function ($query) {
                                         $query->whereNull('article_ignore.article_id')
-                                        ->orWhere(function ($subQuery) {
-                                            $subQuery->whereNotNull('article_ignore.article_id')
-                                            ->where('article_ignore.is_ignore', 0)
-                                            ->where(function ($subSubQuery) {
-                                            $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
-                                                ->orWhereNull('article_ignore.c_show_time');
+                                            ->orWhere(function ($subQuery) {
+                                                $subQuery->whereNotNull('article_ignore.article_id')
+                                                    ->where('article_ignore.is_ignore', 0)
+                                                    ->where(function ($subSubQuery) {
+                                                        $subSubQuery->where('article_ignore.c_show_time', '<=', date('Y-m-d H:i:s'))
+                                                            ->orWhereNull('article_ignore.c_show_time');
+                                                    });
                                             });
-                                        });
                                     })
                                     ->limit($textSize)
                                     ->orderBy('updated_at', 'desc')
@@ -574,7 +574,7 @@ class ClientService implements ClientServiceInterface
 
                 break;
             case 'article':
-                if(!isset($data['template']['article']['data'])){
+                if (!isset($data['template']['article']['data'])) {
                     break;
                 }
                 $article_id = 51434; //假设这是文章ID
@@ -806,10 +806,7 @@ class ClientService implements ClientServiceInterface
     {
         var_dump($data, 'data1');
         // return Result::success($data);
-
-
         $where = [];
-
         if (isset($data['website_id'])) {
             $where['website_template.website_id'] = $data['website_id'];
         }
@@ -899,7 +896,7 @@ class ClientService implements ClientServiceInterface
         // 使用Guzzle HTTP客户端发送POST请求
         try {
             $client = new \GuzzleHttp\Client();
-            $response = $client->post('http://adminpre.bjzxtw.org.cn/create.php', [
+            $response = $client->post(env('CREATE_WEB', 'http://adminpre.bjzxtw.org.cn/create.php'), [
                 'json' => $postData,
                 'timeout' => 30,
                 'headers' => [
@@ -1029,9 +1026,8 @@ class ClientService implements ClientServiceInterface
 }
 class bt_api
 {
-    private $BT_KEY = "RN0wTXLHpKKBXXxyDJoovHMpBhyLVFWZ";  //接口密钥
-    private $BT_PANEL = "http://192.168.1.234:18888";       //面板地址
-
+    private $BT_KEY = env('BT_KEY', 'RN0wTXLHpKKBXXxyDJoovHMpBhyLVFWZ');  //接口密钥
+    private $BT_PANEL = env('BT_PANEL', 'http://192.168.1.234:18888');       //面板地址
     //如果希望多台面板，可以在实例化对象时，将面板地址与密钥传入
     public function __construct($bt_panel = null, $bt_key = null)
     {