1

.env

@@ -14,17 +14,32 @@ DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=
 
 
+#REDIS_HOST=101.254.114.211
+#REDIS_AUTH=YPWWnFnNebc7427B
+#REDIS_PORT=26739
+#REDIS_DB=0
+
+
+# REDIS_HOST=192.168.1.201
+# REDIS_AUTH=
+# REDIS_PORT=6379
+# REDIS_DB=0
+
 REDIS_HOST=192.168.1.123
-REDIS_AUTH=zxt_redis_dev
+REDIS_AUTH=
 REDIS_PORT=26739
+REDIS_PASSWORD=zxt_redis_dev
 REDIS_DB=0
 
+
+
 AMQP_HOST=192.168.1.123
 AMQP_PORT=5672
 AMQP_USER=rabbitmq
 AMQP_PASSWORD=zxt_mq_dev
 
 
+
 #小程序获取openid
 WECHAT = https://api.weixin.qq.com/
 

app/Controller/IndexController.php

@@ -39,6 +39,7 @@ class IndexController extends AbstractController
             $errorMessage = $validator->errors()->first();
             var_dump($errorMessage);
         }
+        // master123
     }
 
     public function verifyCode()
@@ -66,6 +67,7 @@ class IndexController extends AbstractController
 //        return $result->getImageBase64();
 
     }
+
 // test
       /**
      * 获取验证码
@@ -77,4 +79,5 @@ class IndexController extends AbstractController
         $img_code  =  $redis->get('code'.$ip);
         return Result::success($img_code);
     }
+
 }

app/Controller/WebController.php

@@ -389,7 +389,11 @@ class WebController extends AbstractController
 
             ]
             );
-            $data['catid'] = $requireData['catid'];
+            if(is_string($requireData['catid'])){
+                $data['catid'] = json_decode($requireData['catid']); 
+            }else{
+                $data['catid'] = $requireData['catid']; 
+            }
         }
             
         $validator = $this->validationFactory->make(

app/JsonRpc/NewsServiceInterface.php

@@ -102,11 +102,13 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function addWebsiteSurveyVote(array $data);
+
     /**
      * @param array $data
      * @return mixed
      */
     public function checkCategoryName(array $data);
 
+
 }
 

app/JsonRpc/PublicRpcService.php

@@ -221,6 +221,7 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
     public function getTemplateList(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
@@ -308,4 +309,5 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -129,6 +129,7 @@ interface PublicRpcServiceInterface
      *
      */
     public function modZhinengbumen(array $data);
+
     public function getTemplateClass(array $data);
     public function getTemplateList(array $data);
     public function getTemplateInfo(array $data);
@@ -147,6 +148,7 @@ interface PublicRpcServiceInterface
     public function updateComponent(array $data);
     public function getWebsiteTemplateList(array $data);
     public function getWebsiteTemplateInfo(array $data);
+
     /**
      * @param array $data
      * @return mixed
@@ -159,4 +161,5 @@ interface PublicRpcServiceInterface
      */
     public function uploadFile(array $data);
 
+
 }

app/JsonRpc/WebsiteService.php

@@ -449,17 +449,41 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteFootInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     *@param array $data
+     * @return mixed
+     */
+    public function getAllTemplateClass(array $data)
 
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
 
-    
+    public function getWebsiteTemplateList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed
      */
-    public function getWebsiteFootInfo(array $data)
+    public function addWebsiteTemplateclassintel(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
      /**
      * @param array $data
      * @return mixed
@@ -606,30 +630,6 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
         return $this->__request(__FUNCTION__, $data);
     }
 
-    /**
-     *@param array $data
-     * @return mixed
-     */
-    public function getAllTemplateClass(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteTemplateList(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function addWebsiteTemplateclassintel(array $data)
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
     /**
      * @param array $data
      * @return mixed

app/Middleware/Auth/PublicMiddleware.php

@@ -63,6 +63,10 @@ class PublicMiddleware implements MiddlewareInterface
 //                var_dump($result['data']);
                 // var_dump("获取站点id：",$result);
                 Context::set("SiteId",$result['data']['id']);
+                if($result['data']['id']==1){
+                    Context::set("SiteId",0);
+                }
+
                 if ($result) {
                     return $handler->handle($request);
                 }

config/api/news.php

@@ -34,10 +34,10 @@ Router::addGroup(
         Router::get('/getArticleInfo', [NewsController::class, 'getArticleInfo']);
         //获取导航池信息
         Router::get('/getCategoryInfo', [NewsController::class, 'getCategoryInfo']);
-        //检测导航池名称是否存在
-        Router::post('/checkCategoryName', [NewsController::class, 'checkCategoryName']);
          //前端-获取资讯列表
          Router::get('/getWebsiteArticleList', [NewsController::class, 'getWebsiteArticleList']);
+        //检测导航池名称是否存在
+        Router::post('/checkCategoryName', [NewsController::class, 'checkCategoryName']);
 
     },
     ['middleware' => [FooMiddleware::class]]