From 1a927fa6b6a1332b38ec3f711fde002f6ec0641d Mon Sep 17 00:00:00 2001
From: wangky <m1561510467@163.com>
Date: 星期三, 06 十一月 2024 15:02:29 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Server/王琨元/code/ConnectionPool.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git "a/Server/\347\216\213\347\220\250\345\205\203/code/ConnectionPool.cpp" "b/Server/\347\216\213\347\220\250\345\205\203/code/ConnectionPool.cpp"
index 548d07f..ce7acb2 100644
--- "a/Server/\347\216\213\347\220\250\345\205\203/code/ConnectionPool.cpp"
+++ "b/Server/\347\216\213\347\220\250\345\205\203/code/ConnectionPool.cpp"
@@ -1,3 +1,4 @@
+#include "stdafx.h"
#include "ConnectionPool.h"
#include <fstream>
@@ -30,7 +31,7 @@
bool ConnectionPool::parseJsonFile() {
- std::ifstream ifs("dbconf.json");
+ /*std::ifstream ifs("dbconf.json");
Reader rd;
Value root;
rd.parse(ifs, root);
@@ -45,7 +46,7 @@
max_del_time = root["maxDleTime"].asInt();
m_timeout = root["timeout"].asInt();
return true;
- }
+ }*/
return false;
}
--
Gitblit v1.8.0