From 6970af50f521442dde5482bcf82b5fbf42df9a45 Mon Sep 17 00:00:00 2001 From: eee555 <2234208506@qq.com> Date: Tue, 14 May 2024 23:40:53 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=B8=8D=E8=83=BD=E6=94=B9?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E3=80=81=E6=9C=AA=E7=99=BB=E5=BD=95=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E8=AE=BF=E9=97=AE=E6=88=91=E7=9A=84=E5=9C=B0=E7=9B=98?= =?UTF-8?q?=E3=80=81=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back_end/saolei/article/views.py | 5 +- back_end/saolei/monitor/views.py | 2 +- back_end/saolei/msuser/views.py | 2 +- back_end/saolei/refresh_font_end.sh | 2 +- front_end/package-lock.json | 94 +++++++++++++++++++++++++++++ front_end/src/App.vue | 40 +++++++----- front_end/src/components/Login.vue | 9 +-- front_end/src/store/index.ts | 4 +- front_end/src/views/PlayerView.vue | 11 +--- 9 files changed, 135 insertions(+), 34 deletions(-) diff --git a/back_end/saolei/article/views.py b/back_end/saolei/article/views.py index 03c404c..47661e0 100644 --- a/back_end/saolei/article/views.py +++ b/back_end/saolei/article/views.py @@ -29,7 +29,10 @@ def update_list(request): if (request.user.is_staff or request.user.is_superuser) and request.method == 'GET': # if 1: - article_dir = settings.BASE_DIR / "assets" / 'article' + if settings.DEBUG: + article_dir = settings.BASE_DIR / "assets" / 'article' + else: + article_dir = os.path.join(settings.MEDIA_ROOT, 'assets/article') articles: List[str] = os.listdir(article_dir) # 先清空已有 while cache.llen("articles") > 0: diff --git a/back_end/saolei/monitor/views.py b/back_end/saolei/monitor/views.py index 6091fcd..7a9d71b 100644 --- a/back_end/saolei/monitor/views.py +++ b/back_end/saolei/monitor/views.py @@ -59,7 +59,7 @@ def get_capacity(request): if settings.DEBUG: video_size = get_dir_size(os.path.join(settings.BASE_DIR, 'assets/videos')) else: - video_size = get_dir_size(os.path.join(settings.MEDIA_ROOT, 'videos')) + video_size = get_dir_size(os.path.join(settings.MEDIA_ROOT, 'assets/videos')) # 内存占用情况 virtual = psutil.virtual_memory() return JsonResponse({"d_t": disk.total, "d_u": disk.used, "v": video_size, diff --git a/back_end/saolei/msuser/views.py b/back_end/saolei/msuser/views.py index 5dcb353..7ad95cd 100644 --- a/back_end/saolei/msuser/views.py +++ b/back_end/saolei/msuser/views.py @@ -167,7 +167,7 @@ def update_realname(request): @login_required(login_url='/') def update_avatar(request): if request.method == 'POST': - if request.user.userms.e_timems_std >= 200: + if request.user.userms.e_timems_std >= 200000: return JsonResponse({"status": 177, "msg": "只允许标准高级sub200的玩家修改头像和个性签名！"}) user_update_form = UserUpdateAvatarForm( data=request.POST, files=request.FILES, request=request) diff --git a/back_end/saolei/refresh_font_end.sh b/back_end/saolei/refresh_font_end.sh index 23be4e2..7627b60 100644 --- a/back_end/saolei/refresh_font_end.sh +++ b/back_end/saolei/refresh_font_end.sh @@ -13,7 +13,7 @@ git clone https://gitee.com/ee55/saolei_website_article.git cp -r saolei_website_article/* ./ rm -r .git rm LICENSE -rm -r /saolei_website_article +rm -r saolei_website_article cd .. cd .. diff --git a/front_end/package-lock.json b/front_end/package-lock.json index 6f6e02c..4e88e07 100644 --- a/front_end/package-lock.json +++ b/front_end/package-lock.json @@ -30,6 +30,7 @@ "uuid": "^9.0.0", "vue": "^3.2.13", "vue-echarts": "^6.7.1", + "vue-i18n": "^9.13.1", "vue-router": "^4.0.3", "vuex": "^4.1.0" }, @@ -426,6 +427,47 @@ "@hapi/hoek": "^9.0.0" } }, + "node_modules/@intlify/core-base": { + "version": "9.13.1", + "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.13.1.tgz", + "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==", + "dependencies": { + "@intlify/message-compiler": "9.13.1", + "@intlify/shared": "9.13.1" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/kazupon" + } + }, + "node_modules/@intlify/message-compiler": { + "version": "9.13.1", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.13.1.tgz", + "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==", + "dependencies": { + "@intlify/shared": "9.13.1", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/kazupon" + } + }, + "node_modules/@intlify/shared": { + "version": "9.13.1", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.13.1.tgz", + "integrity": "sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==", + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/kazupon" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.1.1", "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", @@ -8573,6 +8615,25 @@ "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==", "dev": true }, + "node_modules/vue-i18n": { + "version": "9.13.1", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.13.1.tgz", + "integrity": "sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==", + "dependencies": { + "@intlify/core-base": "9.13.1", + "@intlify/shared": "9.13.1", + "@vue/devtools-api": "^6.5.0" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/kazupon" + }, + "peerDependencies": { + "vue": "^3.0.0" + } + }, "node_modules/vue-loader": { "version": "17.0.1", "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-17.0.1.tgz", @@ -9712,6 +9773,29 @@ "@hapi/hoek": "^9.0.0" } }, + "@intlify/core-base": { + "version": "9.13.1", + "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.13.1.tgz", + "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==", + "requires": { + "@intlify/message-compiler": "9.13.1", + "@intlify/shared": "9.13.1" + } + }, + "@intlify/message-compiler": { + "version": "9.13.1", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.13.1.tgz", + "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==", + "requires": { + "@intlify/shared": "9.13.1", + "source-map-js": "^1.0.2" + } + }, + "@intlify/shared": { + "version": "9.13.1", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.13.1.tgz", + "integrity": "sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==" + }, "@jridgewell/gen-mapping": { "version": "0.1.1", "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", @@ -16098,6 +16182,16 @@ "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==", "dev": true }, + "vue-i18n": { + "version": "9.13.1", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.13.1.tgz", + "integrity": "sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==", + "requires": { + "@intlify/core-base": "9.13.1", + "@intlify/shared": "9.13.1", + "@vue/devtools-api": "^6.5.0" + } + }, "vue-loader": { "version": "17.0.1", "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-17.0.1.tgz", diff --git a/front_end/src/App.vue b/front_end/src/App.vue index c6056f8..2dbb8dd 100644 --- a/front_end/src/App.vue +++ b/front_end/src/App.vue @@ -1,30 +1,30 @@