From 3cd0622adb205a4316fa75cde071e5819ddce9af Mon Sep 17 00:00:00 2001
From: xiwa <xw2sy@163.com>
Date: Wed, 28 Feb 2024 22:36:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/iotkit/manager/service/ExampleDataInit.java | 14 +++++++++++---
 iot-starter/src/main/resources/application.yml     |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java
index 8e289e76..764e6b7d 100644
--- a/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java
+++ b/iot-module/iot-manager/src/main/java/cc/iotkit/manager/service/ExampleDataInit.java
@@ -47,6 +47,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -55,9 +56,12 @@ import java.util.TimerTask;
 @Service
 public class ExampleDataInit implements SmartInitializingSingleton {
 
-    @Value("${iita.init.data:true}")
+    @Value("${init.data.flag:true}")
     private boolean initDataFlg;
 
+    @Value("${init.data.path:.}")
+    private String initDataPath;
+
     @Autowired
     private IDbStructureData dbStructureData;
 
@@ -199,10 +203,14 @@ public class ExampleDataInit implements SmartInitializingSingleton {
         try {
             log.info("init {} data...", name);
             if (service.count() > 0) {
-                new RuntimeException("原数据库已存在" + name + "的旧数据，请清除后再重新初始化！").printStackTrace();
+                log.error("原数据库已存在" + name + "的旧数据，请清除后再重新初始化！系统正在退出。。。");
                 System.exit(0);
             }
-            String json = FileUtils.readFileToString(new File("./data/init/" + name + ".json"), StandardCharsets.UTF_8);
+            String path = initDataPath;
+            if (initDataPath.equals(".")) {
+                path = "./data/init";
+            }
+            String json = FileUtils.readFileToString(Paths.get(path, name + ".json").toFile(), StandardCharsets.UTF_8);
             List list = (List) JsonUtils.parseObject(json, type);
             for (Object obj : list) {
                 service.save((Id) obj);
diff --git a/iot-starter/src/main/resources/application.yml b/iot-starter/src/main/resources/application.yml
index 4a8e7cf3..75b0717c 100644
--- a/iot-starter/src/main/resources/application.yml
+++ b/iot-starter/src/main/resources/application.yml
@@ -205,3 +205,4 @@ plugin:
   mainPackage: cc.iotkit
   pluginPath:
     - ./data/plugins
+