规划调整目录结构

Author: lamborc

pom.xml

@@ -86,6 +86,9 @@
                 <directory>conf/**</directory>
                 <targetPath>${build.outputDirectory}/</targetPath>
             </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
         </resources>
         <plugins>
             <plugin>
@@ -171,11 +174,11 @@
                 </executions>
                 <configuration>
                     <assembleDirectory>${project.basedir}/out</assembleDirectory>
-                    <repositoryLayout>default</repositoryLayout>
+                    <repositoryLayout>flat</repositoryLayout>
                     <repositoryName>lib</repositoryName>
                     <binFolder>bin</binFolder>
                     <copyConfigurationDirectory>true</copyConfigurationDirectory>
-                    <configurationDirectory>conf</configurationDirectory>
+                    <configurationDirectory>resources</configurationDirectory>
                     <configurationSourceDirectory>src/main/resources</configurationSourceDirectory>
                     <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
                     <encoding>UTF-8</encoding>

src/main/java/UI/AppMainWindow.java

@@ -13,11 +13,10 @@
 import com.nbs.ipfs.IPFSHelper;
 import com.nbs.ipfs.entity.IpfsMessage;
 import com.nbs.tools.ConfigHelper;
-
-import com.nbs.tools.DateHelper;
 import com.nbs.tools.PropertyUtil;
 import com.nbs.ui.frames.MainFrame;
 import com.nbs.utils.Base64CodecUtil;
+import com.nbs.utils.BaseURLUtil;
 import com.nbs.utils.RadomCharactersHelper;
 import io.ipfs.api.IPFS;
 import io.ipfs.api.JSONParser;
@@ -114,8 +113,8 @@ public class AppMainWindow {
     public static Map<String,ContactsItem> peerItems = new HashMap<>();
 
     public static void main(String[] args){
-        String basedir = System.getProperty("user.dir");
-        System.out.println(System.getProperty("nbs.client.root",basedir));
+        String basedir = System.getProperty("app.home");
+        System.out.println("nbs-client-dir>>>>>>>>>>"+basedir);
         EventQueue.invokeLater(
                 new Runnable() {
                     @Override
@@ -204,7 +203,7 @@ private void loadWorldControllerListener(ImPeersService service){
      * 初始化frame内容
      */
     private void initialize(){
-        logger.info("NBS initializing start ...");
+        logger.info("NBS Client start ...");
         loadEnv();
         try {
             UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
@@ -255,14 +254,16 @@ private void initialize(){
 
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         //frame.pack();
-        logger.info("NBS initialized ...");
+        logger.info("NBS start complete ...");
 
     }
 
     /**
      * 加载环境配置
      */
     private void loadEnv(){
+        logger.info(BaseURLUtil.getAppBaseDir());
+        logger.info(BaseURLUtil.getAppJarPath());
         logger.info("=====>>>>>>> NBS Chain Client4J ENV initializing......");
         Properties props = ConfigHelper.getInstance().getEnv();
         for(String k : props.stringPropertyNames()){

src/main/java/com/nbs/tools/ConfigHelper.java

@@ -76,7 +76,7 @@ private void initLoadEnv(){
                 stats=1;
             }
         }catch (IOException ioe){
-            logger.error("load config error.%s",ioe.getMessage());
+            logger.error("load config error.{}",ioe.getMessage());
             if(is!=null){
                 try {
                     is.close();
@@ -99,7 +99,7 @@ private void initLoadI18n(){
                 stats=2;
             }
         }catch (IOException ioe){
-            logger.error("load i18n error.%s",ioe.getMessage());
+            logger.error("load i18n error.{}",ioe.getMessage());
             if(is!=null){
                 try {
                     is.close();

src/main/java/com/nbs/utils/BaseURLUtil.java

@@ -0,0 +1,46 @@
+package com.nbs.utils;
+
+import org.springframework.util.Base64Utils;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @Package : com.nbs.utils
+ * @Description : <p></p>
+ * @Author : lambor.c
+ * @Date : 2018/6/28-15:53
+ * Copyright (c) 2018, NBS , lambor.c<[email protected]>.
+ * All rights reserved.
+ */
+public class BaseURLUtil {
+
+    private static File getJarFile(){
+        String jarPath = BaseURLUtil.class.getProtectionDomain().getCodeSource().getLocation().getFile();
+        try {
+            jarPath = java.net.URLDecoder.decode(jarPath,"UTF-8");
+        } catch (UnsupportedEncodingException e) {
+
+        }
+        return new File(jarPath);
+    }
+
+    public static String getAppJarPath(){
+        return getJarFile().getParent();
+    }
+
+    public static String getAppBaseDir(){
+       if(getJarFile().getParentFile().getName().equalsIgnoreCase("lib")){
+           return getJarFile().getParentFile().getParentFile().getParent();
+       }else {
+           return getJarFile().getParentFile().getParent();
+       }
+    }
+
+    public static void main(String[] args){
+        System.out.println(getJarFile().getAbsolutePath());
+        System.out.println(getAppJarPath());
+        System.out.println(getAppBaseDir());
+        System.out.println(">>>>>>>>>>..");
+    }
+}

src/main/resources/db.properties

@@ -1,2 +1,2 @@
 jdbc.driverClassName = org.sqlite.JDBC
-jdbc.url = jdbc:sqlite:./conf/nbs.db
+jdbc.url = jdbc:sqlite:nbs.db