From b14c53b81d004ea35036ed0db3a64079a215bedc Mon Sep 17 00:00:00 2001
From: huoyo <1729913829@qq.com>
Date: Sun, 7 May 2023 10:41:28 +0800
Subject: [PATCH] update dynamic properties

---
 src/main/java/cn/langpy/kotime/config/LoadConfig.java       | 3 +++
 .../java/cn/langpy/kotime/controller/KoTimeController.java  | 3 +++
 .../resources/META-INF/spring-configuration-metadata.json   | 6 ++++++
 src/main/resources/kotime-en.html                           | 2 +-
 src/main/resources/kotime.html                              | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/langpy/kotime/config/LoadConfig.java b/src/main/java/cn/langpy/kotime/config/LoadConfig.java
index 318ef14..e105128 100644
--- a/src/main/java/cn/langpy/kotime/config/LoadConfig.java
+++ b/src/main/java/cn/langpy/kotime/config/LoadConfig.java
@@ -143,6 +143,9 @@ public class LoadConfig {
             Map<String, String> dynamicProperties = Context.getDynamicProperties();
             while ((line = reader.readLine()) != null) {
                 line = line.trim();
+                if (line.length()==0 || line.startsWith("#") || line.startsWith("//")) {
+                    continue;
+                }
                 int i = line.indexOf("=");
                 if (i<1) {
                     continue;
diff --git a/src/main/java/cn/langpy/kotime/controller/KoTimeController.java b/src/main/java/cn/langpy/kotime/controller/KoTimeController.java
index 655b3cd..088d2d4 100644
--- a/src/main/java/cn/langpy/kotime/controller/KoTimeController.java
+++ b/src/main/java/cn/langpy/kotime/controller/KoTimeController.java
@@ -397,6 +397,9 @@ public class KoTimeController {
         Map<String, String> dynamicProperties = Context.getDynamicProperties();
         for (String line : textSplit) {
             line = line.trim();
+            if (line.length()==0 || line.startsWith("#") || line.startsWith("//")) {
+                continue;
+            }
             int i = line.indexOf("=");
             if (i<1) {
                 continue;
diff --git a/src/main/resources/META-INF/spring-configuration-metadata.json b/src/main/resources/META-INF/spring-configuration-metadata.json
index 427b752..35a662b 100644
--- a/src/main/resources/META-INF/spring-configuration-metadata.json
+++ b/src/main/resources/META-INF/spring-configuration-metadata.json
@@ -223,6 +223,12 @@
       "type": "java.lang.Boolean",
       "defaultValue": false,
       "description": "to enable email"
+    },
+    {
+      "name": "ko-time.property-file",
+      "type": "java.lang.String",
+      "defaultValue": "dynamic.properties",
+      "description": "dynamic properties"
     }
   ],
   "hints": []
diff --git a/src/main/resources/kotime-en.html b/src/main/resources/kotime-en.html
index eaba05d..d7b1e93 100644
--- a/src/main/resources/kotime-en.html
+++ b/src/main/resources/kotime-en.html
@@ -850,7 +850,7 @@
             </li>
             <li>
                 <div class="uk-card uk-card-default uk-card-body" style="border-radius: 5px">
-                    <textarea id="dynamicText" class="uk-textarea" placeholder="" style="overflow-y: auto;height: 65%;resize: none"></textarea>
+                    <textarea id="dynamicText" class="uk-textarea" placeholder="" wrap="off" style="overflow-y: auto;height: 65%;resize: none;overflow-x: auto;"></textarea>
                     <br>
                     <br>
                     <button type="button"  onclick="updateDynamicProperties();" style="width: 100%;background-color: #19985d;border-radius: 5px"  class="uk-button uk-button-primary uk-width-1-1 uk-margin-small-bottom">OK</button>
diff --git a/src/main/resources/kotime.html b/src/main/resources/kotime.html
index 9f34fef..77b7358 100644
--- a/src/main/resources/kotime.html
+++ b/src/main/resources/kotime.html
@@ -841,7 +841,7 @@
             </li>
             <li>
                 <div class="uk-card uk-card-default uk-card-body" style="border-radius: 5px">
-                    <textarea id="dynamicText" class="uk-textarea" placeholder="" style="overflow-y: auto;height: 65%;resize: none"></textarea>
+                    <textarea id="dynamicText" class="uk-textarea" placeholder="" wrap="off"  style="overflow-y: auto;height: 65%;resize: none;overflow-x: auto"></textarea>
                     <br>
                     <br>
                     <button type="button"  onclick="updateDynamicProperties();" style="width: 100%;background-color: #19985d;border-radius: 5px"  class="uk-button uk-button-primary uk-width-1-1 uk-margin-small-bottom">更新</button>