Skip to content

Commit e7adbfc

Browse files
stepbystepcodestepbystepcode
authored
Merge pull request #64 from zzc20001/main
aaa
2 parents f29d8d9 + 2463fa6 commit e7adbfc

File tree

3 files changed

+11
-25
lines changed

3 files changed

+11
-25
lines changed

‎API.md‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ POST /api/chat
3535
|HTTP Status Code |Meaning|Description|Data schema|
3636
|---|---|---|---|
3737
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|
38-
38+
|404|[error] |失败|Inline|
3939
### Responses Data Schema
4040

4141
## POST check
@@ -55,7 +55,6 @@ POST /api/check
5555
|HTTP Status Code |Meaning|Description|Data schema|
5656
|---|---|---|---|
5757
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|
58-
5958
### Responses Data Schema
6059

6160
## POST nfmgr
@@ -92,7 +91,7 @@ POST /api/nfmgr
9291
|HTTP Status Code |Meaning|Description|Data schema|
9392
|---|---|---|---|
9493
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|
95-
94+
|404|[error] |User not found|Inline|
9695
### Responses Data Schema
9796

9897
## POST info
@@ -127,7 +126,7 @@ POST /api/info
127126
|HTTP Status Code |Meaning|Description|Data schema|
128127
|---|---|---|---|
129128
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|
130-
129+
|401|[error] |Invalid token|Inline|
131130
### Responses Data Schema
132131

133132
## POST newfriend
@@ -154,7 +153,7 @@ POST /api/newfriend
154153
|HTTP Status Code |Meaning|Description|Data schema|
155154
|---|---|---|---|
156155
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|Inline|
157-
156+
|401|[error] |Unauthorized|Inline|
158157
### Responses Data Schema
159158

160159
# file
@@ -193,7 +192,7 @@ POST /api/file/save
193192
|HTTP Status Code |Meaning|Description|Data schema|
194193
|---|---|---|---|
195194
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|
196-
195+
|500|[error] |Error saving file|Inline|
197196
### Responses Data Schema
198197

199198
## POST upload
@@ -253,7 +252,7 @@ GET /api/file/get
253252
|HTTP Status Code |Meaning|Description|Data schema|
254253
|---|---|---|---|
255254
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|
256-
255+
|404|[error] |File not found|Inline|
257256
### Responses Data Schema
258257

259258
## POST commands
@@ -358,7 +357,7 @@ POST /api/login
358357
|HTTP Status Code |Meaning|Description|Data schema|
359358
|---|---|---|---|
360359
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|
361-
360+
|401|[error] |Invalid credentials|Inline|
362361
### Responses Data Schema
363362

364363
## POST signup
@@ -395,7 +394,7 @@ POST /api/signup
395394
|HTTP Status Code |Meaning|Description|Data schema|
396395
|---|---|---|---|
397396
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|
398-
397+
|409|[error] |Username already exists|Inline|
399398
### Responses Data Schema
400399

401400
## POST avatar

‎main.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
#include "msg_controller.h"
33
#include "user_controller.h"
44
#include "file_controller.h"
5-
5+
#include<mysql.h>
66
using namespace drogon;
7+
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
78
int main()
89
{
910
drogon::app().addListener("0.0.0.0", 8081);

‎mysql.cc‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
#include "jdbc/mysql_connection.h"
44
#include "jdbc/mysql_driver.h"
55
#include "json/json.h"
6-
6+
extern sql::mysql::MySQL_Driver *driver;
77
void sql_unlocked(const std::string& DeleteName)
88
{
9-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
109
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
1110
con->setSchema("flypen");
1211
sql::Statement *stmt = con->createStatement();
@@ -27,7 +26,6 @@ void sql_unlocked(const std::string& DeleteName)
2726

2827
int sql_findexist(const std::string& receiver)
2928
{
30-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
3129
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
3230
con->setSchema("flypen");
3331
std::string readdata = "SELECT username FROM users";
@@ -47,7 +45,6 @@ int sql_findexist(const std::string& receiver)
4745
}
4846
int lockcheck(const std::string& filename)
4947
{
50-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
5148
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
5249
con->setSchema("flypen");
5350
std::string readData = "SELECT filename FROM file";
@@ -99,7 +96,6 @@ void process(sql::PreparedStatement *readDatament, std::vector<std::string> s, s
9996

10097
void sql_delete_operation(const std::string& sender, const std::string& receiver)
10198
{
102-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
10399
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
104100

105101
con->setSchema("flypen");
@@ -119,7 +115,6 @@ void sql_delete_operation(const std::string& sender, const std::string& receiver
119115
void sql_process_request(const std::string& sender, const std::string& receiver, const std::string& attitude)
120116
{
121117
std::vector<std::string> usernamelist;
122-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
123118
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
124119
con->setSchema("flypen");
125120

@@ -199,8 +194,6 @@ void sql_process_request(const std::string& sender, const std::string& receiver,
199194
void sql_addrequest(const std::string& sender, const std::string& receiver)
200195
{
201196
std::vector<std::string> usernamelist;
202-
203-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
204197
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
205198
con->setSchema("flypen");
206199

@@ -249,7 +242,6 @@ void sql_addhistory(const std::string& sender, const std::string& receiver, cons
249242
{
250243
try
251244
{
252-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
253245
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
254246
con->setSchema("flypen");
255247

@@ -278,7 +270,6 @@ void sql_add(const std::string& username, const std::string& passwd, int avatar)
278270
{
279271
try
280272
{
281-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
282273
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
283274
con->setSchema("flypen");
284275

@@ -309,8 +300,6 @@ Json::Value get_my_info(const std::string& me)
309300

310301
try
311302
{
312-
sql::mysql::MySQL_Driver *driver;
313-
driver = sql::mysql::get_mysql_driver_instance();
314303
sql::Connection *con;
315304
con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
316305
con->setSchema("flypen");
@@ -395,7 +384,6 @@ bool sql_check(const std::string& user, const std::string& passwd)
395384
bool result = false;
396385
try
397386
{
398-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
399387
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
400388
con->setSchema("flypen");
401389

@@ -438,7 +426,6 @@ Json::Value sql_find_my_msg(const std::string& me, const std::string& connect_ty
438426
// std::cout << "login user: " << me << std::endl;
439427
try
440428
{
441-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
442429
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
443430
con->setSchema("flypen");
444431
sql::PreparedStatement *prepStmt;
@@ -540,7 +527,6 @@ Json::Value sql_find_my_msg(const std::string& me, const std::string& connect_ty
540527

541528
void set_avatar(const std::string& person, int avatar)
542529
{
543-
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
544530
sql::Connection *con = driver->connect("tcp://8.130.48.157:3306", "root", "abc.123");
545531
con->setSchema("flypen");
546532
std::string update_sql = "UPDATE users SET avatar = ? WHERE username = ?";

0 commit comments

Comments
 (0)