Просмотр исходного кода

fix bug 2

https://github.com/openNAMU/openNAMU/issues/1795
https://github.com/openNAMU/openNAMU/issues/1796
잉여개발기 (SPDV) 3 лет назад
Родитель
Сommit
757fcb16a7
1 измененных файлов с 7 добавлено и 6 удалено
  1. 7 6
      route/tool/func.py

+ 7 - 6
route/tool/func.py

@@ -971,24 +971,25 @@ def pw_encode(data, db_data_encode = ''):
 def pw_check(data, data2, type_d = 'no', id_d = ''):
     curs = conn.cursor()
 
+    curs.execute(db_change('select data from other where name = "encode"'))
+    db_data = curs.fetchall()
+    load_set_data = db_data[0][0] if db_data and db_data[0][0] != '' else 'sha3'
+    set_data = db_data[0][0] if db_data and db_data[0][0] != '' else 'sha3'
+    
     if type_d != 'no':
         if type_d == '':
             set_data = 'sha3'
         else:
             set_data = type_d
-    else:
-        curs.execute(db_change('select data from other where name = "encode"'))
-        db_data = curs.fetchall()
-        set_data = db_data[0][0] if db_data and db_data[0][0] != '' else 'sha3'
 
     re_data = 1 if pw_encode(data, set_data) == data2 else 0
-    if db_data[0][0] != set_data and re_data == 1 and id_d != '':
+    if load_set_data != set_data and re_data == 1 and id_d != '':
         curs.execute(db_change("update user_set set data = ? where id = ? and name = 'pw'"), [
             pw_encode(data), 
             id_d
         ])
         curs.execute(db_change("update user_set set data = ? where id = ? and name = 'encode'"), [
-            db_data[0][0], 
+            load_set_data, 
             id_d
         ])