From aaf7804c9a63e2e9d0d2bef5fab411c93ab9eeb0 Mon Sep 17 00:00:00 2001 From: Neal Caffery Date: Fri, 24 Nov 2023 19:20:03 +0800 Subject: [PATCH 1/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27b6a9a0..fa969dd9 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ For the usage of GShark, please refer to [wiki](https://github.com/madneal/gshar * Nginx * MySQL(version above **8.0**) -It's suggested to deploy the frontend project by nginx. Place the `dist` folder under `/var/www/html`, modify the `nginx.conf` to reverse proxy the backend service. For the detailed deployment videos, refer to [bilibili](https://www.bilibili.com/video/BV1Py4y1s7ap/) or [youtube](https://youtu.be/bFrKm5t4M54). For the deployment in windows, refer to [here](https://www.bilibili.com/video/BV1CA411L7ux/). +It's suggested to deploy the frontend project by nginx. Place the `dist` folder under `/var/www/html`, modify the `nginx.conf` (/etc/nginx/nginx.conf for linux) to reverse proxy the backend service. For the detailed deployment videos, refer to [bilibili](https://www.bilibili.com/video/BV1Py4y1s7ap/) or [youtube](https://youtu.be/bFrKm5t4M54). For the deployment in windows, refer to [here](https://www.bilibili.com/video/BV1CA411L7ux/). ### Nginx From c372f890600cc2f4511a65a40a411ad1d149dd74 Mon Sep 17 00:00:00 2001 From: Neal Caffery Date: Fri, 24 Nov 2023 19:43:01 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fa969dd9..c9d1e3f8 100644 --- a/README.md +++ b/README.md @@ -38,14 +38,44 @@ It's suggested to deploy the frontend project by nginx. Place the `dist` folder Modify the `nginx.conf`: ``` -location /api/ { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - rewrite ^/api/(.*)$ /$1 break; - proxy_pass http://127.0.0.1:8888; +// config the user accoring to your need +user www www; +worker_processes 1; + +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + server { + listen 8080; + server_name localhost; + + location / { + autoindex on; + root html; + index index.html index.htm; + } + location /api/ { + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + rewrite ^/api/(.*)$ /$1 break; + proxy_pass http://127.0.0.1:8888; + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } + include servers/*; } + ``` The deployment work is straightforward. Find the corresponding version zip file from [releases](https://github.com/madneal/gshark/releases). From dea01e3b92d81d1038b17b420cabd50606357234 Mon Sep 17 00:00:00 2001 From: Neal Caffery Date: Sun, 26 Nov 2023 18:36:59 +0800 Subject: [PATCH 3/3] Update sql.md --- sql.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sql.md b/sql.md index aad9c3ad..07c871be 100644 --- a/sql.md +++ b/sql.md @@ -1,4 +1,5 @@ ## v1.2.0 +``` create table gshark.task ( id bigint unsigned auto_increment @@ -17,10 +18,11 @@ create index idx_task_deleted_at on gshark.task (deleted_at); insert into sys_base_menus (created_at, updated_at, deleted_at, menu_level, parent_id, path, name, hidden, component, sort, keep_alive, default_menu, title, icon, close_tab) -values (current_timestamp, current_timestamp, null, 0, 24, 'task', 'task', 0, 'view/token/task.vue', 4, 0, 0, '任务管理', 's-flag', 0); +values (current_timestamp, current_timestamp, null, 0, 24, 'task', 'task', 0, 'view/task/task.vue', 4, 0, 0, '任务管理', 's-flag', 0); insert into casbin_rule (p_type, v0, v1, v2) values ('p', 888, '/task/getTaskList', 'GET'); insert into casbin_rule (p_type, v0, v1, v2) values ('p', 888, '/task/createTask', 'POST'); insert into casbin_rule (p_type, v0, v1, v2) values ('p', 888, '/task/switchTaskStatus', 'POST'); +``` ## v1.1.0