Merge branch 'feature/xsm' into develop

app/common/controller/SystemController.php

@@ -117,12 +117,24 @@ class SystemController
      */
     private function buildJwtPayload(User $user, ?Systems $system): array
     {
+        $now = time();
+        $exp = $now + config('jwt.jwt_expiration');
+        $system_ids = $user->systems ? $user->systems->pluck('id')->toArray() : [];
+        $role_ids = $user->roles ? $user->roles->pluck('id')->toArray() : [];
         $payload = [
-            'user_id' => $user->id,
+            'sub'        => 'user_' . $user->id,
-            'sn'      => $user->sn ?? '',
+            'aud'        => $system->code,
-            'name'    => $user->name ?? '',
+            'iat'        => $now,
-            'iat'     => time(),
+            'exp'        => $exp,
-            'exp'     => time() + config('jwt.jwt_expiration'),
+            'nbf'        => $now,
+            'typ'        => 'access',
+            'uid'        => $user->id,
+            'uname'      => $user->name,
+            'role_ids'   => $role_ids,
+            'system_ids' => $system_ids,
+//            'user_id' => $user->id,
+//            'sn'      => $user->sn ?? '',
+//            'name'    => $user->name ?? '',
         ];
 
         if ($system) {