Commit 4bba0f62 by Carwyn

1.配置文件 Key 修改; 2.增加版权显示; 3.默认使用负载均衡地址

parent 89fdf2b6
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#define SQL_KEY_TOTALAMOUNT "total_amount" #define SQL_KEY_TOTALAMOUNT "total_amount"
//缺省 //缺省
#define DEFAULT_EPAY_RWQUESTURL "http://115.159.142.32:80/api?partner=aisen" #define DEFAULT_EPAY_RWQUESTURL "https://115.159.18.100/api"
#define DEFAULT_EPAY_DATABASENAME "fmp_test.db" #define DEFAULT_EPAY_DATABASENAME "fmp_test.db"
#define DEFAULT_EPAY_TABLE "fmp_pay" #define DEFAULT_EPAY_TABLE "fmp_pay"
#define DEFAULT_EPAY_CONNECTNAME "fmp_pay_connect" #define DEFAULT_EPAY_CONNECTNAME "fmp_pay_connect"
...@@ -60,6 +60,9 @@ ...@@ -60,6 +60,9 @@
//基础信息 营业日/操作员/pos编号 //基础信息 营业日/操作员/pos编号
#define FMP_BASIC_BUSINESSDATE "businessdate" #define FMP_BASIC_BUSINESSDATE "businessdate"
#define FMP_INIKEY_EPAYTIMEOUT "Pay/Timeout"
#define FMP_INIKEY_EPAYURL "Pay/Server"
#endif // FMP_EPAY_DEF #endif // FMP_EPAY_DEF
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
#include <fmp_plugin_i.h> #include <fmp_plugin_i.h>
#include "fmp_epay_def.h"
/** /**
* 业务插件接口,必须继承自 FMPluginInterface * 业务插件接口,必须继承自 FMPluginInterface
* @brief The FMPePayInterface class * @brief The FMPePayInterface class
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
#include <QSqlQuery> #include <QSqlQuery>
#include <fmp_home_i.h>
unsigned int FMPePayPrivate::s_ClientReqCount = 10000; unsigned int FMPePayPrivate::s_ClientReqCount = 10000;
......
...@@ -14,7 +14,11 @@ ...@@ -14,7 +14,11 @@
<string>FMPPayDialog</string> <string>FMPPayDialog</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true">#label_copyright
{
font: normal 16px &quot;微软雅黑&quot;;
color: rgb(200,200,200);
}</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing"> <property name="spacing">
...@@ -439,10 +443,16 @@ ...@@ -439,10 +443,16 @@
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widget" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>58</height>
</size>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
...@@ -480,6 +490,12 @@ ...@@ -480,6 +490,12 @@
</item> </item>
<item> <item>
<widget class="QWidget" name="wdg_right_bg" native="true"> <widget class="QWidget" name="wdg_right_bg" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>450</height>
</size>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">#wdg_right_bg <string notr="true">#wdg_right_bg
{ {
...@@ -824,8 +840,8 @@ QPushButton:hover { ...@@ -824,8 +840,8 @@ QPushButton:hover {
<property name="bottomMargin"> <property name="bottomMargin">
<number>10</number> <number>10</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="2">
<widget class="QPushButton" name="btn_num7"> <widget class="QPushButton" name="btn_num9">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
...@@ -845,12 +861,12 @@ QPushButton:hover { ...@@ -845,12 +861,12 @@ QPushButton:hover {
<string notr="true">background-color: rgb(255, 255, 255);</string> <string notr="true">background-color: rgb(255, 255, 255);</string>
</property> </property>
<property name="text"> <property name="text">
<string>7</string> <string>9</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="0">
<widget class="QPushButton" name="btn_num8"> <widget class="QPushButton" name="btn_num7">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
...@@ -870,12 +886,12 @@ QPushButton:hover { ...@@ -870,12 +886,12 @@ QPushButton:hover {
<string notr="true">background-color: rgb(255, 255, 255);</string> <string notr="true">background-color: rgb(255, 255, 255);</string>
</property> </property>
<property name="text"> <property name="text">
<string>8</string> <string>7</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="1">
<widget class="QPushButton" name="btn_num9"> <widget class="QPushButton" name="btn_num8">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
...@@ -895,7 +911,7 @@ QPushButton:hover { ...@@ -895,7 +911,7 @@ QPushButton:hover {
<string notr="true">background-color: rgb(255, 255, 255);</string> <string notr="true">background-color: rgb(255, 255, 255);</string>
</property> </property>
<property name="text"> <property name="text">
<string>9</string> <string>8</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -1108,18 +1124,18 @@ QPushButton:hover { ...@@ -1108,18 +1124,18 @@ QPushButton:hover {
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3" rowspan="2"> <item row="3" column="0">
<widget class="QPushButton" name="btn_confirm01"> <widget class="QPushButton" name="btn_num0">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>122</height> <height>57</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>122</height> <height>57</height>
</size> </size>
</property> </property>
<property name="cursor"> <property name="cursor">
...@@ -1129,22 +1145,22 @@ QPushButton:hover { ...@@ -1129,22 +1145,22 @@ QPushButton:hover {
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="text"> <property name="text">
<string>确定</string> <string>0</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="2" column="3" rowspan="2">
<widget class="QPushButton" name="btn_num0"> <widget class="QPushButton" name="btn_confirm01">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>57</height> <height>122</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>57</height> <height>122</height>
</size> </size>
</property> </property>
<property name="cursor"> <property name="cursor">
...@@ -1154,7 +1170,7 @@ QPushButton:hover { ...@@ -1154,7 +1170,7 @@ QPushButton:hover {
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="text"> <property name="text">
<string>0</string> <string>确定</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -2770,6 +2786,16 @@ QHeaderView::section { ...@@ -2770,6 +2786,16 @@ QHeaderView::section {
<zorder>wdg_pay_main</zorder> <zorder>wdg_pay_main</zorder>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="label_copyright">
<property name="text">
<string>由 非码© 提供技术支持</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
...@@ -2802,34 +2828,18 @@ QHeaderView::section { ...@@ -2802,34 +2828,18 @@ QHeaderView::section {
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>16</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>16</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_storeid"> <widget class="QLabel" name="label_storeid">
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">#label_storeid <string notr="true">#label_storeid
...@@ -2850,7 +2860,7 @@ QHeaderView::section { ...@@ -2850,7 +2860,7 @@ QHeaderView::section {
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Maximum</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
...@@ -2870,7 +2880,7 @@ QHeaderView::section { ...@@ -2870,7 +2880,7 @@ QHeaderView::section {
}</string> }</string>
</property> </property>
<property name="text"> <property name="text">
<string>pos编号:</string> <string>POS 编号:</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -2880,7 +2890,7 @@ QHeaderView::section { ...@@ -2880,7 +2890,7 @@ QHeaderView::section {
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType"> <property name="sizeType">
<enum>QSizePolicy::Maximum</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
...@@ -2904,19 +2914,6 @@ QHeaderView::section { ...@@ -2904,19 +2914,6 @@ QHeaderView::section {
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>222</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 9 #define VER_BUILD 10
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
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