lesscode-py 0.2.92__tar.gz → 0.2.94__tar.gz

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.1
 Name: lesscode-py
-Version: 0.2.92
+Version: 0.2.94
 Summary: lesscode-python 是基于tornado的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://gitee.com/yongchao9/lesscode-python
 Author: Chao.yy
 Author-email: yuyc@ishangqi.com
-License: UNKNOWN
 Platform: python
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
@@ -208,5 +207,3 @@ Description-Content-Type: text/markdown
 4.  API 接口文档生成
 5.  注册中心集成
 6.  ......
-
-

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode/db/ds_helper.py

@@ -22,26 +22,27 @@ class DSHelper(BaseSqlHelper):
         初始化sql工具
         :param pool_name: 连接池名称
         """
-        self.pool, self.dialect = options.database[pool_name]
-        if self.dialect == "postgresql":
+        self.pool, self.conn_info = options.database[pool_name]
+        clazz = None
+        if self.conn_info.dialect == "postgresql":
             # self.db_helper = PostgresqlHelper(self.pool)
             clazz = getattr(__import__("lesscode.db.postgresql.postgresql_helper", fromlist="PostgresqlHelper"),
                             "PostgresqlHelper")
-        elif self.dialect == "mysql":
+        elif self.conn_info.dialect == "mysql":
             # self.db_helper = MysqlHelper(self.pool)
             clazz = getattr(__import__("lesscode.db.mysql.mysql_helper", fromlist="MysqlHelper"), "MysqlHelper")
             # 执行用例
             self.db_helper = clazz(self.pool)
-        elif self.dialect == "mongodb":
+        elif self.conn_info.dialect == "mongodb":
             clazz = getattr(__import__("lesscode.db.mongodb.mongodb_helper", fromlist="MongodbHelper"), "MongodbHelper")
             # self.db_helper = MongodbHelper(self.pool)
-        elif self.dialect == "elasticsearch":
+        elif self.conn_info.dialect == "elasticsearch":
             clazz = getattr(
                 __import__("lesscode.db.elasticsearch.elasticsearch_helper", fromlist="ElasticsearchHelper"),
                 "ElasticsearchHelper")
-        elif self.dialect == "esapi":
+        elif self.conn_info.dialect == "esapi":
             clazz = getattr(__import__("lesscode.db.es.es_helper", fromlist="EsHelper"), "EsHelper")
-        elif self.dialect == "redis":
+        elif self.conn_info.dialect == "redis":
             clazz = getattr(
                 __import__("lesscode.db.redis.redis_helper", fromlist="RedisHelper"),
                 "RedisHelper")

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode/db/es/es_helper.py

@@ -33,7 +33,7 @@ class EsHelper:
         :param pool: 连接池名称
         """
         if isinstance(pool, str):
-            self.pool, self.dialect = options.database[pool]
+            self.pool, self.conn_info = options.database[pool]
         else:
             self.pool = pool
 

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode/db/init_connection_pool.py

@@ -79,7 +79,7 @@ class InitConnectionPool:
                         # 执行用例
                         pool = clazz(conn_info).sync_create_pool()
                     if pool:
-                        options.database[conn_info.name] = (pool, conn_info.dialect)
+                        options.database[conn_info.name] = (pool, conn_info)
 
     @staticmethod
     def sync_create_pool():
@@ -142,7 +142,7 @@ class InitConnectionPool:
                         # 执行用例
                         pool = clazz(conn_info).sync_create_pool()
                     if pool:
-                        options.database[conn_info.name] = (pool, conn_info.dialect)
+                        options.database[conn_info.name] = (pool, conn_info)
 
     @staticmethod
     def getClass(name, fromlist):

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode/db/neo4j/neo4j_helper.py

@@ -26,7 +26,7 @@ class Neo4jHelper:
         """
         if isinstance(pool, str):
 
-            self.pool, self.dialect = options.database[pool]
+            self.pool, self.conn_info = options.database[pool]
             self.pool = self.pool.session(database=pool, default_access_mode=access)
         else:
             self.pool = pool

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode/db/redis/redis_helper.py

@@ -16,7 +16,7 @@ class RedisHelper:
         :param pool: 连接池名称
         """
         if isinstance(pool, str):
-            self.pool, self.dialect = options.database[pool]
+            self.pool, self.conn_info = options.database[pool]
         else:
             self.pool = pool
 

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode/db/sqlalchemy/sqlalchemy_helper.py

@@ -14,7 +14,7 @@ class SqlAlchemyHelper:
         :param pool: 连接池名称
         """
         if isinstance(pool, str):
-            self.pool, self.dialect = options.database[pool]
+            self.pool, self.conn_info = options.database[pool]
         else:
             self.pool = pool
 

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode/utils/chart/common2chart.py

@@ -181,10 +181,15 @@ def list2table(title: str, head, data: list, column_keys: dict = None, index_dic
     return result
 
 
+def convert(value, func):
+    return func(value)
+
+
 def list2table_with_page(title: str, head, data: list, column_keys: dict = None, index_dict: dict = None,
-                         page_num: int = 1, page_size: int = 10, total: int = 0):
+                         page_num: int = 1, page_size: int = 10, total: int = 0, column_covert: dict = None):
     """
     list数据转换成表格
+    :param column_covert: {"id":str}
     :param total: 数据总数
     :param page_size: 每页数量
     :param page_num: 页码
@@ -215,7 +220,11 @@ def list2table_with_page(title: str, head, data: list, column_keys: dict = None,
             data_item = {
             }
             for key, value in column_keys.items():
-                data_item[key] = get_value_from_dict(item, value)
+                new_value = get_value_from_dict(item, value)
+                if column_covert:
+                    if key in column_covert:
+                        new_value = convert(new_value, column_covert.get(key))
+                data_item[key] = new_value
             result["dataSource"].append(data_item)
     else:
         result["dataSource"] = data

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode/utils/common.py

@@ -6,7 +6,7 @@ def get_value_from_dict(data: dict, key: str = None):
     if key:
         key_list = key.split(".")
         for k in key_list:
-            if isinstance(value, dict):
+            if not isinstance(value, dict):
                 break
             else:
                 value = value.get(k)

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode/version.py

@@ -8,4 +8,4 @@
 lesscode python version file.
 """
 
-__version__ = "0.2.92"
+__version__ = "0.2.94"

{lesscode-py-0.2.92 → lesscode-py-0.2.94}/lesscode_py.egg-info/PKG-INFO

@@ -1,11 +1,10 @@
 Metadata-Version: 2.1
 Name: lesscode-py
-Version: 0.2.92
+Version: 0.2.94
 Summary: lesscode-python 是基于tornado的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://gitee.com/yongchao9/lesscode-python
 Author: Chao.yy
 Author-email: yuyc@ishangqi.com
-License: UNKNOWN
 Platform: python
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
@@ -208,5 +207,3 @@ Description-Content-Type: text/markdown
 4.  API 接口文档生成
 5.  注册中心集成
 6.  ......
-
-