Skip to content

Commit 4dad632

Browse files
committed
fix: 将头像的存储位置改为相对路径
1 parent 9ae4738 commit 4dad632

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

app/api/cms/user.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
:copyright: © 2019 by the Lin team.
55
:license: MIT, see LICENSE for more details.
66
"""
7+
import os
78
from operator import and_
89

9-
from flask import jsonify
10+
from flask import jsonify, current_app
1011
from flask_jwt_extended import create_access_token, get_jwt_identity, get_current_user, \
1112
create_refresh_token, verify_jwt_refresh_token_in_request
1213
from lin.core import manager, route_meta, Log
@@ -97,6 +98,11 @@ def change_password():
9798
@login_required
9899
def get_information():
99100
current_user = get_current_user()
101+
site_domain = current_app.config.get('SITE_DOMAIN') if current_app.config.get(
102+
'SITE_DOMAIN') else "http://127.0.0.1:5000"
103+
if current_user.avatar is not None:
104+
current_user.avatar = site_domain + os.path.join(
105+
current_app.static_url_path, current_user.avatar)
100106
return jsonify(current_user)
101107

102108

app/extensions/file/local_uploader.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import os
2+
13
from flask import current_app
24
from werkzeug.utils import secure_filename
35

@@ -20,8 +22,8 @@ def upload(self):
2022
ret.append({
2123
"key": single.name,
2224
"id": exists.id,
23-
"url": site_domain + '/assets/' + exists.path,
24-
"path": exists.path
25+
"path": exists.path,
26+
"url": site_domain + os.path.join(current_app.static_url_path, exists.path)
2527
})
2628
else:
2729
absolute_path, relative_path, real_name = self._get_store_path(single.filename)
@@ -38,7 +40,7 @@ def upload(self):
3840
ret.append({
3941
"key": single.name,
4042
"id": file.id,
41-
"url": site_domain + '/assets/' + file.path,
42-
"path": file.path
43+
"path": file.path,
44+
"url": site_domain + os.path.join(current_app.static_url_path, exists.path)
4345
})
4446
return ret

0 commit comments

Comments
 (0)