2022.02.22 数据库注册支持密码加密

@@ -4,6 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 import datetime
 import datetime
 from ..models import Database,db,Table,Columns,TableVacuate,DES
 from ..models import Database,db,Table,Columns,TableVacuate,DES
+from app.models import AESHelper
 
 
 import uuid
 import uuid
 from . import database_test
 from . import database_test
@@ -31,7 +32,9 @@ class Api(ApiTemplate):
             database = self.para.get("database")
             database = self.para.get("database")
             encryption = int(self.para.get("encryption","0"))
             encryption = int(self.para.get("encryption","0"))
             if encryption:
             if encryption:
-                passwd = DES.decode(passwd)
+                # passwd = DES.decode(passwd)
+                passwd = AESHelper.decode(passwd)
+
 
 
             sqlalchemy_uri = "postgresql://{}:{}@{}:{}/{}".format(user,passwd,host,port,database)
             sqlalchemy_uri = "postgresql://{}:{}@{}:{}/{}".format(user,passwd,host,port,database)
             connectsrt = "hostaddr={} port={} dbname='{}' user='{}' password='{}'".format(host,port,database,user,passwd)
             connectsrt = "hostaddr={} port={} dbname='{}' user='{}' password='{}'".format(host,port,database,user,passwd)
@@ -309,6 +312,9 @@ class Api(ApiTemplate):
         {"name": "alias",
         {"name": "alias",
          "in": "formData",
          "in": "formData",
          "type": "string","description":"数据库别名","required": "true"},
          "type": "string","description":"数据库别名","required": "true"},
+        {"name": "encryption",
+         "in": "formData",
+         "type": "int", "description": "密码是否加密", "enum": [0, 1]}
     ],
     ],
     "responses":{
     "responses":{
         200:{
         200:{

@@ -7,7 +7,7 @@ from contextlib import closing
 from sqlalchemy import create_engine
 from sqlalchemy import create_engine
 
 
 from ..models import Database,db,DES
 from ..models import Database,db,DES
-
+from app.models import AESHelper
 
 
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm import sessionmaker
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
@@ -27,7 +27,8 @@ class Api(ApiTemplate):
 
 
             encryption = int(self.para.get("encryption", "0"))
             encryption = int(self.para.get("encryption", "0"))
             if encryption:
             if encryption:
-                passwd = DES.decode(passwd)
+                #passwd = DES.decode(passwd)
+                passwd = AESHelper.decode(passwd)
 
 
             sqlalchemy_uri = "postgresql://{}:{}@{}:{}/{}".format(user,passwd,host,port,database)
             sqlalchemy_uri = "postgresql://{}:{}@{}:{}/{}".format(user,passwd,host,port,database)