Commit ccab1d1d by guanghui.cui

tab替换为4个空格

parent a8033ca2
......@@ -38,21 +38,21 @@ void parseJson(const char* json)
// 注意GetParseError()返回的是一个rapidjson::ParseErrorCode类型的枚举值
// 使用函数rapidjson::GetParseError_En()得到错误码的字符串说明,这里的En为English简写
// 函数GetErrorOffset()返回出错发生的位置
//LOG_ERROR("TakeawayOrder JSON parse error: (%d:%d)", document.GetParseError(), document.GetErrorOffset())
LOG(ERROR)<<"JSON parse error:"<<document.GetParseError()<<":"<<document.GetErrorOffset();
}
else
{
rapidjson::Value& vStatusCode = document["statusCode"];
rapidjson::Value& vMsg = document["msg"];
rapidjson::Value& vOrderid = document["orderid"];
rapidjson::Value& vOrderid = document["orderid"];
int iStatusCode = vStatusCode.GetInt();
int iStatusCode = vStatusCode.GetInt();
std::string strMsg = vMsg.GetString();
std::string strOrderid = vOrderid.GetString();
LOG(INFO)<<"statusCode:"<<iStatusCode;
LOG(INFO)<<"msg:"<<strMsg.data();
LOG(INFO)<<"orderId:"<<strOrderid.data();
LOG(INFO)<<"statusCode:"<<iStatusCode;
LOG(INFO)<<"msg:"<<strMsg.data();
LOG(INFO)<<"orderId:"<<strOrderid.data();
}
}
......@@ -18,7 +18,7 @@ SQLite::~SQLite()
bool SQLite::initSQLite()
{
std::string strDbFileName; //*.db 名称
std::string strPath = GetProcDir();
std::string strPath = GetProcDir();
strPath.append("fmdata.db");
strDbFileName = strPath;
......@@ -51,8 +51,8 @@ bool SQLite::_createTable()
bool rlt=true;
std::string strTableName="fmTest";
if(!isTableExist(pDB,strTableName)){
char szCreate[1024]={0};
sprintf(szCreate,"create table %s(fm_id varchar(50) NOT NULL,\
char szCreate[1024]={0};
sprintf(szCreate,"create table %s(fm_id varchar(50) NOT NULL,\
statusCode int, \
msg varchar(200),\
prompt bool,\
......@@ -69,7 +69,7 @@ bool SQLite::_createTable()
}
}
else{
LOG(INFO)<<strTableName.data()<<"已存在";
LOG(INFO)<<strTableName.data()<<"已存在";
}
return rlt;
......@@ -92,17 +92,14 @@ bool SQLite::isTableExist(sqlite3 *sqDb, std::string strTableName)
int count=sqlite3_column_int(pstmt,0);
sqlite3_finalize(pstmt);
if(count > 0)
return true;
return true;
return false;
}
int SQLite::isRecordExist(std::string strTable,std::string strKey)
{
char* lpSql = new char[BUFFER_SIZE];
sprintf_s(lpSql,BUFFER_SIZE,
"select * from %s where trans_id = '%s'",
strTable.c_str(),
strKey.c_str());
sprintf_s(lpSql,BUFFER_SIZE, "select * from %s where trans_id = '%s'",strTable.c_str(),strKey.c_str());
char** pResult;
int nRow = 0;
int nCol = 0;
......
......@@ -30,7 +30,7 @@ int socketRecvData(char * recvBuf, int bufSize, int socket_fd)
while(0 < needLength)
{
//接收并打印客户端数据
int length = recv(socket_fd, pcRcvBufer + rcvedLength, needLength, 0);
int length = recv(socket_fd, pcRcvBufer + rcvedLength, needLength, 0);
if (0 < length)
{
needLength -= length;
......@@ -40,7 +40,7 @@ int socketRecvData(char * recvBuf, int bufSize, int socket_fd)
{
if (0 == rcvFlag)
{
//header rcved complete
//header rcved complete
rcvFlag = 1;//to rcv payload
int flag = headx.flag;
......@@ -51,8 +51,8 @@ int socketRecvData(char * recvBuf, int bufSize, int socket_fd)
if(len > bufSize)
{
rlt = -1;
LOG(ERROR)<<"socket recv 接收数据长度大于接收缓冲区:"<<len;
break;
LOG(ERROR)<<"socket recv 接收数据长度大于接收缓冲区:"<<len;
break;
}
needLength = len;
pcRcvBufer = recvBuf;
......@@ -61,7 +61,7 @@ int socketRecvData(char * recvBuf, int bufSize, int socket_fd)
}
else
{
//payload rcved complete
//payload rcved complete
rlt = rcvedLength;
break;
}
......@@ -69,9 +69,9 @@ int socketRecvData(char * recvBuf, int bufSize, int socket_fd)
}
else if(length == 0)
{
//socket error
//socket error
rlt = -1;
LOG(ERROR)<<"socket recv 返回值:"<<length;
LOG(ERROR)<<"socket recv 返回值:"<<length;
break;
}
}
......@@ -98,12 +98,12 @@ int socketSendData(const char * sendBuf, int socket_fd)
while(curSendLength < toSendLength)
{
int res = send(socket_fd, pcSendBuf + curSendLength, toSendLength - curSendLength, 0);
int res = send(socket_fd, pcSendBuf + curSendLength, toSendLength - curSendLength, 0);
if(res == SOCKET_ERROR)
{
LOG(ERROR)<<"发送数据给fm服务端失败!";
rlt=-1;
{
LOG(ERROR)<<"发送数据给fm服务端失败!";
rlt=-1;
break;
}
......@@ -112,7 +112,7 @@ int socketSendData(const char * sendBuf, int socket_fd)
if(curSendLength != toSendLength)
{
rlt=-1;
LOG(ERROR)<<"socket数据发送不完整!";
LOG(ERROR)<<"socket数据发送不完整!";
}
return rlt;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment