添加openssl认证支持

fmTakeaway/Control/flowControl.cpp

@@ -19,7 +19,6 @@
 #include <QMap>
 #include <QFile>
 #include <DTools/orderstatus.h>
-//#include "windows.h"
 #include <QHostInfo>
 
 
@@ -168,14 +167,16 @@ void FlowControl::_GetOrder(const QString &orderId, const QString &channel)
 
 void FlowControl::_ClickOMSAssignArea()
 {
-    QPoint point=ConfigManger::GetOMSBtnPostion();
+    QPoint point=ConfigManger::GetInstance().GetOMSBtnPostion();
     SetCursorPos(point.x(),point.y());
     mouse_event(MOUSEEVENTF_LEFTDOWN,0,0,0,0);
     mouse_event(MOUSEEVENTF_LEFTUP,0,0,0,0);
+    QLOG_INFO()<<QString("点击目标坐标x%1:,y:%2").arg(point.x()).arg(point.y());
 }
 
 void FlowControl::onGetNewStoreInfo()
 {
+    QLOG_INFO()<<"Openssl support:"<<QSslSocket::supportsSsl();
     m_timestamp = "0";
     m_loginSocket = new BillSocket(this);
     m_pullOrderSocket = new BillSocket(this);
@@ -211,6 +212,10 @@ bool FlowControl::_Login()
                                                       m_password, m_posId, m_cashierId,_GetIpAddress());
     emit showAlert(AlertForm::LOADING, "正在登录......");
     QLOG_INFO() << QString("[---login---][requestData:%1]").arg(_GetJsonStr(sendJson));
+    if(ConfigManger::GetInstance().GetLoginSslConfig())
+    {
+        m_loginSocket->SetSslConfig();
+    }
     m_loginSocket->SetUrl(QUrl(ConfigManger::GetInstance().GetLoginServerUrl()+
                                ConfigManger::GetInstance().GetInterfaceName(INI_INTERFACE_ILOGIN)));
     result = m_loginSocket->Request(sendJson, recvJson, error);
@@ -271,6 +276,14 @@ bool FlowControl::_PullOrder()
     sendJson = DataManger::GetInstance().GetPullOrderData(info.orderId,info.channel,m_storeId,info.pageNumber,info.pageSize);
 
     QLOG_INFO() << QString("[---pull order---][requestData:%1]").arg(_GetJsonStr(sendJson));
+    if(ConfigManger::GetInstance().GetOrderSslConfig())
+    {
+        m_pullOrderSocket->SetSslConfig();
+        QLOG_INFO()<<"load ssl";
+    }
+    else{
+        QLOG_INFO()<<"load not ssl";
+    }
     m_pullOrderSocket->SetUrl(QUrl(ConfigManger::GetInstance().GetOrderServerUrl()+
                                    ConfigManger::GetInstance().GetInterfaceName(INI_INTERFACE_PULLORDER)));
     result = m_pullOrderSocket->Request(sendJson, recvJson, error);
@@ -490,6 +503,14 @@ bool FlowControl::_ConfirmOrder(const QString &orderId, const DeliverObject &del
     {
         m_procOrderSocket=new BillSocket(this);
     }
+    if(ConfigManger::GetInstance().GetOrderSslConfig())
+        {
+            m_procOrderSocket->SetSslConfig();
+            QLOG_INFO()<<"load ssl";
+        }
+        else{
+            QLOG_INFO()<<"load not ssl";
+        }
     m_procOrderSocket->SetUrl(QUrl(ConfigManger::GetInstance().GetOrderServerUrl()+
                                    ConfigManger::GetInstance().GetInterfaceName(INI_INTERFACE_CONFIRM)));
     result = m_procOrderSocket->Request(sendJson, recvJson, error);
@@ -980,7 +1001,8 @@ void FlowControl::_ClearOrder()
         {
             QLOG_INFO()<<QString("clear order %1").arg(order->order_id);
             emit clearorder(order->order_id,order->status);
-            m_ordersMap.remove(order->order_id);
+            m_ordersMap.value(order->order_id)->deleteLater();
+            delete m_ordersMap.take(order->order_id);
         }
     }
 }

fmTakeaway/DTools/configManger.cpp

@@ -145,5 +145,15 @@ QPoint ConfigManger::GetOMSBtnPostion()
     return m_userConfig->value(INI_OMSBTNPOSTION).toPoint();
 }
 
+int ConfigManger::GetLoginSslConfig()
+{
+    return m_config->value("SSLConfig/login").toInt();
+}
+
+int ConfigManger::GetOrderSslConfig()
+{
+    return m_config->value("SSLConfig/order").toInt();
+}
+
 
 

fmTakeaway/DTools/configManger.h

@@ -122,6 +122,8 @@ public:
     QString GetIpAddress();
 
     QPoint GetOMSBtnPostion();
+    int GetLoginSslConfig();
+    int GetOrderSslConfig();
 
 private:
     ConfigManger();

fmTakeaway/DTools/dataManger.cpp

@@ -134,8 +134,12 @@ QJsonObject DataManger::GetRefundOrderData(const QString &reason, const QString
 {
     QJsonObject rObj;
     rObj.insert(JSON_BUSINESSID, orderId);
-    rObj.insert(JSON_REASON, reason);
+    //TEST
+    rObj.insert(JSON_REASON, "其它");
+    //rObj.insert(JSON_REASON, reason);
     rObj.insert(JSON_CODE, -1);
+
+
     rObj.insert(JSON_CHANNEL,channel);
     rObj.insert(JSON_SHOPCODE, m_storeId);
     return rObj;

fmTakeaway/Network/billSocket.cpp

@@ -4,6 +4,7 @@
 #include "preDefine.h"
 #include <QEventLoop>
 #include <QTimer>
+#include <QSslConfiguration>
 
 BillSocket::BillSocket(QObject *parent)
     : QObject(parent)
@@ -55,3 +56,11 @@ void BillSocket::SetUrl(QUrl url)
 {
     m_networkRequest.setUrl(url);
 }
+
+void BillSocket::SetSslConfig()
+{
+    QSslConfiguration m_sslConfig = QSslConfiguration::defaultConfiguration();
+    m_sslConfig.setPeerVerifyMode(QSslSocket::VerifyNone);
+    m_sslConfig.setProtocol(QSsl::AnyProtocol);
+    m_networkRequest.setSslConfiguration(m_sslConfig);
+}

fmTakeaway/Network/billSocket.h

@@ -16,6 +16,7 @@ public:
 
     bool Request(const QJsonObject& requestJson, QJsonObject& recvJson, QString& error);
     void SetUrl(QUrl url);
+    void SetSslConfig();
 
 private:
     QNetworkAccessManager m_networkManger;

fmTakeaway/preDefine.h

@@ -5,7 +5,7 @@
 
 #define APP_THEME               "deaufult"
 
-#define APP_VERSION             "1.20160923.01"
+#define APP_VERSION             "1.20171013.01"
 #define SERVER_PASSWORD         "posoperator@freemud.cn"
 
 #define CONFIG_NAME             "config.ini"