Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
services
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
tencent
services
Commits
5a8dc32c
Commit
5a8dc32c
authored
Jun 01, 2020
by
王召彬
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ft-change_salesman' into test
parents
98e012c7
b33782fa
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
3 deletions
+16
-3
UPGRADE_2.x.md
+3
-0
src/Store/Lib/StoreInterface.php
+10
-0
src/V2/Common/ClsLogger/ClsLog.php
+1
-1
src/V2/Common/ClsLogger/LogHandler.php
+2
-2
No files found.
UPGRADE_2.x.md
View file @
5a8dc32c
# 2.0.64
-
修改sgo函数
# 2.0.63
# 2.0.63
-
增加流量平台支付枚举
-
增加流量平台支付枚举
...
...
src/Store/Lib/StoreInterface.php
View file @
5a8dc32c
...
@@ -221,4 +221,13 @@ interface StoreInterface
...
@@ -221,4 +221,13 @@ interface StoreInterface
*/
*/
public
function
getStoreCount
(
int
$startTime
,
int
$endTime
,
$edition
=
null
,
$oemId
=
0
);
public
function
getStoreCount
(
int
$startTime
,
int
$endTime
,
$edition
=
null
,
$oemId
=
0
);
/**
* 修改店铺的业务员id
*
* @param integer $oldSmId
* @param integer $newSmId
* @return integer
*/
public
function
changeSalesmanId
(
int
$oldSmId
,
int
$newSmId
);
}
}
\ No newline at end of file
src/V2/Common/ClsLogger/ClsLog.php
View file @
5a8dc32c
...
@@ -84,7 +84,7 @@ class ClsLog
...
@@ -84,7 +84,7 @@ class ClsLog
$logFile
=
\alias
(
'@runtime'
)
.
'/logs/'
.
$filename
;
$logFile
=
\alias
(
'@runtime'
)
.
'/logs/'
.
$filename
;
if
(
Co
::
id
()
>
0
)
{
if
(
Co
::
id
()
>
0
)
{
// 协程写
// 协程写
go
(
function
()
use
(
$logFile
,
$messageText
)
{
s
go
(
function
()
use
(
$logFile
,
$messageText
)
{
$res
=
Coroutine
::
writeFile
(
$logFile
,
$messageText
,
FILE_APPEND
);
$res
=
Coroutine
::
writeFile
(
$logFile
,
$messageText
,
FILE_APPEND
);
if
(
$res
===
false
)
{
if
(
$res
===
false
)
{
throw
new
\InvalidArgumentException
(
"Unable to append to log file:
{
$logFile
}
"
);
throw
new
\InvalidArgumentException
(
"Unable to append to log file:
{
$logFile
}
"
);
...
...
src/V2/Common/ClsLogger/LogHandler.php
View file @
5a8dc32c
...
@@ -84,7 +84,7 @@ class LogHandler extends AbstractProcessingHandler
...
@@ -84,7 +84,7 @@ class LogHandler extends AbstractProcessingHandler
if
(
$this
->
topicId
==
ClsLog
::
TOPICID_ERROR
)
{
if
(
$this
->
topicId
==
ClsLog
::
TOPICID_ERROR
)
{
if
(
Co
::
id
()
>
0
)
{
if
(
Co
::
id
()
>
0
)
{
go
(
function
()
use
(
$messageText
)
{
s
go
(
function
()
use
(
$messageText
)
{
ClsLog
::
error
(
$messageText
);
ClsLog
::
error
(
$messageText
);
});
});
}
else
{
}
else
{
...
@@ -92,7 +92,7 @@ class LogHandler extends AbstractProcessingHandler
...
@@ -92,7 +92,7 @@ class LogHandler extends AbstractProcessingHandler
}
}
}
else
if
(
$this
->
topicId
==
ClsLog
::
TOPICID_NOTICE
)
{
}
else
if
(
$this
->
topicId
==
ClsLog
::
TOPICID_NOTICE
)
{
if
(
Co
::
id
()
>
0
)
{
if
(
Co
::
id
()
>
0
)
{
go
(
function
()
use
(
$messageText
)
{
s
go
(
function
()
use
(
$messageText
)
{
ClsLog
::
notice
(
$messageText
);
ClsLog
::
notice
(
$messageText
);
});
});
}
else
{
}
else
{
...
...
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