Merge pull request #303 from Jzow/master

Fix menu sorting disorder
eairps · Mar 19, 2024 · 8782a9d · 8782a9d
2 parents cf74480 + 33c16e1
commit 8782a9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/api/src/main/resources/application-dev.yml b/core/api/src/main/resources/application-dev.yml
@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/wansenerp_v2?useUnicode=true&characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://localhost:3306/wansenerp?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: PaSsw0Rd
+    password: passw0rd
     dynamic:
       druid:
         max-wait: 60000

diff --git a/core/service/src/main/kotlin/com/wansenai/service/system/impl/SysMenuServiceImpl.kt b/core/service/src/main/kotlin/com/wansenai/service/system/impl/SysMenuServiceImpl.kt
@@ -172,6 +172,7 @@ open class SysMenuServiceImpl(
                         val menuVo = menuVoBuilder.build()
                         menuVos.add(menuVo)
                     }
+                    menuVos.sortBy { it.sort }
                 }
                 menuData["total"] = menuVos.size
                 menuData["data"] = menuVos