用户

app/controller/FeishuController.php

@@ -5,6 +5,7 @@ namespace app\controller;
 use app\model\FeishuUser;
 use app\model\User;
 use app\util\Util;
+use config\constants\Constants;
 use support\Log;
 use support\Request;
 use support\exception\BusinessException;
@@ -53,7 +54,7 @@ class FeishuController
     public function getSign(Request $request)
     {
 
-        $res = [['id'=>'xinyouhe','name'=>'新友合'],['id'=>'mbaf','name'=>'MAGIC BRIDGE AUTO FZE']];
+        $res = Constants::SIGN;
 //        foreach ($certificate as $k => $v) {
 //            $res []=['id'=>$k,'name'=>$k];
 //        }

app/controller/UserController.php

@@ -11,6 +11,7 @@ use app\service\UserService;
 use app\util\HttpClient;
 use app\util\JwtUtil;
 use app\util\Util;
+use config\constants\Constants;
 use support\Log;
 use support\Redis;
 use support\Request;
@@ -201,8 +202,14 @@ class UserController
         $user['feishu_openid'] = FeishuUser::where('user_id', $userId)->value('open_id');
         $user['country_name'] = Country::where('id', $user['country_id'])->value('cn_addr');
         $user['avatar_url'] = $user['avatar'];
+        $user['socialize_pic_url'] = $user['socialize_pic'];
         $ossservice = new \app\service\OssService();
         $user['avatar'] = $user['avatar'] ? $ossservice->generatePrivateUrl($user['avatar']) : '';
+        $user['socialize_pic'] = $user['socialize_pic'] ? $ossservice->generatePrivateUrl($user['socialize_pic']) : '';
+
+        // 重构数组
+        $sign = array_column(Constants::SIGN, 'name', 'id');
+        $user['company'] = $sign[$user['sign']];
         return Util::success($user, trans('success'));
     }