From 3a6e17be1250cc0ced085fad9fcab507fe73eb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 24 Sep 2024 11:43:29 +0800
Subject: [PATCH] 'commit'

---
 .../java/com/dsideal/resource/Menu/{ => Bean}/Menu.java  | 4 ++--
 .../java/com/dsideal/resource/Menu/{ => Bean}/Meta.java  | 4 ++--
 .../dsideal/resource/Menu/DatabaseToJsonConverter.java   | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename dsRes/src/main/java/com/dsideal/resource/Menu/{ => Bean}/Menu.java (77%)
 rename dsRes/src/main/java/com/dsideal/resource/Menu/{ => Bean}/Meta.java (77%)

diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Menu.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Menu.java
similarity index 77%
rename from dsRes/src/main/java/com/dsideal/resource/Menu/Menu.java
rename to dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Menu.java
index 835ec6c5..27d8a12f 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/Menu.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Menu.java
@@ -1,4 +1,4 @@
-package com.dsideal.resource.Menu;
+package com.dsideal.resource.Menu.Bean;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -8,7 +8,7 @@ import java.util.List;
 
 @Getter
 @Setter
-class Menu {
+public class Menu {
     private String path;
     private String name;
     private String component;
diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Meta.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Meta.java
similarity index 77%
rename from dsRes/src/main/java/com/dsideal/resource/Menu/Meta.java
rename to dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Meta.java
index 0b51d302..73e9856f 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/Meta.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Meta.java
@@ -1,11 +1,11 @@
-package com.dsideal.resource.Menu;
+package com.dsideal.resource.Menu.Bean;
 
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-class Meta {
+public class Meta {
     private String icon;
     private String title;
     private String isLink;
diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/DatabaseToJsonConverter.java b/dsRes/src/main/java/com/dsideal/resource/Menu/DatabaseToJsonConverter.java
index bd54b265..05935898 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/DatabaseToJsonConverter.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Menu/DatabaseToJsonConverter.java
@@ -1,6 +1,7 @@
 package com.dsideal.resource.Menu;
 
-import com.alibaba.fastjson.JSONObject;
+import com.dsideal.resource.Menu.Bean.Menu;
+import com.dsideal.resource.Menu.Bean.Meta;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jfinal.kit.Prop;
@@ -24,9 +25,8 @@ public class DatabaseToJsonConverter {
         ActiveRecordPlugin arp = new ActiveRecordPlugin(hp);
         arp.start();
 
-
-        List<Menu> rootMenu = fetchMenu(-1);  // 从父ID为null开始递归
-
+        List<Menu> rootMenu = fetchMenu(-1);  // 从父ID为-1开始递归
+        //输出JSON格式
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(rootMenu.getFirst());
         System.out.println(json);
@@ -39,7 +39,6 @@ public class DatabaseToJsonConverter {
 
         for (Record rs : list) {
             if (rs == null) return null;
-
             Menu sMenu = new Menu();
             String url = rs.getStr("url");
             sMenu.setPath(url);