|
@@ -539,8 +539,8 @@ function one_domain_image($one,$more = false,$extend = []){
|
|
|
function localpath_to_netpath($path,$extend = [])
|
|
|
{
|
|
|
//水印参数
|
|
|
- $u_id = isset($extend['u_id']) ? $extend['u_id'] : 'Tken';
|
|
|
- $water_icon = water_icon($u_id);
|
|
|
+ $username = isset($extend['username']) ? $extend['username'] : 'Tken';
|
|
|
+ $water_icon = water_icon($username);
|
|
|
|
|
|
//
|
|
|
if (empty($path)) {
|
|
@@ -870,7 +870,7 @@ if (!function_exists('httpurllocal')) {
|
|
|
*/
|
|
|
function water_icon($username){
|
|
|
$shuiyin_img = 'kodo://tken'.config('site.shuiyin') ?: 'kodo://tken/logo.png';
|
|
|
- $username = $username ?: 'Tken';
|
|
|
+ $username = !empty($username) ? $username : 'Tken';
|
|
|
$param_str = '?watermark/3/image/'.base64_encode($shuiyin_img).'/dissolve/50/ws/0.1/wst/0/text/'.base64_encode('@'.$username).'/fontsize/300/dissolve/80/gravity/SouthWest/dx/20/dy/20/fill/'.base64_encode('#FFFFFF');
|
|
|
|
|
|
return $param_str;
|