Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
meibuyu-common
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
without authentication
meibuyu-common
Commits
ff6fc8ba
Commit
ff6fc8ba
authored
Sep 11, 2024
by
Administrator
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '0911_app_operate_log_optimize_qjk' into 'master'
操作人 ID 和 操作人名称取值兼容 See merge request
!5
parents
02863d7d
b0070261
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
AppOperateLogService.php
src/GlobalLog/AppOperateLogService.php
+8
-2
No files found.
src/GlobalLog/AppOperateLogService.php
View file @
ff6fc8ba
...
...
@@ -115,10 +115,16 @@ class AppOperateLogService
string
$remark
=
''
)
:
bool
{
$user
=
[];
try
{
$user
=
Auth
::
user
();
}
catch
(
\Exception
$e
)
{
//报错直接忽略
}
return
$this
->
addOperateLog
(
make
(
RequestInterface
::
class
)
->
header
(
'hwq-request-id'
,
''
),
Auth
::
id
()
??
0
,
Auth
::
user
()[
'name'
]
??
''
,
!
empty
(
$param
[
'operator_user_id'
])
?
$param
[
'operator_user_id'
]
:
(
$user
[
'id'
]
??
0
)
,
!
empty
(
$param
[
'operator_user_name'
])
?
$param
[
'operator_user_name'
]
:
(
$user
[
'name'
]
??
''
)
,
$this
->
getClientIp
(),
make
(
RequestInterface
::
class
)
->
url
(),
$tableName
,
...
...
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