调整 log.h 位置

hikyuu_cpp/hikyuu/DataType.h

@@ -29,7 +29,7 @@
 #include <map>
 #include <unordered_map>
 
-#include "Log.h"
+#include "utilities/Log.h"
 #include "utilities/osdef.h"
 #include "utilities/cppdef.h"
 #include "utilities/datetime/Datetime.h"

hikyuu_cpp/hikyuu/GlobalInitializer.cpp

@@ -20,7 +20,7 @@
 #include <H5public.h>
 #endif
 
-#include "Log.h"
+#include "utilities/Log.h"
 #include "hikyuu.h"
 #include "GlobalInitializer.h"
 #include "StockManager.h"

hikyuu_cpp/hikyuu/analysis/combinate.h

@@ -10,7 +10,7 @@
 #include "hikyuu/indicator/Indicator.h"
 #include "hikyuu/trade_sys/system/System.h"
 #include "hikyuu/trade_manage/Performance.h"
-#include "../Log.h"
+#include "hikyuu/utilities/Log.h"
 
 namespace hku {
 

hikyuu_cpp/hikyuu/data_driver/base_info/mysql/MySQLBaseInfoDriver.cpp

@@ -9,8 +9,8 @@
 #include <boost/algorithm/string.hpp>
 #include "MySQLBaseInfoDriver.h"
 
+#include "hikyuu/utilities/Log.h"
 #include "../../../StockManager.h"
-#include "../../../Log.h"
 #include "../table/MarketInfoTable.h"
 #include "../table/StockTypeInfoTable.h"
 #include "../table/StockWeightTable.h"
@@ -281,12 +281,9 @@ Parameter MySQLBaseInfoDriver::getFinanceInfo(const string &market, const string
         << "f.zhuyinglirun, f.yingshouzhangkuan, f.yingyelirun, f.touzishouyu,"
         << "f.jingyingxianjinliu, f.zongxianjinliu, f.cunhuo, f.lirunzonghe,"
         << "f.shuihoulirun, f.jinglirun, f.weifenpeilirun, f.meigujingzichan,"
-        << "f.baoliu2 from stkfinance f, stock s, market m "
-        << "where m.market='" << market << "'"
-        << " and s.code = '" << code << "'"
-        << " and s.marketid = m.marketid"
-        << " and f.stockid = s.stockid"
-        << " order by updated_date DESC limit 1";
+        << "f.baoliu2 from stkfinance f, stock s, market m " << "where m.market='" << market << "'"
+        << " and s.code = '" << code << "'" << " and s.marketid = m.marketid"
+        << " and f.stockid = s.stockid" << " order by updated_date DESC limit 1";
 
     auto con = m_pool->getConnect();
 

hikyuu_cpp/hikyuu/data_driver/kdata/cvs/KDataTempCsvDriver.cpp

@@ -8,10 +8,9 @@
 #include <fstream>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
+#include "hikyuu/utilities/Log.h"
 #include "KDataTempCsvDriver.h"
 
-#include "../../../Log.h"
-
 namespace hku {
 
 KDataTempCsvDriver::~KDataTempCsvDriver() {}

hikyuu_cpp/hikyuu/data_driver/kdata/mysql/MySQLKDataDriver.cpp

@@ -6,7 +6,7 @@
  */
 
 #include <boost/lexical_cast.hpp>
-#include "../../../Log.h"
+#include "hikyuu/utilities/Log.h"
 #include "MySQLKDataDriver.h"
 #include "KRecordTable.h"
 

hikyuu_cpp/hikyuu/global/GlobalTaskGroup.cpp

@@ -8,8 +8,8 @@
  */
 
 #include "hikyuu/GlobalInitializer.h"
+#include "hikyuu/utilities/Log.h"
 #include "GlobalTaskGroup.h"
-#include "../Log.h"
 
 namespace hku {
 

hikyuu_cpp/hikyuu/global/node/NodeError.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "hikyuu/exception.h"
+#include "hikyuu/utilities/exception.h"
 
 namespace hku {
 

hikyuu_cpp/hikyuu/global/schedule/scheduler.cpp

@@ -5,10 +5,10 @@
  *     Author: fasiondog
  */
 
-#include <hikyuu/GlobalInitializer.h>
+#include "hikyuu/GlobalInitializer.h"
+#include "hikyuu/utilities/Log.h"
 #include <mutex>
 #include "scheduler.h"
-#include "../../Log.h"
 
 namespace hku {
 

hikyuu_cpp/hikyuu/indicator/IndicatorImp.cpp

@@ -7,10 +7,10 @@
 #include <stdexcept>
 #include <algorithm>
 #include <forward_list>
+#include "hikyuu/utilities/Log.h"
 #include "Indicator.h"
 #include "IndParam.h"
 #include "../Stock.h"
-#include "../Log.h"
 #include "../GlobalInitializer.h"
 #include "imp/ICval.h"
 

hikyuu_cpp/hikyuu/trade_manage/imp/FixedATradeCost.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "FixedATradeCost.h"
+#include "hikyuu/utilities/Log.h"
 #include "../../StockTypeInfo.h"
-#include "../../Log.h"
 
 #if HKU_SUPPORT_SERIALIZATION
 BOOST_CLASS_EXPORT(hku::FixedATradeCost)

hikyuu_cpp/hikyuu/utilities/Log.cpp

@@ -6,9 +6,9 @@
  */
 
 #include <thread>
-#include "config.h"
-#include "utilities/os.h"
-#include "GlobalInitializer.h"
+#include "hikyuu/config.h"
+#include "hikyuu/GlobalInitializer.h"
+#include "os.h"
 #include "Log.h"
 
 #if USE_SPDLOG_LOGGER

hikyuu_cpp/hikyuu/utilities/Log.h

@@ -13,7 +13,7 @@
 #define NOMINMAX
 #endif
 
-#include "config.h"
+#include "../config.h"
 #include "exception.h"
 
 // clang-format off

hikyuu_cpp/hikyuu/utilities/Parameter.cpp

@@ -6,8 +6,8 @@
  */
 
 #include <boost/algorithm/string.hpp>
+#include "hikyuu/utilities/Log.h"
 #include "hikyuu/Block.h"
-#include "../Log.h"
 #include "Parameter.h"
 
 namespace hku {

hikyuu_cpp/hikyuu/utilities/TimerManager.h

@@ -11,7 +11,7 @@
 #include <unordered_map>
 #include <functional>
 #include "hikyuu/utilities/datetime/Datetime.h"
-#include "hikyuu/Log.h"
+#include "hikyuu/utilities/Log.h"
 #include "thread/ThreadPool.h"
 #include "cppdef.h"
 

hikyuu_cpp/hikyuu/utilities/datetime/Datetime.cpp

@@ -11,7 +11,7 @@
 
 #include <fmt/format.h>
 #include "hikyuu/utilities/Null.h"
-#include "hikyuu/Log.h"
+#include "hikyuu/utilities/Log.h"
 #include "hikyuu/utilities/arithmetic.h"
 #include "Datetime.h"
 

hikyuu_cpp/hikyuu/utilities/datetime/TimeDelta.cpp

@@ -10,7 +10,7 @@
 #include <cstdint>
 #include "TimeDelta.h"
 #include "hikyuu/utilities/arithmetic.h"
-#include "hikyuu/Log.h"
+#include "hikyuu/utilities/Log.h"
 
 namespace hku {
 

hikyuu_cpp/hikyuu/utilities/db_connect/DBCondition.h

@@ -13,7 +13,7 @@
 #include <vector>
 #include <fmt/format.h>
 #include <fmt/ranges.h>
-#include "../../Log.h"
+#include "hikyuu/utilities/Log.h"
 
 #ifndef HKU_API
 #define HKU_API

hikyuu_cpp/hikyuu/utilities/db_connect/SQLException.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <fmt/format.h>
-#include "hikyuu/exception.h"
+#include "hikyuu/utilities/exception.h"
 
 namespace hku {
 

hikyuu_cpp/hikyuu/utilities/db_connect/SQLResultSet.h

@@ -9,7 +9,7 @@
 
 #include <iterator>
 #include "hikyuu/utilities/arithmetic.h"
-#include "hikyuu/Log.h"
+#include "hikyuu/utilities/Log.h"
 #include "hikyuu/utilities/osdef.h"
 #include "DBConnectBase.h"
 

hikyuu_cpp/hikyuu/utilities/db_connect/sqlite/SQLiteConnect.cpp

@@ -9,7 +9,7 @@
 
 #include <thread>
 #include "../../../config.h"
-#include "../../../Log.h"
+#include "hikyuu/utilities/Log.h"
 #include "SQLiteConnect.h"
 #include "SQLiteStatement.h"
 

hikyuu_cpp/hikyuu/utilities/os.cpp

@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include "arithmetic.h"
-#include "hikyuu/Log.h"
+#include "Log.h"
 #include "os.h"
 
 #ifdef _MSC_VER

hikyuu_cpp/unit_test/hikyuu/hikyuu/test_Block.cpp

@@ -7,7 +7,7 @@
 
 #include "doctest/doctest.h"
 #include <iostream>
-#include <hikyuu/Log.h>
+#include "hikyuu/utilities/Log.h"
 #include <hikyuu/Block.h>
 #include <hikyuu/StockManager.h>
 

hikyuu_cpp/unit_test/hikyuu/hikyuu/test_StockManager.cpp

@@ -8,7 +8,7 @@
 #include "doctest/doctest.h"
 #include <hikyuu/StockManager.h>
 #include <hikyuu/utilities/runtimeinfo.h>
-#include <hikyuu/Log.h>
+#include <hikyuu/utilities/Log.h>
 
 using namespace hku;
 

hikyuu_cpp/unit_test/hikyuu/utilities/datetime/test_Datetime.cpp

@@ -9,7 +9,7 @@
 
 #include <hikyuu/utilities/datetime/Datetime.h>
 #include <hikyuu/utilities/Null.h>
-#include <hikyuu/Log.h>
+#include "hikyuu/utilities/Log.h"
 
 using namespace hku;
 

hikyuu_cpp/unit_test/hikyuu/utilities/db_connect/test_DBCondition.cpp

@@ -7,7 +7,7 @@
 
 #include "doctest/doctest.h"
 #include <hikyuu/utilities/db_connect/DBCondition.h>
-#include <hikyuu/Log.h>
+#include "hikyuu/utilities/Log.h"
 #include <fmt/ranges.h>
 
 using namespace hku;

hikyuu_cpp/unit_test/hikyuu/utilities/test_Parameter.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "doctest/doctest.h"
-#include <hikyuu/Log.h>
+#include "hikyuu/utilities/Log.h"
 #include <hikyuu/utilities/Parameter.h>
 #include <hikyuu/StockManager.h>
 

hikyuu_cpp/unit_test/hikyuu/utilities/test_TimerManager.cpp

@@ -7,7 +7,7 @@
 
 #include "doctest/doctest.h"
 #include <hikyuu/utilities/TimerManager.h>
-#include <hikyuu/Log.h>
+#include "hikyuu/utilities/Log.h"
 
 using namespace hku;
 

hikyuu_cpp/unit_test/hikyuu/utilities/test_arithmetic.cpp

@@ -7,7 +7,7 @@
 
 #include "doctest/doctest.h"
 #include <hikyuu/utilities/arithmetic.h>
-#include <hikyuu/Log.h>
+#include "hikyuu/utilities/Log.h"
 
 using namespace hku;
 

hikyuu_cpp/unit_test/hikyuu/utilities/test_os.cpp

@@ -7,7 +7,7 @@
  */
 
 #include <doctest/doctest.h>
-#include <hikyuu/Log.h>
+#include "hikyuu/utilities/Log.h"
 #include <hikyuu/utilities/os.h>
 
 using namespace hku;

hikyuu_cpp/unit_test/hikyuu/utilities/thread/test_ThreadPool.cpp

@@ -13,7 +13,7 @@
 #include <hikyuu/utilities/thread/MQThreadPool.h>
 #include <hikyuu/utilities/thread/MQStealThreadPool.h>
 #include <hikyuu/utilities/SpendTimer.h>
-#include <hikyuu/Log.h>
+#include "hikyuu/utilities/Log.h"
 
 using namespace hku;
 

hikyuu_pywrap/_Log.cpp

@@ -5,7 +5,7 @@
  *      Author: fasiondog
  */
 
-#include <hikyuu/Log.h>
+#include "hikyuu/utilities/Log.h"
 #include "pybind_utils.h"
 
 using namespace hku;