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
a1e93427
Commit
a1e93427
authored
Oct 23, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz
parents
b98e5fb4
fa4d6606
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
Member.php
application/models/DAO/Member.php
+6
-2
No files found.
application/models/DAO/Member.php
View file @
a1e93427
...
@@ -56,10 +56,14 @@ class MemberModel extends \DAO\AbstractModel
...
@@ -56,10 +56,14 @@ class MemberModel extends \DAO\AbstractModel
$fileName
=
Common
::
format
(
ImageConst
::
memberAvatarPrefix
.
"
{
0
}
"
.
'.jpg'
,
$memberId
);
$fileName
=
Common
::
format
(
ImageConst
::
memberAvatarPrefix
.
"
{
0
}
"
.
'.jpg'
,
$memberId
);
$file
=
$basePath
.
$memberPath
.
$fileName
;
$file
=
$basePath
.
$memberPath
.
$fileName
;
if
(
file_exists
(
$file
)){
if
(
file_exists
(
$file
)){
Log
::
getInstance
()
->
write
(
$file
,
"/data/log/test"
);
if
(
$fileName
==
'member_avatar_26.jpg'
){
Log
::
getInstance
()
->
write
(
$file
,
"/data/log/test"
);
}
$avatar
=
\Our\Common
::
getStaticFile
(
$fileName
,
\Our\ImageConst
::
memberAvatar
);
$avatar
=
\Our\Common
::
getStaticFile
(
$fileName
,
\Our\ImageConst
::
memberAvatar
);
}
else
{
}
else
{
Log
::
getInstance
()
->
write
(
$file
,
"/data/log/test"
);
if
(
$fileName
==
'member_avatar_26.jpg'
){
Log
::
getInstance
()
->
write
(
$file
,
"/data/log/test"
);
}
$memerAvatar
=
$this
->
getInfo
(
$memberId
,
'member_avatar'
);
$memerAvatar
=
$this
->
getInfo
(
$memberId
,
'member_avatar'
);
$avatar
=
$this
->
getMemberAvatarUrl
(
$memberId
,
$memerAvatar
);
$avatar
=
$this
->
getMemberAvatarUrl
(
$memberId
,
$memerAvatar
);
}
}
...
...
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