diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 72538b41f..0a17dbde2 100755 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -127,7 +127,7 @@ class IndexController extends InvokeController /** * 头像 - * @return \Psr\Http\Message\StreamInterface + * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response */ public function avatar() { @@ -148,7 +148,7 @@ class IndexController extends InvokeController } // $avatar = new InitialAvatar(); - return $avatar->name($name) + $content = $avatar->name($name) ->size($size) ->color($color) ->background($background) @@ -156,6 +156,12 @@ class IndexController extends InvokeController ->autoFont() ->generate() ->stream('png', 100); + // + return response($content) + ->header('Pragma', 'public') + ->header('Cache-Control', 'max-age=1814400') + ->header('Content-type', 'image/png') + ->header('Expires', gmdate('D, d M Y H:i:s \G\M\T', time() + 1814400)); } /** diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 38c50ecd4..e25bf1973 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -60,11 +60,6 @@ server { proxy_pass http://service; } - location =/avatar { - expires 30d; - proxy_pass http://service; - } - location @laravels { proxy_http_version 1.1; proxy_set_header Connection ""; diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index e5296f82f..4908cc012 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -48,7 +48,6 @@ export default { const {ret, data, msg} = result; if (ret === -1 && params.checkRole !== false) { //身份丢失 - state.userId = 0; $A.modalError({ content: msg, onOk: () => {