|
@@ -83,7 +83,7 @@ class BeanRepository
|
|
if ($user_data) {
|
|
if ($user_data) {
|
|
foreach ($new_arr as $k => $v) {
|
|
foreach ($new_arr as $k => $v) {
|
|
if (!isset($user_data[$v['uid']])) continue;
|
|
if (!isset($user_data[$v['uid']])) continue;
|
|
- $new_arr[$k]['follow_status'] = $user_data[$v['uid']]['follow_status'];
|
|
|
|
|
|
+// $new_arr[$k]['follow_status'] = $user_data[$v['uid']]['follow_status'];
|
|
$new_arr[$k]['username'] = $user_data[$v['uid']]['username'];
|
|
$new_arr[$k]['username'] = $user_data[$v['uid']]['username'];
|
|
$new_arr[$k]['avatar'] = $user_data[$v['uid']]['avatar'];
|
|
$new_arr[$k]['avatar'] = $user_data[$v['uid']]['avatar'];
|
|
}
|
|
}
|
|
@@ -106,7 +106,7 @@ class BeanRepository
|
|
foreach ($registered_most as $k=>$v){
|
|
foreach ($registered_most as $k=>$v){
|
|
if(!isset($user_data[$v['superior_uid']])) continue;
|
|
if(!isset($user_data[$v['superior_uid']])) continue;
|
|
$registered_most[$k]['count'] = intval($v['count']);
|
|
$registered_most[$k]['count'] = intval($v['count']);
|
|
- $registered_most[$k]['follow_status'] = $user_data[$v['superior_uid']]['follow_status'];
|
|
|
|
|
|
+// $registered_most[$k]['follow_status'] = $user_data[$v['superior_uid']]['follow_status'];
|
|
$registered_most[$k]['username'] = $user_data[$v['superior_uid']]['username'];
|
|
$registered_most[$k]['username'] = $user_data[$v['superior_uid']]['username'];
|
|
$registered_most[$k]['avatar'] = $user_data[$v['superior_uid']]['avatar'];
|
|
$registered_most[$k]['avatar'] = $user_data[$v['superior_uid']]['avatar'];
|
|
}
|
|
}
|
|
@@ -129,7 +129,7 @@ class BeanRepository
|
|
foreach ($all_best_author as $k=>$v){
|
|
foreach ($all_best_author as $k=>$v){
|
|
if(!isset($user_data[$v['content_author_id']])) continue;
|
|
if(!isset($user_data[$v['content_author_id']])) continue;
|
|
$all_best_author[$k]['count'] = intval($v['count']);
|
|
$all_best_author[$k]['count'] = intval($v['count']);
|
|
- $all_best_author[$k]['follow_status'] = $user_data[$v['content_author_id']]['follow_status'];
|
|
|
|
|
|
+// $all_best_author[$k]['follow_status'] = $user_data[$v['content_author_id']]['follow_status'];
|
|
$all_best_author[$k]['username'] = $user_data[$v['content_author_id']]['username'];
|
|
$all_best_author[$k]['username'] = $user_data[$v['content_author_id']]['username'];
|
|
$all_best_author[$k]['avatar'] = $user_data[$v['content_author_id']]['avatar'];
|
|
$all_best_author[$k]['avatar'] = $user_data[$v['content_author_id']]['avatar'];
|
|
}
|
|
}
|
|
@@ -203,10 +203,9 @@ class BeanRepository
|
|
//获取每日新闻
|
|
//获取每日新闻
|
|
function getNews($request) {
|
|
function getNews($request) {
|
|
try {
|
|
try {
|
|
- $sign = generateSign([], config('customer.app_secret'));
|
|
|
|
$url = config("customer.app_service_url").'/config/v2/starNews/lists';
|
|
$url = config("customer.app_service_url").'/config/v2/starNews/lists';
|
|
$array = [
|
|
$array = [
|
|
- 'json' => ['sign' => $sign], 'query' => [], 'http_errors' => false
|
|
|
|
|
|
+ 'json' => [], 'query' => [], 'http_errors' => false
|
|
];
|
|
];
|
|
return http($url,$array,'get');
|
|
return http($url,$array,'get');
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
@@ -218,11 +217,11 @@ class BeanRepository
|
|
//获取平台内容
|
|
//获取平台内容
|
|
function getPlatformContent($id) {
|
|
function getPlatformContent($id) {
|
|
try {
|
|
try {
|
|
- $url = config("customer.app_service_url").'/config/v2/platformContent/lists';
|
|
|
|
|
|
+ $url = config("customer.app_service_url") . '/config/v2/platformContent/lists';
|
|
$array = [
|
|
$array = [
|
|
- 'json' => ['id'=>$id], 'query' => [], 'http_errors' => false,'headers'=>['Authorization'=>"Bearer ".JWTAuth::getToken()]
|
|
|
|
|
|
+ 'json' => ['id' => $id], 'query' => [], 'http_errors' => false, 'headers' => ['Authorization' => "Bearer " . JWTAuth::getToken()]
|
|
];
|
|
];
|
|
- return http($url,$array,'get');
|
|
|
|
|
|
+ return http($url, $array, 'get');
|
|
} catch (\Exception $e) {
|
|
} catch (\Exception $e) {
|
|
Log::debug($e->getMessage());
|
|
Log::debug($e->getMessage());
|
|
return [];
|
|
return [];
|