diff --git a/app/Http/Controllers/RoomControlController.php b/app/Http/Controllers/RoomControlController.php
index da242ee..10ba8eb 100644
--- a/app/Http/Controllers/RoomControlController.php
+++ b/app/Http/Controllers/RoomControlController.php
@@ -169,12 +169,11 @@ class RoomControlController extends Controller
         
         if ($room->exists && $room->internal_ip !== $validated['ip']) {
             $validated['status'] = 'error';
-            $room->internal_ip = $validated['ip'];
         } else {
             $validated['status'] = 'online';
-            $room->internal_ip ??= $validated['ip']; // 新的話補上
         }
-
+        $room->internal_ip = $validated['ip'];
+        $room->port = 1000;
         $room->is_online=1;
         $room->touch(); // 更新 updated_at
         $room->save();
diff --git a/app/Http/Requests/ReceiveRoomRegisterRequest.php b/app/Http/Requests/ReceiveRoomRegisterRequest.php
index 2945bd0..3641e41 100644
--- a/app/Http/Requests/ReceiveRoomRegisterRequest.php
+++ b/app/Http/Requests/ReceiveRoomRegisterRequest.php
@@ -22,8 +22,6 @@ class ReceiveRoomRegisterRequest extends ApiRequest
     public function rules(): array
     {
         return [
-            'room_name' => 'nullable|string',
-            'room_ip' => 'nullable|string',
             'email' => 'required|email',
             'password' => 'required',
         ];
diff --git a/database/migrations/2025_05_06_055307_create_rooms_table.php b/database/migrations/2025_05_06_055307_create_rooms_table.php
index d4468c7..1ace277 100644
--- a/database/migrations/2025_05_06_055307_create_rooms_table.php
+++ b/database/migrations/2025_05_06_055307_create_rooms_table.php
@@ -24,6 +24,8 @@ return new class extends Migration
             $table->dateTime('started_at')->nullable()->comment('開始時間');         // 
             $table->dateTime('ended_at')->nullable()->comment('結束時間'); // 
             $table->timestamps();
+            // 👇 複合唯一鍵（分店 + 樓層 + 類型 + 包廂名稱）
+            $table->unique(['branch_id', 'floor', 'type', 'name'], 'unique_room_name_per_branch_floor_type');
         });
     }