diff --git a/main.cpp b/main.cpp
index f4ecab8..8132e82 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,6 +6,11 @@
 #include <string>
 #include <thread>
 #include <map>
+#include <mutex>
+#include <shared_mutex>
+#include <chrono>
+#include <future>
+#include<condition_variable>
 
 
 struct User {
@@ -15,49 +20,68 @@ struct User {
 };
 
 std::map<std::string, User> users;
-std::map<std::string, long> has_login;  // 换成 std::chrono::seconds 之类的
+std::map<std::string, std::chrono::steady_clock::time_point> has_login;  // 换成 std::chrono::seconds 之类的
+
+std::shared_mutex regist, login,query;
+// std::condition_variable_any query;
 
 // 作业要求1：把这些函数变成多线程安全的
 // 提示：能正确利用 shared_mutex 加分，用 lock_guard 系列加分
 std::string do_register(std::string username, std::string password, std::string school, std::string phone) {
     User user = {password, school, phone};
+    std::unique_lock<std::shared_mutex> lck(regist);
     if (users.emplace(username, user).second)
-        return "注册成功";
+        return "注册成功\n";
     else
-        return "用户名已被注册";
+        return "用户名已被注册\n";
 }
 
 std::string do_login(std::string username, std::string password) {
     // 作业要求2：把这个登录计时器改成基于 chrono 的
-    long now = time(NULL);   // C 语言当前时间
+    auto now = std::chrono::steady_clock::now();   
+    std::unique_lock<std::shared_mutex> lck(login);
     if (has_login.find(username) != has_login.end()) {
-        int sec = now - has_login.at(username);  // C 语言算时间差
-        return std::to_string(sec) + "秒内登录过";
+        auto tmp = now - has_login.at(username);
+        std::int64_t sec =  std::chrono::duration_cast<std::chrono::milliseconds>(tmp).count();
+        return  std::to_string(sec) + "ms内登陆过\n";
     }
     has_login[username] = now;
+    login.unlock();
 
     if (users.find(username) == users.end())
-        return "用户名错误";
+        return "用户名错误\n";
     if (users.at(username).password != password)
-        return "密码错误";
-    return "登录成功";
+        return "密码错误\n";
+    return "登录成功\n";
 }
 
 std::string do_queryuser(std::string username) {
-    auto &user = users.at(username);
     std::stringstream ss;
-    ss << "用户名: " << username << std::endl;
-    ss << "学校:" << user.school << std::endl;
-    ss << "电话: " << user.phone << std::endl;
-    return ss.str();
+    try{
+        std::shared_lock<std::shared_mutex> lck(query);
+        auto &user = users.at(username);
+        ss << "用户名: " << username << std::endl;
+        ss << "学校:" << user.school << std::endl;
+        ss << "电话: " << user.phone << std::endl;
+        return ss.str();
+    } catch (std::exception &error){
+        ss << "用户名未注册!\n";
+        return ss.str();
+    }
 }
 
 
 struct ThreadPool {
+    std::vector<std::future<void>> Vfut;
     void create(std::function<void()> start) {
         // 作业要求3：如何让这个线程保持在后台执行不要退出？
         // 提示：改成 async 和 future 且用法正确也可以加分
-        std::thread thr(start);
+        // std::thread thr(start);
+        std::future<void> fut = std::async(start);
+        Vfut.push_back(std::move(fut));
+    }
+    ~ThreadPool(){
+        for(auto &u:Vfut) u.get();
     }
 };
 
@@ -72,7 +96,7 @@ std::string phone[] = {"110", "119", "120", "12315"};
 }
 
 int main() {
-    for (int i = 0; i < 262144; i++) {
+    for (int i = 0; i < 114514; i++) {
         tpool.create([&] {
             std::cout << do_register(test::username[rand() % 4], test::password[rand() % 4], test::school[rand() % 4], test::phone[rand() % 4]) << std::endl;
         });
@@ -86,4 +110,4 @@ int main() {
 
     // 作业要求4：等待 tpool 中所有线程都结束后再退出
     return 0;
-}
+}
\ No newline at end of file