From 7595e24cef8b8aee03719de6b644f3df53af8e41 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Wed, 2 Apr 2025 15:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/FeishuController.php | 3 ++-
 app/controller/UserController.php   | 7 +++++++
 config/constants/Constants.php      | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/controller/FeishuController.php b/app/controller/FeishuController.php
index c544f21..94bea1a 100644
--- a/app/controller/FeishuController.php
+++ b/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];
 //        }
diff --git a/app/controller/UserController.php b/app/controller/UserController.php
index 3e1ba6e..4b4d367 100644
--- a/app/controller/UserController.php
+++ b/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'));
     }
 
diff --git a/config/constants/Constants.php b/config/constants/Constants.php
index 36a21e5..e4f4fad 100644
--- a/config/constants/Constants.php
+++ b/config/constants/Constants.php
@@ -74,4 +74,9 @@ class Constants
         self::CUSTOMER_SEX_MAN => 'man',
         self::CUSTOMER_SEX_WOMAN => 'woman',
     ];
+
+    public const SIGN = [
+        ['id' => 'xinyouhe', 'name' => '新友合'],
+        ['id' => 'mbaf', 'name' => 'MAGIC BRIDGE AUTO FZE']
+    ];
 }
\ No newline at end of file