Skip to content

aaa #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 12, 2023
Merged

aaa #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5741263
md
zzc20001 Sep 28, 2023
bee46a2
Merge remote-tracking branch 'lj/main'
zzc20001 Oct 7, 2023
9b28311
Merge remote-tracking branch 'lj/main'
zzc20001 Oct 12, 2023
16fff40
extern driver
zzc20001 Oct 12, 2023
2463fa6
Merge branch 'main' into main
stepbystepcode Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions API.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ POST /api/chat
|HTTP Status Code |Meaning|Description|Data schema|
|---|---|---|---|
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|

|404|[error] |失败|Inline|
### Responses Data Schema

## POST check
Expand All @@ -55,7 +55,6 @@ POST /api/check
|HTTP Status Code |Meaning|Description|Data schema|
|---|---|---|---|
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|

### Responses Data Schema

## POST nfmgr
Expand Down Expand Up @@ -92,7 +91,7 @@ POST /api/nfmgr
|HTTP Status Code |Meaning|Description|Data schema|
|---|---|---|---|
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|

|404|[error] |User not found|Inline|
### Responses Data Schema

## POST info
Expand Down Expand Up @@ -127,7 +126,7 @@ POST /api/info
|HTTP Status Code |Meaning|Description|Data schema|
|---|---|---|---|
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|

|401|[error] |Invalid token|Inline|
### Responses Data Schema

## POST newfriend
Expand All @@ -154,7 +153,7 @@ POST /api/newfriend
|HTTP Status Code |Meaning|Description|Data schema|
|---|---|---|---|
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|OK|Inline|

|401|[error] |Unauthorized|Inline|
### Responses Data Schema

# file
Expand Down Expand Up @@ -193,7 +192,7 @@ POST /api/file/save
|HTTP Status Code |Meaning|Description|Data schema|
|---|---|---|---|
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|

|500|[error] |Error saving file|Inline|
### Responses Data Schema

## POST upload
Expand Down Expand Up @@ -253,7 +252,7 @@ GET /api/file/get
|HTTP Status Code |Meaning|Description|Data schema|
|---|---|---|---|
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|

|404|[error] |File not found|Inline|
### Responses Data Schema

## POST commands
Expand Down Expand Up @@ -358,7 +357,7 @@ POST /api/login
|HTTP Status Code |Meaning|Description|Data schema|
|---|---|---|---|
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|

|401|[error] |Invalid credentials|Inline|
### Responses Data Schema

## POST signup
Expand Down Expand Up @@ -395,7 +394,7 @@ POST /api/signup
|HTTP Status Code |Meaning|Description|Data schema|
|---|---|---|---|
|200|[OK](https://tools.ietf.org/html/rfc7231#section-6.3.1)|成功|Inline|

|409|[error] |Username already exists|Inline|
### Responses Data Schema

## POST avatar
Expand Down
3 changes: 2 additions & 1 deletion main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
#include "msg_controller.h"
#include "user_controller.h"
#include "file_controller.h"

#include<mysql.h>
using namespace drogon;
sql::mysql::MySQL_Driver *driver = sql::mysql::get_mysql_driver_instance();
int main()
{
drogon::app().addListener("0.0.0.0", 8081);
Expand Down
16 changes: 1 addition & 15 deletions mysql.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
#include "jdbc/mysql_connection.h"
#include "jdbc/mysql_driver.h"
#include "json/json.h"

extern sql::mysql::MySQL_Driver *driver;
void sql_unlocked(const std::string& DeleteName)
{
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");
sql::Statement *stmt = con->createStatement();
Expand All @@ -27,7 +26,6 @@ void sql_unlocked(const std::string& DeleteName)

int sql_findexist(const 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::string readdata = "SELECT username FROM users";
Expand All @@ -47,7 +45,6 @@ int sql_findexist(const std::string& receiver)
}
int lockcheck(const std::string& filename)
{
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 filename FROM file";
Expand Down Expand Up @@ -99,7 +96,6 @@ void process(sql::PreparedStatement *readDatament, std::vector<std::string> s, s

void sql_delete_operation(const std::string& sender, const 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");
Expand All @@ -119,7 +115,6 @@ void sql_delete_operation(const std::string& sender, const std::string& receiver
void sql_process_request(const std::string& sender, const std::string& receiver, const 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");

Expand Down Expand Up @@ -199,8 +194,6 @@ void sql_process_request(const std::string& sender, const std::string& receiver,
void sql_addrequest(const std::string& sender, const std::string& receiver)
{
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");

Expand Down Expand Up @@ -249,7 +242,6 @@ void sql_addhistory(const std::string& sender, const std::string& receiver, cons
{
try
{
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");

Expand Down Expand Up @@ -278,7 +270,6 @@ void sql_add(const std::string& username, const std::string& passwd, int avatar)
{
try
{
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");

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

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");
Expand Down Expand Up @@ -395,7 +384,6 @@ bool sql_check(const std::string& user, const std::string& passwd)
bool result = false;
try
{
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");

Expand Down Expand Up @@ -438,7 +426,6 @@ Json::Value sql_find_my_msg(const std::string& me, const std::string& connect_ty
// std::cout << "login user: " << me << std::endl;
try
{
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");
sql::PreparedStatement *prepStmt;
Expand Down Expand Up @@ -540,7 +527,6 @@ Json::Value sql_find_my_msg(const std::string& me, const std::string& connect_ty

void set_avatar(const std::string& person, int avatar)
{
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 update_sql = "UPDATE users SET avatar = ? WHERE username = ?";
Expand Down