diff --git a/client/package.json b/client/package.json index 17cf3aa..7764286 100644 --- a/client/package.json +++ b/client/package.json @@ -44,7 +44,6 @@ "vuetify-loader": "^1.7.0" }, "gitHooks": { - "pre-commit": "lint-staged" }, "lint-staged": { "*.{js,jsx,vue}": [ diff --git a/client/vue.config.js b/client/vue.config.js index 3307119..2792c79 100644 --- a/client/vue.config.js +++ b/client/vue.config.js @@ -14,4 +14,5 @@ module.exports = { transpileDependencies: [ 'vuetify', ], + lintOnSave: false, }; diff --git a/deploy/Caddyfile b/deploy/Caddyfile new file mode 100644 index 0000000..8f8333e --- /dev/null +++ b/deploy/Caddyfile @@ -0,0 +1,20 @@ +:8000 { + log { + output file /var/log/caddy/team00.log + } + + @not_api { + not { + path /api/* + } + file { + try_files {path} {path}/ /index.html + } + } + + root * /usr/share/caddy/team00/dist + file_server + encode zstd gzip + rewrite @not_api {http.matchers.file.relative} + reverse_proxy /api/* localhost:8800 +} diff --git a/task04.md b/task04.md index f8d4636..599039d 100644 --- a/task04.md +++ b/task04.md @@ -146,10 +146,10 @@ rsync -avzh --delete --exclude=*.pyc --exclude=.venv --exclude=.idea --exclude=. 该命令将后端代码目录同步至远程服务器中。登录到远程服务器,在用户主目录下将看到`bluewhale`文件夹, 其中为后端代码。参考课程[task00](./task00.md)中环境搭建-后端服务的部分,初始化后端项目db及用户。 -最终运行时,指定监听的端口(**端口号由助教提供**): +最终运行时,运行下列命令(PORT已在环境变量中指定): ```shell - python manage.py runserver 127.0.0.1:8800 +python manage.py runserver 127.0.0.1:$PORT ``` ## 同步前端代码