水印第一步，info_domain_image

application/api/controller/Topicdongtai.php

@@ -354,7 +354,7 @@ class Topicdongtai extends Api
             ->join('user_wallet uw','user.id = uw.user_id','LEFT')
             ->field('dt.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute,uw.vip_endtime')
             ->where('dt.id',$id)->find();
-        $info = info_domain_image($info,['images','audio_file','avatar']);
+        $info = info_domain_image($info,['images','audio_file','avatar'], ['username'=>$info['username']]);
 
 
         if($info){
@@ -725,7 +725,10 @@ class Topicdongtai extends Api
             ->field('a.*,user.username,user.nickname,user.avatar,user.gender,user.birthday,user.attribute')
             ->join('user','a.user_id = user.id','LEFT')
             ->where(['a.id'=>$answer_id])->find();
-        $floor_info = info_domain_image($floor_info,['avatar']);
+        if(empty($floor_info)){
+            $this->success(1,[]);
+        }
+        $floor_info = info_domain_image($floor_info,['avatar'], ['username'=>$floor_info['username']]);
         $floor_info['createtime_text'] = get_last_time($floor_info['createtime']);
         //用户年龄
         $floor_info['age'] = birthtime_to_age($floor_info['birthday']);

application/api/controller/Usercenter.php

@@ -78,7 +78,7 @@ class Usercenter extends Api
         }
 
         //用户数据
-        $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
+        $userinfo = info_domain_image($userinfo,['avatar','photo_images'],['username'=>$userinfo['username']]);
         $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
 
         $new_data = [
@@ -154,7 +154,7 @@ class Usercenter extends Api
         }
 
         //用户数据
-        $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
+        $userinfo = info_domain_image($userinfo,['avatar','photo_images'],['username'=>$userinfo['username']]);
         $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
 
         $new_data = [

application/common.php

@@ -513,7 +513,7 @@ function info_domain_image($data,$field,$extend = []){
         if(in_array($key,$field)){
             $more = strpos($key,'images');
             $water_icon = false;
-            if($field == 'image' || $field == 'images'){
+            if($key == 'image' || $key == 'images' || $key == 'avatar' || $key == 'photo_images'){
                 $water_icon = true;
             }
             $data[$key] = one_domain_image($val,$more,$extend,$water_icon);

application/common/library/Auth.php

@@ -644,7 +644,7 @@ class Auth
         $userinfo = array_merge($userinfo, Token::get($this->_token));
 
         //
-        $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
+        $userinfo = info_domain_image($userinfo,['avatar','photo_images'],['username'=>$this->username]);
 
         $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$this->id)->find();