From 625cd9e93182bf74a35283867672d9b72c2d5d7c Mon Sep 17 00:00:00 2001 From: mubai <1609539827@qq.com> Date: Sun, 21 Apr 2024 22:35:57 +0800 Subject: [PATCH] depoly mode update --- README.md | 5 ++--- client/vite.config.ts | 3 ++- film/README.md | 10 ++++++++-- film/docker-compose.yml | 8 ++++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index ff73879..cbea9e1 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,8 @@ >新增内容: > ->- 新增PC端播放链接测试页, 可通过右下角工具栏进入: [播放测试](http://1.94.30.26:3600/custom/player) ->- 修复手机端轮播图滑动切换后无法自动播放的问题 ->- 轮播图海报改用第三方图床进行存储 +>- 新增详细部署说明文档, 以及 `1Panel部署方式` , [点击查看](https://blog.mubai.link/2024/04/21/Docs/gofilm/) +>- 修复`docker-compose.yml` 文件中的书写格式问题, 添加容器重启策略 ## 目录结构 diff --git a/client/vite.config.ts b/client/vite.config.ts index 354b3df..dc8ef85 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -12,7 +12,8 @@ export default defineConfig({ port: 3600, proxy: { "/api": { - target: `http://127.0.0.1:3601`, + // target: `http://127.0.0.1:3601`, + target: `http://1.94.30.26:3601`, changeOrigin: true, // 允许跨域 rewrite: path => path.replace(/^\/api/, '') } diff --git a/film/README.md b/film/README.md index 98a91c4..84e4ed0 100644 --- a/film/README.md +++ b/film/README.md @@ -30,9 +30,15 @@ film > >可自行将根目录下的server和client内容与此目录下的对应文件进行替换 -## 2. 程序构建运行 +## 2. 程序部署 -### 1. 环境准备 +>安装说明: +> +>- 新增 1Panel 安装方式(类似于宝塔, 宝塔要注册且下载很慢, 所以后续应该也不会出宝塔安装) +>- Readme文件内容保持简洁, 所以详细安装说明放到GithubPage的博客页了 +>- 完整的详细安装文档请前往个人博客页查看: [GoFilm安装文档](https://blog.mubai.link/2024/04/21/Docs/gofilm/) + +### 1. 环境准备 (Docker) 1. Linux 服务器 2. 安装 docker, docker compose 服务 diff --git a/film/docker-compose.yml b/film/docker-compose.yml index 0f35ab1..5756585 100644 --- a/film/docker-compose.yml +++ b/film/docker-compose.yml @@ -4,8 +4,9 @@ services: nginx: container_name: film_nginx image: nginx + restart: always ports: - - "80:80" + - 80:80 volumes: - /opt/film/data/nginx/html:/usr/share/nginx/html - /opt/film/data/nginx/nginx.conf:/etc/nginx/nginx.conf @@ -20,6 +21,7 @@ services: build: context: . dockerfile: Dockerfile + restart: always environment: MYSQL_HOST: mysql MYSQL_PORT: 3661 @@ -29,7 +31,7 @@ services: REDIS_HOST: redis REDIS_PORT: 3662 ports: - - "3601:3601" + - 3601:3601 networks: - film-network depends_on: @@ -42,6 +44,7 @@ services: mysql: container_name: film_mysql image: mysql + restart: always ports: - 3610:3306 environment: @@ -62,6 +65,7 @@ services: redis: container_name: film_redis image: redis + restart: always ports: - 3620:6379 volumes: