水印，全部改回

application/api/controller/Pay.php

@@ -19,7 +19,7 @@ class Pay extends Api
         $data['vipconfig'] = $list;
         $data['vip_endtime'] = model('wallet')->getWallet($this->auth->id,'vip_endtime');
         $data['is_vip'] = $data['vip_endtime'] > time() ? 1 : 0;
-        $data['avatar'] = localpath_to_netpath($this->auth->avatar,['nickname'=>$this->auth->nickname],true);
+        $data['avatar'] = localpath_to_netpath($this->auth->avatar);
         $this->success('success',$data);
     }
 

application/api/controller/Payios.php

@@ -19,7 +19,7 @@ class Payios extends Api
         $data['vipconfig'] = $list;
         $data['vip_endtime'] = model('wallet')->getWallet($this->auth->id,'vip_endtime');
         $data['is_vip'] = $data['vip_endtime'] > time() ? 1 : 0;
-        $data['avatar'] = localpath_to_netpath($this->auth->avatar,['nickname'=>$this->auth->nickname],true);
+        $data['avatar'] = localpath_to_netpath($this->auth->avatar);
         $this->success('success',$data);
     }
 

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'], ['username'=>$info['username']]);
+        $info = info_domain_image($info,['images','audio_file','avatar']);
 
 
         if($info){
@@ -728,7 +728,7 @@ class Topicdongtai extends Api
         if(empty($floor_info)){
             $this->success(1,[]);
         }
-        $floor_info = info_domain_image($floor_info,['avatar'], ['username'=>$floor_info['username']]);
+        $floor_info = info_domain_image($floor_info,['avatar']);
         $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'],['username'=>$userinfo['username']]);
+        $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
         $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'],['username'=>$userinfo['username']]);
+        $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
         $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
 
         $new_data = [

application/common.php

@@ -492,38 +492,33 @@ function list_birthday_age($list){
     }
     return $list;
 }
-
 //结果集信息里，多个字段需要增加domain_cdnurl
-function list_domain_image($list,$field,$extend = []){
+function list_domain_image($list,$field){
     if(!$list || empty($list)){
         return $list;
     }
     foreach($list as $vo => $info){
-        $list[$vo] = info_domain_image($info,$field,$extend);
+        $list[$vo] = info_domain_image($info,$field);
     }
     return $list;
 }
 //单条信息里,多个字段需要增加domain_cdnurl
 //支持image,images
-function info_domain_image($data,$field,$extend = []){
+function info_domain_image($data,$field){
     if(!$data || empty($data)){
         return $data;
     }
     foreach($data as $key => $val){
         if(in_array($key,$field)){
             $more = strpos($key,'images');
-            $water_icon = false;
-            if($key == 'image' || $key == 'images' || $key == 'avatar' || $key == 'photo_images'){
-                $water_icon = true;
-            }
-            $data[$key] = one_domain_image($val,$more,$extend,$water_icon);
+            $data[$key] = one_domain_image($val,$more);
         }
     }
     return $data;
 }
 //支持单个字段，需要增加domain_cdnurl
 //支持image,images
-function one_domain_image($one,$more = false,$extend = [],$water_icon = false){
+function one_domain_image($one,$more = false){
     if(!$one){
         return $one;
     }
@@ -531,35 +526,23 @@ function one_domain_image($one,$more = false,$extend = [],$water_icon = false){
         //逗号隔开的多个图片
         $one = explode(',',$one);
         foreach($one as $k => $v){
-            $one[$k] = localpath_to_netpath($v,$extend,$water_icon);
+            $one[$k] = localpath_to_netpath($v);
         }
         $one = implode(',',$one);
     }else{
-        $one = localpath_to_netpath($one,$extend,$water_icon);
+        $one = localpath_to_netpath($one);
     }
     return $one;
 }
 //本地地址转换为网络地址
-function localpath_to_netpath($path,$extend = [],$water_icon = false)
+function localpath_to_netpath($path)
 {
-    //水印参数
-    $water_param = '';
-    if($water_icon == true){
-        $username = isset($extend['username']) ? $extend['username'] : 'Tken';
-        $water_param = water_param($username);
-    }
-
-    //
     if (empty($path)) {
         return '';
     } elseif (strrpos($path, 'http') !== false) {
-        if(strrpos($path, 'https://oss.tken.vip') !== false) {
-            return $path.$water_param;  //oss的才加水印参数
-        }else{
-            return $path;
-        }
+        return $path;
     } else {
-        return config('domain_cdnurl') . str_replace("\\", "/", $path).$water_param; //加水印
+        return config('domain_cdnurl') . str_replace("\\", "/", $path);
     }
 }
 

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'],['username'=>$this->username]);
+        $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
 
         $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$this->id)->find();