From 1a449d6e84c477052497b4728da914796f3b701d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 23 Oct 2024 09:21:14 +0800
Subject: [PATCH] 'commit'

---
 dsRes/pom.xml                                 |  7 ++++++
 .../Base/Controller/BaseController.java       |  4 ++--
 .../com/dsideal/resource/Test/testDb.java     | 22 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/dsRes/pom.xml b/dsRes/pom.xml
index d48537d6..242bef82 100644
--- a/dsRes/pom.xml
+++ b/dsRes/pom.xml
@@ -185,6 +185,13 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.17.2</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.18.0</version>
+        </dependency>
+
         <!--引用ssh+sftp组件-->
         <!-- https://mvnrepository.com/artifact/com.github.mwiede/jsch -->
         <dependency>
diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
index 16ba7416..1115a224 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java
@@ -288,9 +288,9 @@ public class BaseController extends Controller {
      * @param scheme_id 版本ID
      */
     @Before({GET.class})
-    @JwtCheckInterface({})
+    //@JwtCheckInterface({})
     public void fetchStructure(int scheme_id) {
         List<Record> list = bm.fetchStructure(scheme_id, -1);
-        renderJson(RetKit.renderSuccess("成功", list, null, 1, 99999, list.size()));
+        renderJson(RetKit.renderSuccess("成功", list, "list", 1, 99999, list.size()));
     }
 }
diff --git a/dsRes/src/main/java/com/dsideal/resource/Test/testDb.java b/dsRes/src/main/java/com/dsideal/resource/Test/testDb.java
index 1e8cf7d6..4686a016 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Test/testDb.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Test/testDb.java
@@ -1,16 +1,26 @@
 package com.dsideal.resource.Test;
 
+import com.dsideal.resource.Base.Model.BaseModel;
 import com.dsideal.resource.Plugin.YamlProp;
 import com.dsideal.resource.ResApplication;
+import com.dsideal.resource.Util.RetKit;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.jfinal.kit.Prop;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;
+import com.jfinal.plugin.activerecord.Record;
 
 import java.io.File;
+import java.util.List;
+import java.util.Map;
 
 public class testDb {
-    public static void main(String[] args) {
+    public static void main(String[] args) throws JsonProcessingException {
         //加载配置文件
         String configFile = "application_dev.yaml";
         Prop PropKit = new YamlProp(configFile);
@@ -35,6 +45,16 @@ public class testDb {
         }
         masterArp.start();
 
+        BaseModel bm = new BaseModel();
+        List<Record> list = bm.fetchStructure(1, -1);
+        System.out.println(list);
 
+
+        Map<String, Object> map = RetKit.renderSuccess("成功", list, null, 1, 99999, list.size());
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.registerModule(new JavaTimeModule()); // 注册 JavaTimeModule
+        mapper.enable(SerializationFeature.INDENT_OUTPUT); // 启用美化输出
+        String jsonString = mapper.writeValueAsString(map);
+        System.out.println(jsonString);
     }
 }