Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add query string for avatars forcely

Browse Source
This commit is contained in:
printempw 2016-11-18 17:24:13 +08:00
parent 7004ab627c
commit 58a2e10c0a
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/AdminController.php
View File

@ -70,7 +70,6 @@ class AdminController extends Controller
$cache = Option::form('cache', '缓存相关配置', function($form) $cache = Option::form('cache', '缓存相关配置', function($form)
{ {
$form->checkbox('avatar_query_string', '头像缓存', '为头像添加 Query String');
$form->checkbox('auto_detect_asset_url', '资源地址', '自动判断资源文件地址')->hint('根据当前 URL 自动加载资源文件。如果出现 CDN 回源问题请关闭'); $form->checkbox('auto_detect_asset_url', '资源地址', '自动判断资源文件地址')->hint('根据当前 URL 自动加载资源文件。如果出现 CDN 回源问题请关闭');
$form->checkbox('return_200_when_notfound', 'HTTP 响应码', '请求不存在的角色时返回 200 而不是 404'); $form->checkbox('return_200_when_notfound', 'HTTP 响应码', '请求不存在的角色时返回 200 而不是 404');

6
app/helpers.php
View File

@ -42,11 +42,7 @@ if (! function_exists('avatar')) {
function avatar(App\Models\User $user, $size) function avatar(App\Models\User $user, $size)
{ {
$fname = base64_encode($user->email).".png"; $fname = base64_encode($user->email).".png?tid=".$user->getAvatarId();
if (Option::get('avatar_query_string') == "1") {
$fname .= '?v='.$user->getAvatarId();
}
return url("avatar/$size/$fname"); return url("avatar/$size/$fname");
} }

3
config/options.php
View File

@ -3,7 +3,7 @@
* @Author: printempw * @Author: printempw
* @Date: 2016-07-29 11:53:11 * @Date: 2016-07-29 11:53:11
* @Last Modified by: printempw * @Last Modified by: printempw
* @Last Modified time: 2016-11-06 11:53:30 * @Last Modified time: 2016-11-18 17:00:05
*/ */
return [ return [
@ -27,7 +27,6 @@ return [
'private_score_per_storage' => '10', 'private_score_per_storage' => '10',
'score_per_player' => '100', 'score_per_player' => '100',
'sign_after_zero' => '0', 'sign_after_zero' => '0',
'avatar_query_string' => '0',
'version' => '', 'version' => '',
'check_update' => '1', 'check_update' => '1',
'update_source' => 'nyavm', 'update_source' => 'nyavm',

4
resources/views/user/closet.tpl
View File

@ -40,11 +40,11 @@
</div> </div>
</ul> </ul>
<div class="tab-content no-padding"> <div class="tab-content no-padding">
<div class="chart tab-pane active box-body" id="skin-category"> <div class="tab-pane active box-body" id="skin-category">
@include('vendor.closet-items', ['items' => $items['skin']]) @include('vendor.closet-items', ['items' => $items['skin']])
</div> </div>
<div class="chart tab-pane box-body" id="cape-category"> <div class="tab-pane box-body" id="cape-category">
@include('vendor.closet-items', ['items' => $items['cape']]) @include('vendor.closet-items', ['items' => $items['cape']])
</div> </div>
</div> </div>

4
resources/views/vendor/closet-items.tpl vendored
View File

@ -9,9 +9,9 @@
</p> </p>
<a href="{{ url('skinlib/show?tid='.$item->tid) }}" title="{{ trans('user.closet.view') }}" class="more" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-share"></i></a> <a href="{{ url('skinlib/show?tid='.$item->tid) }}" title="{{ trans('user.closet.view') }}" class="more" data-toggle="tooltip" data-placement="bottom"><i class="fa fa-share"></i></a>
<span title="{{ trans('user.closet.more') }}" class="more" data-toggle="dropdown" aria-haspopup="true" id="share-button"><i class="fa fa-cog"></i></span> <span title="{{ trans('user.closet.more') }}" class="more" data-toggle="dropdown" aria-haspopup="true" id="more-button"><i class="fa fa-cog"></i></span>
<ul class="dropdown-menu" aria-labelledby="share-button"> <ul class="dropup dropdown-menu" aria-labelledby="more-button">
<li><a href="javascript:renameClosetItem({{ $item->tid }});">{{ trans('user.closet.rename.title') }}</a></li> <li><a href="javascript:renameClosetItem({{ $item->tid }});">{{ trans('user.closet.rename.title') }}</a></li>
<li><a href="javascript:removeFromCloset({{ $item->tid }});">{{ trans('user.closet.remove.title') }}</a></li> <li><a href="javascript:removeFromCloset({{ $item->tid }});">{{ trans('user.closet.remove.title') }}</a></li>
<li><a href="javascript:setAsAvatar({{ $item->tid }});">{{ trans('user.closet.set-avatar') }}</a></li> <li><a href="javascript:setAsAvatar({{ $item->tid }});">{{ trans('user.closet.set-avatar') }}</a></li>