增加项目的各个功能

common/sqlSession.py

@@ -8,6 +8,7 @@ from const import sparkatp_sql_uri
 from logger import logger
 
 _ENGINE_CACHE = {}
+_SESSION_FACTORY_CACHE = {}
 
 
 """
@@ -32,27 +33,30 @@ class SqlSession:
         return f"postgresql+psycopg2://{user}:{urlquote(str(password))}@{host}:{port}/{database}"
 
     def get_session(self):
-        engine = _ENGINE_CACHE.get(self.sql_uri)
-        if engine is None:
-            engine = create_engine(
-                self.sql_uri,
-                pool_size=5,
-                max_overflow=10,
-                pool_pre_ping=True,
-                pool_recycle=1800,
-                pool_timeout=30,
-                connect_args={
-                    'connect_timeout': 20,
-                    'options': '-c timezone=Asia/Shanghai'
-                }
-            )
-            _ENGINE_CACHE[self.sql_uri] = engine
-        Session = sessionmaker(bind=engine)
-        session = Session()
-        return session
+        session_factory = _SESSION_FACTORY_CACHE.get(self.sql_uri)
+        if session_factory is None:
+            engine = _ENGINE_CACHE.get(self.sql_uri)
+            if engine is None:
+                engine = create_engine(
+                    self.sql_uri,
+                    pool_size=20,
+                    max_overflow=30,
+                    pool_pre_ping=True,
+                    pool_recycle=1200,
+                    pool_timeout=60,
+                    pool_use_lifo=True,
+                    connect_args={
+                        'connect_timeout': 10,
+                        'options': '-c timezone=Asia/Shanghai'
+                    }
+                )
+                _ENGINE_CACHE[self.sql_uri] = engine
+            session_factory = sessionmaker(bind=engine, autoflush=False, expire_on_commit=False)
+            _SESSION_FACTORY_CACHE[self.sql_uri] = session_factory
+        return session_factory()
 
-    def query(self, obj):
-        return self._session.query(obj)
+    def query(self, *args):
+        return self._session.query(*args)
 
     def add(self, added):
         self._session.add(added)
@@ -69,6 +73,9 @@ class SqlSession:
     def commit(self):
         self._session.commit()
 
+    def rollback(self):
+        self._session.rollback()
+
     def close(self):
         self._session.close()