Update banner. Fix lwm2m transport jks config path

5 years ago · 29f64d9380
2 changed files with 7 additions and 5 deletions
--- a/application/src/main/resources/banner.txt
+++ b/application/src/main/resources/banner.txt
@ -1,8 +1,8 @@
-  ______    __      _                              __                                __
- /_  __/   / /_    (_)   ____    ____ _   _____   / /_   ____   ____ _   _____  ____/ /
-  / /     / __ \  / /   / __ \  / __ `/  / ___/  / __ \ / __ \ / __ `/  / ___/ / __  /
- / /     / / / / / /   / / / / / /_/ /  (__  )  / /_/ // /_/ // /_/ /  / /    / /_/ /
-/_/     /_/ /_/ /_/   /_/ /_/  \__, /  /____/  /_.___/ \____/ \__,_/  /_/     \__,_/
+  ______    __      _                              ____                               __
+ /_  __/   / /_    (_)   ____    ____ _   _____   / __ )  ____   ____ _   _____  ____/ /
+  / /     / __ \  / /   / __ \  / __ `/  / ___/  / __  | / __ \ / __ `/  / ___/ / __  /
+ / /     / / / / / /   / / / / / /_/ /  (__  )  / /_/ / / /_/ // /_/ /  / /    / /_/ /
+/_/     /_/ /_/ /_/   /_/ /_/  \__, /  /____/  /_____/  \____/ \__,_/  /_/     \__,_/
                              /____/

 ===================================================
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/lwm2m/LwM2MTransportConfigServer.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/lwm2m/LwM2MTransportConfigServer.java
@ -207,6 +207,8 @@ public class LwM2MTransportConfigServer {
            FULL_FILE_PATH = Paths.get(BASE_DIR_PATH.replaceAll("bin$", ""));
        } else if (BASE_DIR_PATH.endsWith("conf")) {
            FULL_FILE_PATH = Paths.get(BASE_DIR_PATH.replaceAll("conf$", ""));
+        } else if (BASE_DIR_PATH.endsWith("application")) {
+            FULL_FILE_PATH = Paths.get(BASE_DIR_PATH.substring(0, BASE_DIR_PATH.length() - "application".length()));
        } else {
            FULL_FILE_PATH = Paths.get(BASE_DIR_PATH);
        }