Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
8a1b431d
Commit
8a1b431d
authored
Dec 10, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试数据
parent
509bd5b5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Pay.php
application/library/Payment/Pay.php
+1
-1
application.ini
conf/application.ini
+2
-2
No files found.
application/library/Payment/Pay.php
View file @
8a1b431d
...
...
@@ -33,7 +33,7 @@ class Pay {
$orderInfo
=
$this
->
getOrder
(
$wxFlag
);
if
(
$data
[
'channel'
]
==
\Our\NameConst
::
wxAppChannel
){
$wxpay
=
WxPay
::
getInstance
();
unset
(
$orderInfo
[
'subMchId'
]);
//
unset($orderInfo['subMchId']);
$return
=
$wxpay
->
doPay
(
$orderInfo
);
}
else
if
(
$data
[
'channel'
]
==
\Our\NameConst
::
aliApiChannel
){
$alipay
=
Alipay
::
getInstance
();
...
...
conf/application.ini
View file @
8a1b431d
...
...
@@ -404,7 +404,7 @@ elastic.master.scheme="http";
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"127.0.0.1"
resources.database.params.port
=
3306
resources.database.params.database
=
"qmcs"
resources.database.params.database
=
"
test
qmcs"
resources.database.params.username
=
"root"
resources.database.params.password
=
"123456"
resources.database.params.charset
=
"UTF8"
...
...
@@ -414,7 +414,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"127.0.0.1"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.database
=
"
test
qmcs"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.password
=
"123456"
resources.database.slave.params.charset
=
"UTF8"
...
...
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