update

Author: stepbystepcode

mysql.cc

@@ -230,64 +230,58 @@ void sql_add(std::string username, std::string passwd, int avatar) {
 
 //     return result;
 // }
-Json::Value get_chat_info(std::string me){
+Json::Value get_chat_info(std::string me, std::string who_send_me="") {
   Json::Value json;
+
   try {
     sql::mysql::MySQL_Driver *driver;
     driver = sql::mysql::get_mysql_driver_instance();
     sql::Connection *con;
     con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
     con->setSchema("flypen");
 
-    std::string sql = "SELECT * FROM users WHERE username = ? LIMIT 1";
-    sql::PreparedStatement *prepStmt = con->prepareStatement(sql);
-    prepStmt->setString(1, me);
-    
-    sql::ResultSet *res = prepStmt->executeQuery();
-    if (res->next()) {
-      Json::Value user;
-      int avatar=res->getInt("avatar");
-      std::string friends=res->getString("friends");
-      std::string req=res->getString("req");
-      user["avatar"] = avatar;
-      user["friends"] = friends; 
-      user["req"] = req;
-      
-      json[me] = user;
+    if (!who_send_me.empty()) {
+      std::string sql = "SELECT * FROM users WHERE username = ? LIMIT 1";
+      sql::PreparedStatement *prepStmt = con->prepareStatement(sql);
+      prepStmt->setString(1, who_send_me);
+
+      sql::ResultSet *res = prepStmt->executeQuery();
+      if (res->next()) {
+        Json::Value user;
+        int avatar=res->getInt("avatar");
+        std::string friends=res->getString("friends");
+        std::string req=res->getString("req");
+        user["avatar"] = avatar;
+        user["friends"] = friends;
+        user["req"] = req;
+
+        json[who_send_me] = user; 
+      }
     }
-  } catch (sql::SQLException &e) {
-    std::cerr << "SQL Exception: " << e.what() << std::endl;
-  }
-  return json;
-}
-Json::Value get_chat_info(std::string me,std::string who_send_me){
-  Json::Value json;
-  try {
-    sql::mysql::MySQL_Driver *driver;
-    driver = sql::mysql::get_mysql_driver_instance();
-    sql::Connection *con;
-    con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
-    con->setSchema("flypen");
 
-    std::string sql = "SELECT * FROM users WHERE username = ? LIMIT 1";
-    sql::PreparedStatement *prepStmt = con->prepareStatement(sql);
-    prepStmt->setString(1, who_send_me);
-    
-    sql::ResultSet *res = prepStmt->executeQuery();
-    if (res->next()) {
-      Json::Value user;
-      int avatar=res->getInt("avatar");
-      std::string friends=res->getString("friends");
-      std::string req=res->getString("req");
-      user["avatar"] = avatar;
-      user["friends"] = friends; 
-      user["req"] = req;
-      
-      json[who_send_me] = user;
+    if (!me.empty()) {
+      std::string sql = "SELECT * FROM users WHERE username = ? LIMIT 1";
+      sql::PreparedStatement *prepStmt = con->prepareStatement(sql);
+      prepStmt->setString(1, me);
+
+      sql::ResultSet *res = prepStmt->executeQuery();
+      if (res->next()) {
+        Json::Value user;
+        int avatar=res->getInt("avatar");
+        std::string friends=res->getString("friends");
+        std::string req=res->getString("req");
+        user["avatar"] = avatar;
+        user["friends"] = friends;
+        user["req"] = req;
+
+        json[me] = user;
+      }
     }
+
   } catch (sql::SQLException &e) {
     std::cerr << "SQL Exception: " << e.what() << std::endl;
   }
+
   return json;
 }
 bool sql_check(std::string user, std::string passwd) {

mysql.h

@@ -12,6 +12,5 @@ void sql_addrequest(std::string send,std::string receiver);
 void sql_process_request(std::string ,std::string,std::string);
 Json::Value sql_find_my_msg(std::string,std::string);
 Json::Value get_chat_info(std::string,std::string);
-Json::Value get_chat_info(std::string);
 //bool sql_check(std::string );
 #endif