diff --git a/app/command/admin/Worker.php b/app/command/admin/Worker.php
index 820ef73..42a0e5e 100644
--- a/app/command/admin/Worker.php
+++ b/app/command/admin/Worker.php
@@ -3,6 +3,7 @@
namespace app\command\admin;
+use app\entity\SysUserClient;
use app\service\admin\LoginService;
use think\console\Command;
use think\console\Input;
@@ -51,16 +52,30 @@ class Worker extends Command
if($messageJson) {
if($messageJson['event'] == 'bind_connect_id') {
$authorization = $messageJson['data']['token'] ?? '';
+ $clientId = $messageJson['data']['clientId'] ?? '';
+ $clientName = $messageJson['data']['clientName'] ?? '';
+ $clientVersion = $messageJson['data']['clientVersion'] ?? '';
$authorization = str_replace('Bearer ', '', $authorization);
$loginSrv = new LoginService();
$auth = $loginSrv->checkUserAccessToken($authorization);
var_dump("当前用户: ".$auth->userId);
+ // 用户信息
$connection->userId = $auth->userId;
+ // 客户端信息
+ $connection->clientId = $clientId;
+ $connection->clientName = $clientName;
+ $connection->clientVersion = $clientVersion;
+ // 绑定成功通知
$connection->send(json_encode(['event'=>'bind_connect_id_success','userId'=>$auth->userId]));
}
if ($messageJson['event'] == 'lock_client_screen') {
if($connection->userId) {
+ $lock_password = $messageJson['data']['lockPassword'] ?? '';
var_dump("锁定客户端/通知全部ws触发锁定操作");
+ SysUserClient::where([
+ 'client_id' => $connection->clientId,
+ 'client_name'=> $connection->clientName
+ ])->update(['is_lock'=>1,'lock_password'=>$lock_password,'lock_time'=>date('Y-m-d H:i:s')]);
}
}
}
diff --git a/z_ele/src/layout/components/lock-dialog.vue b/z_ele/src/layout/components/lock-dialog.vue
index 66bd0e0..48c1ade 100644
--- a/z_ele/src/layout/components/lock-dialog.vue
+++ b/z_ele/src/layout/components/lock-dialog.vue
@@ -11,26 +11,37 @@
:close-on-press-escape="false"
:close-on-click-modal="false"
>
-