Commit e4359fdd authored by liuyuzhen's avatar liuyuzhen

Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

parents 21c608e3 9d29eac2
...@@ -57,12 +57,12 @@ class MemberModel extends \DAO\AbstractModel ...@@ -57,12 +57,12 @@ class MemberModel extends \DAO\AbstractModel
$file=$basePath.$memberPath.$fileName; $file=$basePath.$memberPath.$fileName;
if(file_exists($file)){ if(file_exists($file)){
if($fileName=='member_avatar_26.jpg'){ if($fileName=='member_avatar_26.jpg'){
Log::getInstance()->write($file,"/data/log/test"); Log::getInstance()->write($file.'1',"/data/log/test");
} }
$avatar=\Our\Common::getStaticFile($fileName, \Our\ImageConst::memberAvatar); $avatar=\Our\Common::getStaticFile($fileName, \Our\ImageConst::memberAvatar);
}else{ }else{
if($fileName=='member_avatar_26.jpg'){ if($fileName=='member_avatar_26.jpg'){
Log::getInstance()->write($file,"/data/log/test"); Log::getInstance()->write($file.'2',"/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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment