rkljw 1 ヶ月 前
コミット
b04d0bd274
2 ファイル変更16 行追加7 行削除
  1. 15 6
      .env
  2. 1 1
      app/JsonRpc/NewsService.php

+ 15 - 6
.env

@@ -2,16 +2,25 @@ APP_NAME=user_producer
 APP_ENV=dev
 APP_ENV=dev
 
 
 DB_DRIVER=mysql
 DB_DRIVER=mysql
-DB_HOST=101.254.114.211
+DB_HOST=192.168.1.123
 DB_PORT=13306
 DB_PORT=13306
 DB_DATABASE=hyperf
 DB_DATABASE=hyperf
 DB_USERNAME=root
 DB_USERNAME=root
-DB_PASSWORD=xKmapDpKCxMMSkbe
+DB_PASSWORD=zxt_mysql_dev
 DB_CHARSET=utf8mb4
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
 DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=
 DB_PREFIX=
 
 
-REDIS_HOST=localhost
-REDIS_AUTH=(null)
-REDIS_PORT=6379
-REDIS_DB=0
+
+REDIS_HOST=192.168.1.123
+REDIS_AUTH=zxt_redis_dev
+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

+ 1 - 1
app/JsonRpc/NewsService.php

@@ -45,7 +45,7 @@ class NewsService implements NewsServiceInterface
             })
             })
             ->leftJoin('district', 'category.city_id', 'district.id')
             ->leftJoin('district', 'category.city_id', 'district.id')
             ->leftJoin('department', 'category.department_id', 'department.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")
             ->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();
             ->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) {
         $count = Category::where($where)->when($city_id, function ($query) use ($city_id) {