Merge pull request LC044#21 from LC044/dev_zsk

Dev zsk
kk25114 · Nov 22, 2023 · 640d7ac · 640d7ac
2 parents eaab199 + 4340556
commit 640d7ac
Show file tree

Hide file tree

Showing 31 changed files with 1,014 additions and 13,524 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ app/DataBase/Msg/*
 *.db
 *.pyc
 *.log
+*.spec
 test*
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/DataBase/msg.py b/app/DataBase/msg.py
@@ -49,10 +49,14 @@ def get_messages(username_):
     '''
     result = []
     for cur in cursor:
-        cur.execute(sql, [username_])
-        result_ = cur.fetchall()
-        # print(len(result))
-        result += result_
+        try:
+            lock.acquire(True)
+            cur.execute(sql, [username_])
+            result_ = cur.fetchall()
+            # print(len(result))
+            result += result_
+        finally:
+            lock.release()
     result.sort(key=lambda x: x[5])
     return result
 
@@ -63,7 +67,7 @@ def get_message_by_num(username_, local_id):
             from MSG
             where StrTalker = ? and localId < ?
             order by CreateTime desc 
-            limit 30 
+            limit 10 
         '''
     result = []
     try:
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,5 @@ app/DataBase/Msg/* @@
     *.db
     *.pyc
     *.log
+    *.spec
     test*