diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2e193fb8e48fab7a252a3e2451b93d4090fe7a65..1671f3f7ddcdf9418c6bab93d99aa35289bf8013 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -81,7 +81,7 @@ jobs: username: ${{ secrets.SERVER_USERNAME }} password: ${{ secrets.SERVER_PASSWORD }} local: ./continew-admin-ui/dist - remote: /docker/continew-admin/web + remote: /docker/continew-admin/tmp # 6、重启前端服务 - name: Restart uses: appleboy/ssh-action@master @@ -91,4 +91,6 @@ jobs: username: ${{ secrets.SERVER_USERNAME }} password: ${{ secrets.SERVER_PASSWORD }} script: | + rm -rf /docker/continew-admin/web/* + mv /docker/continew-admin/tmp/* /docker/continew-admin/web docker restart nginx \ No newline at end of file diff --git a/continew-admin-ui/.env.production b/continew-admin-ui/.env.production index 3db1578deab14d3982e9c961ff6a956070b21ace..9880a663db265a719a10502bcdc6aac75d7417db 100644 --- a/continew-admin-ui/.env.production +++ b/continew-admin-ui/.env.production @@ -1 +1 @@ -VITE_API_BASE_URL= 'https://cnadmin.charles7c.top' \ No newline at end of file +VITE_API_BASE_URL= 'https://api.charles7c.top' \ No newline at end of file diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 3c47eda1d6a134b534bacb5ba86acf7ffb3be680..0a379f7e03a786d2b0577d2202d7fb4e2c1bc867 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -21,13 +21,48 @@ http { access_log /var/log/nginx/access.log main; + # 后端项目 upstream admin-server { ip_hash; server 172.17.0.1:18000; } server { - # listen 80; + listen 443 ssl; + server_name api.charles7c.top; + + # 证书直接存放 /docker/nginx/cert 目录下即可(更改证书名称即可,无需更改证书路径) + ssl on; + ssl_certificate /etc/nginx/cert/xxx.local.pem; # /etc/nginx/cert/ 为 docker 映射路径 不允许更改 + ssl_certificate_key /etc/nginx/cert/xxx.local.key; # /etc/nginx/cert/ 为 docker 映射路径 不允许更改 + ssl_session_timeout 5m; + ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + + location / { + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://admin-server/; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } + + # HTTP 请求 将转发到 HTTPS + server { + listen 80; + server_name api.charles7c.top; + rewrite ^ https://$http_host$request_uri? permanent; + } + + # 前端项目 + server { listen 443 ssl; server_name cnadmin.charles7c.top; @@ -49,14 +84,6 @@ http { error_page 405 =200 https://$host$request_uri; } - location ~*/(auth|captcha) { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE-HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://admin-server; - } - error_page 500 502 503 504 /50x.html; location = /50x.html { root html;