Merge pull request #26 from zzc20001/main

shrink

Author: stepbystepcode

jwt_controller.cc

@@ -35,7 +35,7 @@ std::string jwtDecrypt(const std::string& token)
     }
 }
 
-bool jwtVerify(const std::__1::shared_ptr<drogon::HttpRequest> &req){
+bool jwtVerify(const drogon::HttpRequestPtr &req){
     std::string authHeader = req->getHeader("Authorization");
     if (authHeader.substr(0, 7) == "Bearer ") {
         std::string bearerToken = authHeader.substr(7);

jwt_controller.h

@@ -7,6 +7,6 @@
 
 std::string jwtGen(const Json::Value& req_json);
 std::string jwtDecrypt(const std::string& token);
-bool jwtVerify(const std::__1::shared_ptr<drogon::HttpRequest> &req);
+bool jwtVerify(const drogon::HttpRequestPtr &req);
 
 #endif

mysql.cc

@@ -3,75 +3,60 @@
 #include "jdbc/mysql_connection.h"
 #include "jdbc/mysql_driver.h"
 #include "json/json.h"
-//relate to chat
-void sql_delete_operation(std::string sender, std::string receiver)
-{
-    std::vector<std::string> usernamelist;
-    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 readdata = "SELECT friends FROM users WHERE username = ?";
-    std::string Sfriendlist, Rfriendlist;
-    std::string changedata = "UPDATE users SET friends=? WHERE username =?";
-    sql::PreparedStatement *readdatament = con->prepareStatement(readdata);
-    readdatament->setString(1, sender);
-    sql::ResultSet *SresultSet = readdatament->executeQuery();
-    if (SresultSet->next())
+// relate to chat
+void process(sql::PreparedStatement *readdatament ,std::vector<std::string> s,sql::Connection *con){
+    for(int i=0;i<2;i++){
+    readdatament->setString(1, s[i]);
+    sql::ResultSet *resultSet = readdatament->executeQuery();
+    std::string friendlist;
+    if (resultSet->next())
     {
-        Sfriendlist = SresultSet->getString("friends");
+        friendlist = resultSet->getString("friends");
     }
-    int pos = Sfriendlist.find(receiver);
+    int pos = friendlist.find(s[i+1]);
     if (pos != std::string::npos && pos != 0)
-        Sfriendlist.erase(pos - 1, receiver.length() + 1);
+        friendlist.erase(pos - 1, s[i+1].length() + 1);
     else if (pos == 0)
-        Sfriendlist.erase(pos, receiver.length() + 1);
-    std::cout << Sfriendlist << "\n";
+        friendlist.erase(pos, s[i+1].length() + 1);
+    std::string changedata = "UPDATE users SET friends=? WHERE username =?";
     sql::PreparedStatement *updateStatement = con->prepareStatement(changedata);
-    updateStatement->setString(1, Sfriendlist);
-    updateStatement->setString(2, sender);
+    updateStatement->setString(1, friendlist);
+    updateStatement->setString(2, s[i]);
     updateStatement->execute();
-    readdatament->setString(1, receiver);
-    sql::ResultSet *RresultSet = readdatament->executeQuery();
-    if (RresultSet->next())
-    {
-        Rfriendlist = RresultSet->getString("friends");
     }
-    pos = Rfriendlist.find(sender);
-    if (pos != std::string::npos && pos != 0)
-        Rfriendlist.erase(pos - 1, sender.length() + 1);
-    else if (pos == 0)
-        Rfriendlist.erase(pos, sender.length() + 1);
-    std::cout << Rfriendlist << "\n";
-    updateStatement->setString(1, Rfriendlist);
-    updateStatement->setString(2, receiver);
-    updateStatement->execute();
+}
+void sql_delete_operation(std::string sender, std::string receiver)
+{   
+    sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
+    sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
+    con->setSchema("flypen");
+    std::vector<std::string> s;
+    s.push_back(sender);
+    s.push_back(receiver);
+    std::string readdata = "SELECT friends FROM users WHERE username = ?";
+    
+    sql::PreparedStatement *readdatament = con->prepareStatement(readdata);
+    process(readdatament ,s,con);
 }
 void sql_process_request(std::string sender, std::string receiver, std::string attitude)
 {
     std::vector<std::string> usernamelist;
     sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
     sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
-
     con->setSchema("flypen");
 
     std::string readData = "SELECT req FROM users WHERE username = ?";
     sql::PreparedStatement *readDatament = con->prepareStatement(readData);
     readDatament->setString(1, receiver);
     sql::ResultSet *resultSet = readDatament->executeQuery();
-
     std::string req;
     if (resultSet->next())
         req = resultSet->getString("req");
-
     size_t pos = req.find(sender);
-
     if (pos != std::string::npos && pos != 0)
         req.erase(pos - 1, sender.length() + 1);
     else if (pos == 0)
         req.erase(pos, sender.length() + 1);
-
     std::string updateQuery = "UPDATE users SET req = ? WHERE username = ?";
     sql::PreparedStatement *updateStatement = con->prepareStatement(updateQuery);
 
@@ -219,7 +204,7 @@ void sql_addhistory(std::string sender, std::string receiver, std::string messag
         std::cerr << "SQL Exception: " << e.what() << std::endl;
     }
 }
-//relate to user
+// relate to user
 void sql_add(std::string username, std::string passwd, int avatar)
 {
     try