R17.0.1 修复用户数据创建

Functions/DBUtils4PG_old.py

@@ -552,7 +552,7 @@ def changepassword(user,old,new):
                     database=databaseloginDB
                    )
         newdic={"密码":"'%s'"%new}
-        loginTabledb.upDateItem("loginTable",newdic,"登录名='%s' and 密码='%s'"%(user,old))
+        loginTabledb.upDateItem("logintable",newdic,"登录名='%s' and 密码='%s'"%(user,old))
         loginTabledb.close()
     except Exception:
         dingding_alert(traceback.format_exc())
@@ -5161,7 +5161,7 @@ def initAuthority(database:flightDB):
         dic = {}
         for key in labelKey:
             dic[key] = 'text not null'
-        fdb.initTable('loginTable', 'ID', primaryKey, dic)
+        fdb.initTable('logintable', 'ID', primaryKey, dic)
     except Exception:
         dingding_alert(traceback.format_exc())
 
@@ -5174,10 +5174,10 @@ def insertDataToAuthority(database:flightDB):
         dataDic['权限'] = '0'
         dataDic['使用人'] = '开发'
 
-        rest = database.queryTabel('loginTable', '*', "登录名='admin'")
+        rest = database.queryTabel('logintable', '*', "登录名='admin'")
         #print(rest)
         if len(rest) == 0:
-            database.insertData('loginTable', dataDic)
+            database.insertData('logintable', dataDic)
     except Exception:
         dingding_alert(traceback.format_exc())
 

Functions/DBUtils4PG_oldtry.py

@@ -307,7 +307,7 @@ def changepassword(user,old,new):
                     database=databaseloginDB
                    )
         newdic={"密码":"'%s'"%new}
-        loginTabledb.upDateItem("loginTable",newdic,"登录名='%s' and 密码='%s'"%(user,old))
+        loginTabledb.upDateItem("logintable",newdic,"登录名='%s' and 密码='%s'"%(user,old))
         loginTabledb.close()
     except Exception:
         dingding_alert(traceback.format_exc())
@@ -4835,7 +4835,7 @@ def initAuthority(database:flightDB):
         dic = {}
         for key in labelKey:
             dic[key] = 'text not null'
-        fdb.initTable('loginTable', 'ID', primaryKey, dic)
+        fdb.initTable('logintable', 'ID', primaryKey, dic)
     except Exception:
         dingding_alert(traceback.format_exc())
 
@@ -4848,10 +4848,10 @@ def insertDataToAuthority(database:flightDB):
         dataDic['权限'] = '0'
         dataDic['使用人'] = '开发'
 
-        rest = database.queryTabel('loginTable', '*', "登录名='admin'")
+        rest = database.queryTabel('logintable', '*', "登录名='admin'")
         #print(rest)
         if len(rest) == 0:
-            database.insertData('loginTable', dataDic)
+            database.insertData('logintable', dataDic)
     except Exception:
         dingding_alert(traceback.format_exc())
 

Functions/DButilsFunction/changepassword.py

@@ -4,7 +4,7 @@ from unitls.LogerinTxt import app_logger
 def changepassword(loginTabledb:flightDB,user,old,new):
     try:
         newdic={"密码":"'%s'"%new}
-        loginTabledb.upDateItem("loginTable",newdic,"登录名='%s' and 密码='%s'"%(user,old))
+        loginTabledb.upDateItem("logintable",newdic,"登录名='%s' and 密码='%s'"%(user,old))
         loginTabledb.close()
     except Exception as e:
         app_logger.log_error(e)

Functions/DButilsFunction/flightDB.py

@@ -69,10 +69,12 @@ class flightDB():
 
             if args==():
                 self.conn.commit()
+            return "ok"
         except Exception as e:
             app_logger.log_error(curStr)
             app_logger.log_error(e)
             print(traceback.format_exc())
+            return "fail"
 
     def lazyInsertData(self,tableName:str, data:dict):
         self.insertData(tableName, data, 'lazy')

Functions/DisplayQTMain.py

@@ -1759,7 +1759,7 @@ class LoginWidget(Ui_login, QWidget):
             username = self.lineEditUser.text()
             password = self.lineEditPassword.text()
             try:
-                res = self.severpost_meassge("loginTable", "/%s" % username, "/%s" % password)["返回值"]
+                res = self.severpost_meassge("logintable", "/%s" % username, "/%s" % password)["返回值"]
                 # print(res)
             except Exception:
                 res = ""

Functions/QTMain.py

@@ -4270,7 +4270,7 @@ class LoginWidget(Ui_login, QWidget):
             username = self.lineEditUser.text()
             password = self.lineEditPassword.text()
             try:
-                res = self.severpost_meassge("loginTable", "/%s" % username, "/%s" % password)["返回值"]
+                res = self.severpost_meassge("logintable", "/%s" % username, "/%s" % password)["返回值"]
                 # print(res)
             except Exception:
                 res = ""
@@ -4808,7 +4808,7 @@ class changePassword(Ui_FormChangePssword, QWidget):
             newpassword = self.lineEditnew.text()
             newpassword2 = self.lineEditnew2.text()
 
-            res = self.severpost_meassge("loginTable", "/%s" % self.user, "/%s" % oldpassword)["返回值"]
+            res = self.severpost_meassge("logintable", "/%s" % self.user, "/%s" % oldpassword)["返回值"]
             # print(res)
             if res != "":
                 if newpassword == newpassword2:

Functions/QTMain_old.py

@@ -4323,7 +4323,7 @@ class LoginWidget(Ui_login, QWidget):
             username = self.lineEditUser.text()
             password = self.lineEditPassword.text()
             try:
-                res = self.severpost_meassge("loginTable", "/%s" % username, "/%s" % password)["返回值"]
+                res = self.severpost_meassge("logintable", "/%s" % username, "/%s" % password)["返回值"]
                 # print(res)
             except Exception:
                 res = ""
@@ -4861,7 +4861,7 @@ class changePassword(Ui_FormChangePssword, QWidget):
             newpassword = self.lineEditnew.text()
             newpassword2 = self.lineEditnew2.text()
 
-            res = self.severpost_meassge("loginTable", "/%s" % self.user, "/%s" % oldpassword)["返回值"]
+            res = self.severpost_meassge("logintable", "/%s" % self.user, "/%s" % oldpassword)["返回值"]
             # print(res)
             if res != "":
                 if newpassword == newpassword2:

SeverStart.py

@@ -887,7 +887,7 @@ def loginTable(username,password):
     loginTabledb = flightDB(host=dbhost,port=dbport,user=dbuser,password=dbpassword,database=databaseLoginDB)
     #t2 = datetime.datetime.now()
     #print(f'登录时间:{t2 - t1}')
-    res=loginTabledb.queryTabel('loginTable', '*', "登录名='{}' and 密码='{}'".format(username,password))
+    res=loginTabledb.queryTabel('logintable', '*', "登录名='{}' and 密码='{}'".format(username,password))
     loginTabledb.close()
     if res !=[]:
         res1["返回值"]=res[0]
@@ -901,7 +901,7 @@ def authorityCheck(username):
     remote_addr = request.remote_addr
     res1={"返回值":""}
     loginTabledb = flightDB(host=dbhost,port=dbport,user=dbuser,password=dbpassword,database=databaseLoginDB)
-    res=loginTabledb.queryTabel('loginTable', '*', "登录名='{}'".format(username))
+    res=loginTabledb.queryTabel('logintable', '*', "登录名='{}'".format(username))
     loginTabledb.close()
     if res !=[]:
         res1["返回值"]=res[0]
@@ -913,7 +913,7 @@ def loginDbget(username):
     remote_addr = request.remote_addr
     res1= {}
     loginTabledb = flightDB(host=dbhost,port=dbport,user=dbuser,password=dbpassword,database=databaseLoginDB)
-    res=loginTabledb.getAlldata('loginTable')
+    res=loginTabledb.getAlldata('logintable')
     loginTabledb.close()
     if res !=[] and username in str(res):
         for i in res:
@@ -942,10 +942,13 @@ def addUserWidget():
     res1={"返回值":""}
     data = json.loads(request.get_data())
     loginTabledb = flightDB(host=dbhost,port=dbport,user=dbuser,password=dbpassword,database=databaseLoginDB)
-    res=loginTabledb.queryTabel('loginTable', '*', "登录名='%s'"%data["登录名"])
-    if res == []:
-        loginTabledb.insertData('loginTable', data)
-        res1["返回值"]="1"
+    res=loginTabledb.queryTabel('logintable', '*', "登录名='%s'"%data["登录名"])
+    if res:
+        res=loginTabledb.insertData('logintable', data)
+        if res == "ok":
+            res1["返回值"] = "1"
+        else:
+            res1["返回值"] = "0"
     else:
         res1["返回值"] = "2"
     loginTabledb.close()
@@ -958,9 +961,9 @@ def changeAuth():
     res1={"返回值":""}
     data = json.loads(request.get_data())
     loginTabledb = flightDB(host=dbhost,port=dbport,user=dbuser,password=dbpassword,database=databaseLoginDB)
-    res=loginTabledb.queryTabel('loginTable', '*', "登录名='%s'"%str(data["登录名"]).replace("'",""))
+    res=loginTabledb.queryTabel('logintable', '*', "登录名='%s'"%str(data["登录名"]).replace("'",""))
     if res != []:
-        loginTabledb.upDateItem('loginTable',data,"登录名='%s'"%str(data["登录名"]).replace("'",""))
+        loginTabledb.upDateItem('logintable',data,"登录名='%s'"%str(data["登录名"]).replace("'",""))
         res1["返回值"]="1"
     else:
         res1["返回值"] = "2"