Pre Merge pull request !402 from mashuo/springboot3

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm

@@ -2,7 +2,7 @@ package ${packageName}.controller;
 
 import java.util.List;
 import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

ruoyi-ui/package.json

@@ -5,9 +5,9 @@
   "author": "若依",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
+    "build:prod": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "build:stage": "vue-cli-service build --mode staging",
+    "build:stage": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -25,7 +25,7 @@
     z-index: 1001;
     overflow: hidden;
     -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 
     // reset element-ui css
     .horizontal-collapse-transition {

ruoyi-ui/src/components/HeaderSearch/index.vue

@@ -15,6 +15,7 @@
         @input="querySearch"
         prefix-icon="Search"
         placeholder="菜单搜索，支持标题、URL模糊查询"
+        clearable
       >
       </el-input>
       <el-scrollbar wrap-class="right-scrollbar-wrapper">

ruoyi-ui/src/components/TopNav/index.vue

@@ -57,7 +57,7 @@ export default {
       this.routers.map((menu) => {
         if (menu.hidden !== true) {
           // 兼容顶部栏一级菜单内部跳转
-          if (menu.path === "/") {
+          if (menu.path === '/' && menu.children) {
             topMenus.push(menu.children[0]);
           } else {
             topMenus.push(menu);

ruoyi-ui/src/views/login.vue

@@ -176,6 +176,7 @@ export default {
   background: #ffffff;
   width: 400px;
   padding: 25px 25px 5px 25px;
+  z-index: 1;
   .el-input {
     height: 38px;
     input {