From 25f3ae640409bce86b9a4dbbd0e250df99668890 Mon Sep 17 00:00:00 2001 From: suti7yk5032 Date: Mon, 26 Aug 2024 00:19:53 +0900 Subject: [PATCH] =?UTF-8?q?UUID=E5=9E=8B=E3=82=92str(VARCHAR)=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dislocker.py | 2 +- dislocker_auth.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dislocker.py b/dislocker.py index 3309753..dc4160f 100644 --- a/dislocker.py +++ b/dislocker.py @@ -90,7 +90,7 @@ class DL(): find_pc_list_table = cursor.fetchall() print(find_pc_list_table) if find_pc_list_table[0][0] == False: - cursor.execute("CREATE TABLE pc_list (pc_number INTEGER NOT NULL, using_member_id INTEGER, password_hash VARCHAR(32), pc_uuid UUID, pc_token VARCHAR(36), PRIMARY KEY (pc_number), FOREIGN KEY (using_member_id) REFERENCES club_member(member_id))") + cursor.execute("CREATE TABLE pc_list (pc_number INTEGER NOT NULL, using_member_id INTEGER, password_hash VARCHAR(32), pc_uuid VARCHAR(36), pc_token VARCHAR(36), PRIMARY KEY (pc_number), FOREIGN KEY (using_member_id) REFERENCES club_member(member_id))") for i in self.pc_list: print(i) cursor.execute("INSERT INTO pc_list (pc_number) VALUES (%s)", (i,)) diff --git a/dislocker_auth.py b/dislocker_auth.py index 297f65f..843fb06 100644 --- a/dislocker_auth.py +++ b/dislocker_auth.py @@ -53,7 +53,7 @@ class Auth(): try: cursor = self.db.cursor() pc_number = int(kwargs["pc_number"]) - pc_uuid = uuid.UUID(kwargs["pc_uuid"]) + pc_uuid = str(kwargs["pc_uuid"]) pc_token = str(kwargs["pc_token"]) if "password_hash" in kwargs: @@ -174,7 +174,7 @@ class Auth(): try: cursor = self.db.cursor() pc_number = int(kwargs["pc_number"]) - pc_uuid = uuid.UUID(kwargs["pc_uuid"]) + pc_uuid = str(kwargs["pc_uuid"]) cursor.execute("SELECT pc_uuid FROM pc_list WHERE pc_number = %s", (pc_number,)) pc_record = cursor.fetchall() pc_record_uuid = pc_record[0][0]