Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sbkpay
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhenfei.zhang
sbkpay
Commits
5095dd3d
Commit
5095dd3d
authored
Aug 03, 2021
by
wuyang.zou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Bug: 剥离 MiniPos 有线+无线网卡同时存在时,微信支付宝签到 优先使用 无线网卡进行签到的功能
Version: 3.21.8.15
parent
742fe25c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
sbkpay/DataProcess/tools.h
+3
-1
sbkpay/version.h
+1
-1
No files found.
sbkpay/DataProcess/tools.h
View file @
5095dd3d
...
...
@@ -123,13 +123,15 @@ public:
QLOG_INFO
()
<<
" GetMacIpByAdaptersAddresses:: Filter Valid One, Mac: "
<<
tmpMac
<<
" Ip: "
<<
tmpIp
<<
" IfType: "
<<
pCurrAddresses
->
IfType
;
// IEEE80211 标识网卡是无线网卡, 底层通信数据逻辑是特殊处理, 使用本机电脑进行验证过;
/* // 卡券dll自动签到的mac地址与 微信支付宝优先使用无线网卡 签到地址不一致,导致 先支付宝签到 后 卡券自动签到 最后使用 微信支付宝支付 提示mac地址错误;
if ( IF_TYPE_IEEE80211 == pCurrAddresses->IfType ) {
if ( tmpMac != tmpFirstMac) {
tmpFirstMac = tmpMac;
}
break;
}
*/
break
;
}
if
(
tmpFirstMac
.
length
()
)
{
...
...
sbkpay/version.h
View file @
5095dd3d
...
...
@@ -3,7 +3,7 @@
#define VER_MAJOR 3
#define VER_MINOR 21
#define VER_REVISION
7
#define VER_REVISION
8
#define VER_BUILD 15
//! Convert version numbers to string
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment