From 95a046c2fe3ba8c2eca492e528d5e03a99bc6d21 Mon Sep 17 00:00:00 2001
From: stevenchen <stevenchen@stevenchendeMacBook-Air.local>
Date: Thu, 13 Jun 2024 10:53:38 +0800
Subject: [PATCH 1/2] add nginx config

Signed-off-by: stevenchen <stevenchen@stevenchendeMacBook-Air.local>
---
 docker_env/nginx/my-80.conf | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 docker_env/nginx/my-80.conf

diff --git a/docker_env/nginx/my-80.conf b/docker_env/nginx/my-80.conf
new file mode 100644
index 0000000..e50bdc4
--- /dev/null
+++ b/docker_env/nginx/my-80.conf
@@ -0,0 +1,29 @@
+server {
+    listen       80;
+    server_name localhost;
+    client_max_body_size 100M;
+    # 配置前端静态文件目录
+    location / {
+        index index.html index.htm;
+        root /usr/share/nginx/html;
+        try_files $uri $uri/ /index.html;
+    }
+
+    location ~ ^/api/ {
+        proxy_http_version 1.1;
+        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;
+        proxy_set_header X-Nginx-Proxy true;
+        set_real_ip_from 0.0.0.0/0;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_connect_timeout 600s;
+        proxy_read_timeout 600s;
+        proxy_send_timeout 600s;
+        real_ip_header X-Forwarded-For;
+        rewrite ^/api/(.*)$ /$1 break;  #重写
+        proxy_pass http://177.10.0.12:8000/; # 设置代理服务器的协议和地址
+     }
+ }

From e72f2ce01ce81e08aff659e256ba0ff0e9b7b27e Mon Sep 17 00:00:00 2001
From: 1638245306 <1638245306@qq.com>
Date: Fri, 21 Jun 2024 08:28:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/system/role/components/PermissionComNew/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/views/system/role/components/PermissionComNew/index.vue b/web/src/views/system/role/components/PermissionComNew/index.vue
index 6a8b599..058f5fc 100644
--- a/web/src/views/system/role/components/PermissionComNew/index.vue
+++ b/web/src/views/system/role/components/PermissionComNew/index.vue
@@ -24,7 +24,7 @@
               <el-checkbox v-model="menu.isCheck">页面显示权限</el-checkbox>
               <div class="pc-collapse-main">
                 <div class="pccm-item">
-                  <div class="menu-form-alert"> 配置操作功能点权限 </div>
+                  <div class="menu-form-alert"> 配置操作功能接口权限,配置数据权限点击小齿轮 </div>
                   <el-checkbox v-for="(btn, bIndex) in menu.btns" :key="bIndex" v-model="btn.isCheck"
                     :label="btn.value">
                     <div class="btn-item">