Pre Merge pull request !422 from root/N/A

Signed-off-by: root <15907907+xuezhihongg@user.noreply.gitee.com>

docker/nginx/conf/nginx.conf

@@ -28,10 +28,9 @@ http {
             proxy_pass http://ruoyi-gateway:8080/;
         }
 
-        # 避免actuator暴露
+        # springdoc proxy
-        if ($uri ~ "/actuator") {
+        location~^/v3/api-docs/(.*){
-            return 403;
+            proxy pass http://localhost:8080/v3/api-docs/$1;
-        }
 
         error_page   500 502 503 504  /50x.html;
         location = /50x.html {

ruoyi-ui/src/layout/components/AppMain.vue

@@ -53,12 +53,19 @@ export default {
   overflow: hidden;
 }
 
+.fixed-header + .app-main {
+  overflow-y: auto;
+  scrollbar-gutter: auto;
+  height: calc(100vh - 50px);
+  min-height: 0px;
+}
+
 .app-main:has(.copyright) {
   padding-bottom: 36px;
 }
 
 .fixed-header + .app-main {
-  padding-top: 50px;
+  margin-top: 50px;
 }
 
 .hasTagsView {
@@ -68,19 +75,14 @@ export default {
   }
 
   .fixed-header + .app-main {
-    padding-top: 84px;
+    margin-top: 84px;
+    height: calc(100vh - 84px);
+    min-height: 0px;
   }
 }
 </style>
 
 <style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 6px;
-  }
-}
-
 ::-webkit-scrollbar {
   width: 6px;
   height: 6px;

ruoyi-ui/src/layout/index.vue

@@ -77,6 +77,11 @@ export default {
     }
   }
 
+  .main-container:has(.fixed-header) {
+    height: 100vh;
+    overflow: hidden;
+  }
+
   .drawer-bg {
     background: #000;
     opacity: 0.3;