合并冲突

db/db_api/CDBCommon.h

@@ -71,10 +71,7 @@ namespace YADB
 			TimeOut = 0;
 		}
 	};
-	/**
-	 * @brief 数据库日志输入
-	 */
-	 typedef void ( * DbLogOut)(const char * log,int level);
+
 	/**
 	* @brief
 	数据库连接池设置结构体
@@ -82,11 +79,9 @@ namespace YADB
 	struct _DB_POOL_SETTING_ : public _DB_CONN_SETTING_
 	{
 		int PoolSize;//连接池大小
-        DbLogOut m_logout;
 		_DB_POOL_SETTING_()
 		{
 			PoolSize = 0;
-            m_logout= nullptr;
 		}
 	};
 

db/db_api/CDBConnPool.cpp

@@ -97,7 +97,7 @@ namespace YADB
 		//停止异步执行线程
 		__StopAsyncThrd();
 
-		//步执行线程连接
+		//??????????步执行线程连接
 		__DestroyAsyncThrdConn();
 
 		//把所有列表中的连接对象都关闭删除并清除列表

db/db_tool.cpp

@@ -68,15 +68,5 @@ namespace db_tool
 
         PushAsync(sql);
     }
-
-    void DBLog(const char * log,int level)
-    {
-        if(log == nullptr || strlen(log) < 5)
-        {
-            return ;
-        }
-        log_errno(log);
-        //printf("%s \n ",log);
-    }
 }
 

db/db_tool.h

@@ -10,8 +10,6 @@ namespace db_tool
     void PushAsync(const char* sql);
     void save_attendance(const std::shared_ptr<card_location_base>& card_ptr,
                                         const std::shared_ptr<area_hover>& area_hover_ptr);
-
-    void DBLog(const char * log,int level);
 }
 
 #endif

main.cpp

@@ -48,7 +48,6 @@ struct Init_Setting
         DBSetting.CharSet = config.get("db.charset","utf8");
         DBSetting.TimeOut = config.get("db.conn_timeout",5);
         DBSetting.PoolSize = config.get("db.pool_size",30);
-        DBSetting.m_logout = &db_tool::DBLog;
         if(!_mysql_init(DBSetting))
 		  exit(0);