From 794941982d457fa146db89e9e27e810b08533760 Mon Sep 17 00:00:00 2001
From: DZY <dongzhenyi202301@163.com>
Date: Mon, 2 Jun 2025 15:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E8=BF=94=E5=9B=9E=E7=9A=84type?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=88=90=E5=8A=9F=E5=92=8C=E6=9C=AA?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E7=9A=84=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CS3.1.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/CS3.1.py b/CS3.1.py
index 0899e19..13e5f4b 100644
--- a/CS3.1.py
+++ b/CS3.1.py
@@ -48,15 +48,15 @@ def register_user(usr, pwd):
     csr2.execute('SELECT * FROM users WHERE name = ?', (usr,))
     result = csr2.fetchone()
     if result is not None:
-        return {"success": False, "message": "Username already exists"}
+        return {"type": "register_0", "success": False, "message": "Username already exists"}
     else:
         try:
             cursor = conn.cursor()
             cursor.execute("INSERT INTO users (name, passwd) VALUES (?, ?)", (usr, pwd))
             conn.commit()
-            return {"success": True, "message": "User registered successfully"}
+            return {"type": "register_1", "success": True, "message": "User registered successfully"}
         except sqlite3.Error as e:
-            return {"success": False, "message": str(e)}
+            return {"type": "register_0", "success": False, "message": str(e)}
         finally:
             conn.close()
 
@@ -83,14 +83,18 @@ def handle_socket_message(data, addr, conn):
         action = data.get('type')
         if action == 'register':
             result = register_user(data.get('username'), data.get('password'))
-            return {"type": "register","status": "success" if result['success'] else "error", "message": result['message']}
+            if result['success']:
+                return {"type": "register_1","status": "success", "message": result['message']}
+            else:
+                return {"type": "register_0","status": "error", "message": result['message']}
+
         elif action == 'login':
             if isuserxist(data['username']):
                 if ispsswdright(data['username'], data['password']):
                     active_users[addr[0]] = data['username']
                     chat_connections.append(conn)
-                    return {"type": "login", "status": "success", "message": "Login successful"}
-            return {"type": "login", "status": "error", "message": "Invalid credentials"}
+                    return {"type": "login_1", "status": "success", "message": "Login successful"}
+            return {"type": "login_0", "status": "error", "message": "Invalid credentials"}
         elif action == 'chat':
             if addr[0] in active_users:
                 message = {
@@ -125,7 +129,7 @@ def run_socket_server():
                     conn.sendall(json.dumps(response).encode())
                 except json.JSONDecodeError:
                     conn.sendall(json.dumps(
-                        {"status": "error", "message": "Invalid JSON"}
+                        {"type": "register_0", "status": "error", "message": "Invalid JSON"}
                     ).encode())
         except ConnectionResetError:
             if addr[0] in active_users: