Skip to content

Commit 2f0f9f3

Browse files
get_chat_info->get_my_info
1 parent a36ec1b commit 2f0f9f3

File tree

4 files changed

+10
-45
lines changed

4 files changed

+10
-45
lines changed

main.cc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ int main()
2525
{ friend_operation(req, std::move(callback)); });
2626
drogon::app().registerHandler("/api/info", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
2727
{ info(req, std::move(callback)); });
28-
29-
30-
// drogon::app().registerHandler("/api/file/tree", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
31-
// { genTree(req, std::move(callback)); });
32-
// drogon::app().registerHandler("/api/file/cat", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
33-
// { catFile(req, std::move(callback)); });
34-
3528
drogon::app().registerHandler("/api/file/save", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
3629
{ saveFile(req, std::move(callback)); });
3730
drogon::app().registerHandler("/api/avatar", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
@@ -41,13 +34,10 @@ int main()
4134
drogon::app().registerHandler("/api/file/get", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
4235
{ getPicture(req, std::move(callback)); },
4336
{Get});
44-
4537
drogon::app().registerHandler("/api/file/commands", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
4638
{ commandsCtrl(req, std::move(callback)); });
47-
4839
drogon::app().registerHandler("/api/file/lock", [](const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
4940
{add_lock(req, std::move(callback));});
50-
5141
drogon::app().setUploadPath("./uploads").run();
5242
return 0;
5343
}

msg_controller.cc

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void check(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &
6363
}
6464
else
6565
{
66-
//res->setBody("No Authorization");
66+
res_json["message"] = "No Authorization";
6767
res_json["code"] = 401;
6868

6969
}
@@ -153,38 +153,17 @@ void request_processing(const HttpRequestPtr &req, std::function<void(const Http
153153
// get chat info
154154
void info(const HttpRequestPtr &req, std::function<void(const HttpResponsePtr &)> &&callback)
155155
{
156-
auto body = req->getBody();
157-
Json::Value req_json, res_json;
156+
Json::Value res_json;
158157
Json::Reader reader;
159-
std::string bodyStr(body);
160-
if (!reader.parse(bodyStr, req_json))
161-
{
162-
callback(HttpResponse::newHttpResponse());
163-
return;
164-
}
165158
std::string me, who_send_me;
166159
Json::FastWriter writer;
167160
auto res = HttpResponse::newHttpResponse();
168161
res->addHeader("Access-Control-Allow-Origin", "*");
169-
170162
if (jwtVerify(req))
171163
{
172164
res_json["code"]=200;
173165
me = jwtDecrypt(req->getHeader("Authorization").substr(7));
174-
if (req_json["person"].asString() == "")
175-
{
176-
res_json["message"] = get_chat_info(me, "");
177-
178-
//res->setBody(writer.write(get_chat_info(me, "")));
179-
}
180-
else
181-
{
182-
who_send_me = req_json["person"].asString();
183-
res_json["message"] = get_chat_info(me, who_send_me);
184-
185-
//who_send_me = req_json["person"].asString();
186-
//res->setBody(writer.write(get_chat_info(me, who_send_me)));
187-
}
166+
res_json["message"] = get_my_info(me);
188167
}
189168
else
190169
{

mysql.cc

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,9 @@ void sql_add(std::string username, std::string passwd, int avatar)
304304
}
305305
}
306306

307-
Json::Value get_chat_info(std::string me, std::string who_send_me)
307+
Json::Value get_my_info(std::string me)
308308
{
309309
Json::Value json;
310-
std::string send[2] = {me, who_send_me};
311310

312311
try
313312
{
@@ -316,14 +315,11 @@ Json::Value get_chat_info(std::string me, std::string who_send_me)
316315
sql::Connection *con;
317316
con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
318317
con->setSchema("flypen");
319-
320-
for (int i = 0; i < 2; i++)
321-
{
322-
if (!send[i].empty())
318+
if (!me.empty())
323319
{
324320
std::string sql = "SELECT * FROM users WHERE username = ? LIMIT 1";
325321
sql::PreparedStatement *prepStmt = con->prepareStatement(sql);
326-
prepStmt->setString(1, send[i]);
322+
prepStmt->setString(1, me);
327323

328324
sql::ResultSet *res = prepStmt->executeQuery();
329325

@@ -377,10 +373,10 @@ Json::Value get_chat_info(std::string me, std::string who_send_me)
377373
Json::StreamWriterBuilder builder;
378374
std::string userJson = Json::writeString(builder, user);
379375

380-
json[send[i]] = user;
376+
json[me] = user;
381377
}
382378
}
383-
}
379+
384380
}
385381
catch (sql::SQLException &e)
386382
{
@@ -486,7 +482,7 @@ Json::Value sql_find_my_msg(std::string me, std::string connect_type)
486482
updateStmt->setInt(1, id);
487483
updateStmt->executeUpdate();
488484
delete updateStmt;
489-
std::cout<<"change"<<std::endl;
485+
// std::cout<<"change"<<std::endl;
490486
}
491487

492488
Json::Value item;

mysql.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void sql_addrequest(std::string send,std::string receiver);
1414
void sql_process_request(std::string ,std::string,std::string);
1515
Json::Value sql_find_my_msg(std::string,std::string);
1616
int lockcheck(std::string filename);
17-
Json::Value get_chat_info(std::string,std::string="");
17+
Json::Value get_my_info(std::string);
1818
void sql_delete_operation(std::string,std::string);
1919
void set_avatar(std::string person, int avatar);
2020
int sql_findexist(std::string receiver);

0 commit comments

Comments
 (0)