瀏覽代碼

解决冲突

rkljw 6 月之前
父節點
當前提交
beb5863d0b
共有 2 個文件被更改,包括 0 次插入1 次删除
  1. 0 1
      app/Controller/NewsController.php
  2. 0 0
      runtime/container/scan.cache

+ 0 - 1
app/Controller/NewsController.php

@@ -297,7 +297,6 @@ class NewsController extends AbstractController
 
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['ip'] = $loginIp;
-        $requireData['website_id'] = Context::get("SiteId");
         $requireData['admin_user_id'] =Context::get("UserId");
         $requireData['level'] = isset($requireData['level']) &&  $requireData['level']?$requireData['level']:0;
         $requireData['hits'] = isset($requireData['hits']) &&  $requireData['hits']?$requireData['hits']:0;

文件差異過大導致無法顯示
+ 0 - 0
runtime/container/scan.cache


部分文件因文件數量過多而無法顯示