xinyouhe/crm-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改部分问题

Browse Source
This commit is contained in:
mzl
2025-03-23 01:12:59 +08:00
parent 656733c00a
commit a1f20d4877
4 changed files with 65 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controller/FeishuController.php
+20 -43
View File
@@ -34,7 +34,7 @@ class FeishuController
if(Util::isEmpty($config)){
return Util::fail(null,trans('sign_not_null'));
}
// 获取凭证
$certificate = config('feishu.'.$config);
$arr = [
@@ -100,50 +100,27 @@ class FeishuController
$state = explode("_", $param['state']);
//$userId = $request->user['id'];
$userId = $state[1];
$user = FeishuUser::where('id', $userId)->first();
$user = FeishuUser::create();
// $user = FeishuUser::where('id', $userId)->first();
// $user = FeishuUser::create();
//保存用户open_id
$user->user_id = $userId;
$user->sign = $state[0];
$user->tenant_key = $rst['data']['tenant_key'];
$user->open_id = $rst['data']['open_id'];
$user->feishu_user_id = $rst['data']['user_id'];
$user->union_id = $rst['data']['union_id'];
$user->save();
// //保存用户open_id
// $user->user_id = $userId;
// $user->sign = $state[0];
// $user->tenant_key = $rst['data']['tenant_key'];
// $user->open_id = $rst['data']['open_id'];
// $user->feishu_user_id = $rst['data']['user_id'];
// $user->union_id = $rst['data']['union_id'];
// $user->save();
// var_dump($rst);
// array(3) {
// ["code"]=>
// int(0)
// ["data"]=>
// array(11) {
// ["avatar_big"]=>
// string(168) "https://s1-imfile.feishucdn.com/static-resource/v1/v3_00ie_7cc82f38-0a89-43d4-8b2c-d90fc9d9176g~?image_size=640x640&cut_type=&quality=&format=image&sticker_format=.webp"
// ["avatar_middle"]=>
// string(168) "https://s1-imfile.feishucdn.com/static-resource/v1/v3_00ie_7cc82f38-0a89-43d4-8b2c-d90fc9d9176g~?image_size=240x240&cut_type=&quality=&format=image&sticker_format=.webp"
// ["avatar_thumb"]=>
// string(166) "https://s1-imfile.feishucdn.com/static-resource/v1/v3_00ie_7cc82f38-0a89-43d4-8b2c-d90fc9d9176g~?image_size=72x72&cut_type=&quality=&format=image&sticker_format=.webp"
// ["avatar_url"]=>
// string(166) "https://s1-imfile.feishucdn.com/static-resource/v1/v3_00ie_7cc82f38-0a89-43d4-8b2c-d90fc9d9176g~?image_size=72x72&cut_type=&quality=&format=image&sticker_format=.webp"
// ["en_name"]=>
// string(9) "李佳博"
// ["mobile"]=>
// string(14) "+8615738985690"
// ["name"]=>
// string(9) "李佳博"
// ["open_id"]=>
// string(35) "ou_37bb7cfc4311c858ea32461700fa1a43"
// ["tenant_key"]=>
// string(16) "14e7bc0fe5985740"
// ["union_id"]=>
// string(35) "on_a3fdbca48cd9477a140c7f2167a63691"
// ["user_id"]=>
// string(8) "481g947d"
// }
// ["msg"]=>
// string(7) "success"
// }
$user = new FeishuUser();
$user->firstOrCreate([
'user_id' => $userId,
'sign' => $state[0],
'tenant_key' => $rst['data']['tenant_key'],
'open_id' => $rst['data']['open_id'],
'feishu_user_id' => $rst['data']['user_id'],
'union_id' => $rst['data']['union_id']
]);
// return json($rst);
return Util::success($rst['data'], trans('success'));
app/controller/UserController.php
+10 -2
View File
@@ -145,11 +145,13 @@ class UserController
$data = [
'mobile' => $mobile,
'email' => $email,
'name' => $name,
'name' => '用户_'.rand(111111, 999999),
'sex' => $sex,
'role' => 1,
'password' => $hashedPassword,
'status' => 0,
'avatar' => 'vehicle_album/20250322/175585eeebcf44e8c2a2d50a5e8b5388_67ded58ca1011.jpg',
'sn' => substr(uniqid(), -8)
];
if (Util::isEmpty($id)) {
@@ -180,7 +182,9 @@ class UserController
unset($user->password);
$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'];
$ossservice = new \app\service\OssService();
$user['avatar'] = $user['avatar'] ? $ossservice->generatePrivateUrl($user['avatar']) : '';
return Util::success($user, trans('save_success'));
}
@@ -198,6 +202,8 @@ class UserController
$country_id = Util::getParam($request, 'country_id');
$sign = Util::getParam($request, 'sign');
$id = $request->user['id'];
$avatar = Util::getParam($request, 'avatar_url');
$mobile = Util::getParam($request, 'mobile');
$data = [
'name' => $name,
@@ -205,6 +211,8 @@ class UserController
'position' => $position,
'country_id' => $country_id,
'sign' => $sign,
'avatar' => $avatar,
'mobile' => $mobile
];
$res = User::where('id', $id)