Merge remote-tracking branch 'origin/develop' into develop

app/Repositories/BeanRepository.php

@@ -0,0 +1,34 @@
+<?php
+namespace App\Repositories;
+
+
+use App\Service\RabbitMqUtil;
+use Illuminate\Support\Facades\Log;
+use Tymon\JWTAuth\Facades\JWTAuth;
+use Illuminate\Support\Facades\Redis;
+class BeanRepository
+{
+    public function beanDetail($request)
+    {
+        try {
+            $sign = generateSign(['type' => $request['type']], config('customer.app_secret'));
+            $url = config("customer.app_service_url") . '/user/v2/beanDetail';
+            $array = [
+                'json' => ['sign' => $sign, 'type' => $request['type']], 'query' => [], 'http_errors' => false, 'headers' => ['Authorization' => "Bearer " . JWTAuth::getToken()]
+            ];
+            return http($url, $array, 'get');
+        } catch (\Exception $e) {
+            Log::debug("beanDetail:".$e->getMessage());
+            return [];
+        }
+    }
+
+    public function getBean($request)
+    {
+        $user_bean = [];
+        $user_bean['user_count'] = Redis::get('user_count');
+        $user_bean['yesterday_add_user'] = Redis::get('yesterday_add_user');
+        $user_bean['yesterday_add_bean'] = Redis::get('yesterday_add_bean');
+        return $user_bean;
+    }
+}

app/Repositories/MemberRepository.php

@@ -65,28 +65,4 @@ class MemberRepository
             Log::debug('放弃操作用户彩虹豆，原因：彩虹豆值为'.$value);
         }
     }
-
-    public function beanDetail($request)
-    {
-        try {
-            $sign = generateSign(['type' => $request['type']], config('customer.app_secret'));
-            $url = config("customer.app_service_url") . '/user/v2/beanDetail';
-            $array = [
-                'json' => ['sign' => $sign, 'type' => $request['type']], 'query' => [], 'http_errors' => false, 'headers' => ['Authorization' => "Bearer " . JWTAuth::getToken()]
-            ];
-            return http($url, $array, 'get');
-        } catch (\Exception $e) {
-            Log::debug("beanDetail:".$e->getMessage());
-            return [];
-        }
-    }
-
-    public function getBean($request)
-    {
-        $user_bean = [];
-        $user_bean['user_count'] = Redis::get('user_count');
-        $user_bean['yesterday_add_user'] = Redis::get('yesterday_add_user');
-        $user_bean['yesterday_add_bean'] = Redis::get('yesterday_add_bean');
-        return $user_bean;
-    }
 }