rkljw 1 месяц назад
Родитель
Сommit
81bdb0ed20
2 измененных файлов с 12 добавлено и 8 удалено
  1. 11 7
      .env
  2. 1 1
      app/JsonRpc/NewsService.php

+ 11 - 7
.env

@@ -4,23 +4,27 @@ APP_ENV=dev
 HOST = http://101.254.114.211:13306/
 
 DB_DRIVER=mysql
-DB_HOST=101.254.114.211
+DB_HOST=192.168.1.123
 DB_PORT=13306
 DB_DATABASE=hyperf
 DB_USERNAME=root
-DB_PASSWORD=xKmapDpKCxMMSkbe
+DB_PASSWORD=zxt_mysql_dev
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=
 
 
-REDIS_HOST=101.254.114.211
-REDIS_AUTH=YPWWnFnNebc7427B
+
+REDIS_HOST=192.168.1.123
+REDIS_AUTH=zxt_redis_dev
 REDIS_PORT=26739
+REDIS_PASSWORD=zxt_redis_dev
 REDIS_DB=0
 
-AMQP_HOST=103.105.201.2
-AMQP_PORT=5673
+
+
+AMQP_HOST=192.168.1.123
+AMQP_PORT=5672
 AMQP_USER=rabbitmq
-AMQP_PASSWORD=H8eDTAk6LY7EjJ8y
+AMQP_PASSWORD=zxt_mq_dev
 

+ 1 - 1
app/JsonRpc/NewsService.php

@@ -56,7 +56,7 @@ class NewsService implements NewsServiceInterface
             })
             ->leftJoin('district', 'category.city_id', 'district.id')
             ->leftJoin('department', 'category.department_id', 'department.id')
-            ->leftJoin('category as c', 'c.pid', 'category.id')
+            ->leftJoin('category as c', 'category.pid', 'c.id')
             ->select("category.*", "district.name as city_name", "department.name as department_name","c.name as parent_name")
             ->limit($data['pageSize'])->orderByDesc('category.updated_at')->offset(($data['page'] - 1) * $data['pageSize'])->get();
         $count = Category::where($where)->when($city_id, function ($query) use ($city_id) {