Commit 94be1897 by 李定达

1.ssl仍无法使用

parent 352b79c1
...@@ -29,14 +29,14 @@ bool FMNetWork::HttpPost(QString url, QByteArray outdata, const QByteArray &inda ...@@ -29,14 +29,14 @@ bool FMNetWork::HttpPost(QString url, QByteArray outdata, const QByteArray &inda
QEventLoop loop; QEventLoop loop;
QTimer timer; QTimer timer;
// QSslConfiguration config; QSslConfiguration config;
// config.setPeerVerifyMode(QSslSocket::VerifyNone); config.setPeerVerifyMode(QSslSocket::VerifyNone);
// config.setProtocol(QSsl::SslV3); config.setProtocol(QSsl::SslV3);
QNetworkAccessManager manger; QNetworkAccessManager manger;
QNetworkRequest request(url); QNetworkRequest request(url);
//request.setSslConfiguration(config); request.setSslConfiguration(config);
request.setRawHeader("Content-Type", content.toUtf8()); request.setRawHeader("Content-Type", content.toUtf8());
request.setRawHeader("Accept", accept.toUtf8()); request.setRawHeader("Accept", accept.toUtf8());
......
...@@ -106,6 +106,9 @@ void RollBack::run() ...@@ -106,6 +106,9 @@ void RollBack::run()
int timeout = QSettings(path + "\\" + USERCONFIG_NAME, QSettings::IniFormat).value(VALUE_TIMEOUT).toInt(); int timeout = QSettings(path + "\\" + USERCONFIG_NAME, QSettings::IniFormat).value(VALUE_TIMEOUT).toInt();
if(timeout == 0)
timeout = 30;
do do
{ {
QSqlQuery query; QSqlQuery query;
......
...@@ -176,14 +176,14 @@ bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indat ...@@ -176,14 +176,14 @@ bool Control::HttpPost(QString url, QByteArray &outdata, const QByteArray &indat
QEventLoop loop; QEventLoop loop;
QTimer timer; QTimer timer;
// QSslConfiguration config; QSslConfiguration config;
// config.setPeerVerifyMode(QSslSocket::VerifyNone); config.setPeerVerifyMode(QSslSocket::VerifyNone);
// config.setProtocol(QSsl::SslV3); config.setProtocol(QSsl::SslV3);
QNetworkAccessManager manger; QNetworkAccessManager manger;
QNetworkRequest request(url); QNetworkRequest request(url);
//request.setSslConfiguration(config); request.setSslConfiguration(config);
request.setRawHeader("Content-Type", content.toUtf8()); request.setRawHeader("Content-Type", content.toUtf8());
request.setRawHeader("Accept", accept.toUtf8()); request.setRawHeader("Accept", accept.toUtf8());
......
...@@ -85,9 +85,9 @@ void HostWidget::ShowWidget(QWidget *showwidget) ...@@ -85,9 +85,9 @@ void HostWidget::ShowWidget(QWidget *showwidget)
} }
this->show(); //this->show();
this->move(1200, 500); //this->move(1200, 500);
//this->showFullScreen(); this->showFullScreen();
} }
void HostWidget::InitWidget() void HostWidget::InitWidget()
......
#ifdef SBKDLL #ifdef SBKDLL
#include "DataProcess/tools.h"
#include "DataProcess/rollback.h"
#include <qwinwidget.h> #include <qwinwidget.h>
#include <QMessageBox> #include <QMessageBox>
...@@ -10,10 +13,14 @@ ...@@ -10,10 +13,14 @@
#include "requestmodel.h" #include "requestmodel.h"
#include "fmtool.h" #include "fmtool.h"
#include "rspfactory.h" #include "rspfactory.h"
#include <QDir> #include <QDir>
EXTERN_C IMAGE_DOS_HEADER __ImageBase; EXTERN_C IMAGE_DOS_HEADER __ImageBase;
RollBack rollback;
BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpvReserved*/ ) BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpvReserved*/ )
{ {
static bool ownApplication = FALSE; static bool ownApplication = FALSE;
...@@ -41,7 +48,7 @@ extern "C" __declspec(dllexport) void Start(const char *indata, char *outdata) ...@@ -41,7 +48,7 @@ extern "C" __declspec(dllexport) void Start(const char *indata, char *outdata)
QWinWidget win( parent ); QWinWidget win( parent );
char path[MAX_PATH] = {0}; char path[MAX_PATH] = {0};
Control::GetProcPath(path); ToolS::GetProcPath(path);
QString logDir = QString("%1/log").arg(QString(path)); QString logDir = QString("%1/log").arg(QString(path));
QDir().mkdir(logDir); QDir().mkdir(logDir);
...@@ -60,7 +67,9 @@ extern "C" __declspec(dllexport) void Start(const char *indata, char *outdata) ...@@ -60,7 +67,9 @@ extern "C" __declspec(dllexport) void Start(const char *indata, char *outdata)
logger.addDestination(consleDest); logger.addDestination(consleDest);
Control control(&win); Control control(&win);
rollback.start();
control.Start(indata, outdata); control.Start(indata, outdata);
} }
...@@ -307,7 +316,7 @@ int main(int argc, char *argv[]) ...@@ -307,7 +316,7 @@ int main(int argc, char *argv[])
AlipayRequest req; AlipayRequest req;
FMTool::SetString(req.BusinessDay, 8 , QString("20170909")); FMTool::SetString(req.BusinessDay, 8 , QString("20170909"));
FMTool::SetString(req.TransType, 2 , QString("30")); FMTool::SetString(req.TransType, 2 , QString("10"));
FMTool::SetString(req.PlatNo, 4, QString("1443")); FMTool::SetString(req.PlatNo, 4, QString("1443"));
FMTool::SetString(req.TransTime, 6, QString("130301")); FMTool::SetString(req.TransTime, 6, QString("130301"));
FMTool::SetString(req.StoreNo, 20 , QString("17607")); FMTool::SetString(req.StoreNo, 20 , QString("17607"));
......
...@@ -16,7 +16,7 @@ include("./DataProcess/DataProcess.pri") ...@@ -16,7 +16,7 @@ include("./DataProcess/DataProcess.pri")
LIBS += -L"C:/openssl/openssl-1.0.1s/out32dll" -llibeay32 LIBS += -L"C:/openssl/openssl-1.0.1s/out32dll" -llibeay32
LIBS += -L"C:/openssl/openssl-1.0.1s/out32dll" -lssleay32 LIBS += -L"C:/openssl/openssl-1.0.1s/out32dll" -lssleay32
CONFIG += C++11 CONFIG += C++11 SBKDLL
include($$PWD/qtwinmigrate/src/qtwinmigrate.pri) include($$PWD/qtwinmigrate/src/qtwinmigrate.pri)
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.5.1, 2017-08-26T17:02:37. --> <!-- Written by QtCreator 3.5.1, 2017-08-28T00:17:13. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.5.1 MSVC2010 32bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.5.1 MSVC2010 32bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.5.1 MSVC2010 32bit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.5.1 MSVC2010 32bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.55.win32_msvc2010_kit</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.55.win32_msvc2010_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
...@@ -226,14 +226,12 @@ ...@@ -226,14 +226,12 @@
</valuelist> </valuelist>
<value type="int" key="PE.EnvironmentAspect.Base">2</value> <value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">sbkpay</value> <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">自定义执行档</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/gitcode/sbkpay/sbkpay/sbkpay.pro</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">sbkpay.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
......
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