From fc26a2fb4ed499acdd89403a86dcda9cbee992f9 Mon Sep 17 00:00:00 2001
From: Zhaohe <h_zhaohe@163.com>
Date: Fri, 9 Dec 2022 19:35:27 +0800
Subject: [PATCH] update submodule and add vscode project setting

---
 .gitmodules                   |  5 ++++-
 .vscode/c_cpp_properties.json | 13 +++++++++++++
 .vscode/settings.json         |  7 ++++++-
 CMakeLists.txt                |  3 ++-
 dep/asio1.12.2                |  1 +
 dep/zwebservice               |  2 +-
 6 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 .vscode/c_cpp_properties.json
 create mode 160000 dep/asio1.12.2

diff --git a/.gitmodules b/.gitmodules
index 792df47..b78b438 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,4 +15,7 @@
 	url = http://47.92.195.73/zlinux_demo_projects/zservice_container.git
 [submodule "dep/websocketpp"]
 	path = dep/websocketpp
-	url = http://47.92.195.73/zlinux_demo_projects/websocketpp.git
\ No newline at end of file
+	url = http://47.92.195.73/zlinux_demo_projects/websocketpp.git
+[submodule "dep/asio1.12.2"]
+	path = dep/asio1.12.2
+	url = http://47.92.195.73/zlinux_demo_projects/asio1.12.2.git
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000..9c7abbd
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,13 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "compilerPath": "/usr/bin/g++",
+            "cStandard": "gnu11",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "linux-gcc-x64",
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json"
+        }
+    ],
+    "version": 4
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ad5dab0..14eeae0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -91,6 +91,11 @@
         "syncstream": "cpp",
         "variant": "cpp",
         "__nullptr": "cpp",
-        "__config": "cpp"
+        "__config": "cpp",
+        "__functional_base": "cpp",
+        "__functional_base_03": "cpp",
+        "__hash_table": "cpp",
+        "__tree": "cpp",
+        "__tuple": "cpp"
     }
 }
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6654b84..31bf96e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,8 @@ message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
 
 set(DEP_INCLUDE ${DEP_INCLUDE} ./dep/)
 include(dep/iflytopcpp/module.cmake)
-include(dep/websocketcpp/module.cmake)
+include(dep/asio1.12.2/module.cmake)
+include(dep/websocketpp/module.cmake)
 include(dep/zservice_container/module.cmake)
 include(dep/zwebservice/module.cmake)
 
diff --git a/dep/asio1.12.2 b/dep/asio1.12.2
new file mode 160000
index 0000000..8dec127
--- /dev/null
+++ b/dep/asio1.12.2
@@ -0,0 +1 @@
+Subproject commit 8dec127c936fa7d944e9fa090cfd7a7d60fd0151
diff --git a/dep/zwebservice b/dep/zwebservice
index b6a7215..f4468c3 160000
--- a/dep/zwebservice
+++ b/dep/zwebservice
@@ -1 +1 @@
-Subproject commit b6a7215051c525f1dac7b7dca7e9b083f8420750
+Subproject commit f4468c3342826fbe6fb693bfc2eb4b1fba12810c