规划调整目录结构

Author: lamborc

conf/.merkle

@@ -0,0 +1,11 @@
+#add nbs1.0.rar
+#Tue Jun 26 18:13:02 CST 2018
+QmdNQYHjg2d6PKsXu5DSRWJHPUgSMVqWttAAp3bqaHq2Z8=Girls-Gee-\u300Aoh\u300B.mp3
+Qmc5QhR1WeUhGW12tT3WND3qxfLRmnci1PYjogjGy56X3n=Monica.mp3
+QmWuoJzhZkMjEe9ybfFeaSn6jDzTgvPd6UkC6RLZUbZVyf=NBS.jpg
+QmfK5QwVKDod3Bwjdmcgyf1qGxEzmGayfSSFTcv4BxxRXR=nbs.rp
+QmQD445aW3Ge6bgD6Lv9RJG48WfveAMgXket15GYsuysYb=nbs.rp
+QmeLUM8e8WRKBLsRp3Pme39yiTz4nTMGURm7unUQbrWhCn=\u5FAE\u4FE1\u56FE\u7247_20180608230516.jpg
+QmNgp7Lt1JYRiWYVpzV7s8nUxeHgScudkSbn36p8HmySAY=nbs1.0.rar
+QmW4dKs2KXqCWc9TQXzSc41HTNBPtFJJf7crwSbLGkQmVa=nbs64.png
+QmfFhhc1Woo4hE5d14jBPdotng7j9vx6UA4My8Xk597Di8=nbs1.0.rar

conf/logo.png

@@ -82,10 +82,10 @@
     <build>
         <finalName>nbs-client4j1.0</finalName>
         <resources>
-<!--            <resource>
-                <directory>${project.basedir}/config/**</directory>
-                <targetPath>${project.build.outputDirectory}/config</targetPath>
-            </resource>-->
+            <resource>
+                <directory>conf/**</directory>
+                <targetPath>${build.outputDirectory}/</targetPath>
+            </resource>
         </resources>
         <plugins>
             <plugin>
@@ -98,7 +98,30 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-xmls</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/out/bin/conf</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/conf</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -148,12 +171,12 @@
                 </executions>
                 <configuration>
                     <assembleDirectory>${project.basedir}/out</assembleDirectory>
-                    <repositoryLayout>flat</repositoryLayout>
+                    <repositoryLayout>default</repositoryLayout>
                     <repositoryName>lib</repositoryName>
                     <binFolder>bin</binFolder>
+                    <copyConfigurationDirectory>true</copyConfigurationDirectory>
                     <configurationDirectory>conf</configurationDirectory>
                     <configurationSourceDirectory>src/main/resources</configurationSourceDirectory>
-                    <configurationDirectory>true</configurationDirectory>
                     <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
                     <encoding>UTF-8</encoding>
                     <logsDirectory>logs</logsDirectory>

config/nbs-conf.properties conf/nbs-conf.propertiesconfig/nbs-conf.properties renamed to conf/nbs-conf.properties

@@ -1,11 +0,0 @@
-#add nbs1.0.rar
-#Tue Jun 26 18:13:02 CST 2018
-QmdNQYHjg2d6PKsXu5DSRWJHPUgSMVqWttAAp3bqaHq2Z8=Girls-Gee-\u300Aoh\u300B.mp3
-Qmc5QhR1WeUhGW12tT3WND3qxfLRmnci1PYjogjGy56X3n=Monica.mp3
-QmWuoJzhZkMjEe9ybfFeaSn6jDzTgvPd6UkC6RLZUbZVyf=NBS.jpg
-QmfK5QwVKDod3Bwjdmcgyf1qGxEzmGayfSSFTcv4BxxRXR=nbs.rp
-QmQD445aW3Ge6bgD6Lv9RJG48WfveAMgXket15GYsuysYb=nbs.rp
-QmeLUM8e8WRKBLsRp3Pme39yiTz4nTMGURm7unUQbrWhCn=\u5FAE\u4FE1\u56FE\u7247_20180608230516.jpg
-QmNgp7Lt1JYRiWYVpzV7s8nUxeHgScudkSbn36p8HmySAY=nbs1.0.rar
-QmW4dKs2KXqCWc9TQXzSc41HTNBPtFJJf7crwSbLGkQmVa=nbs64.png
-QmfFhhc1Woo4hE5d14jBPdotng7j9vx6UA4My8Xk597Di8=nbs1.0.rar

profile/nbs.db conf/nbs.dbprofile/nbs.db renamed to conf/nbs.db

@@ -114,6 +114,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));
         EventQueue.invokeLater(
                 new Runnable() {
                     @Override
@@ -164,7 +166,7 @@ private void loadWorldControllerListener(ImPeersService service){
         AtomicInteger size = new AtomicInteger(0);
         new Thread(()->{
             logger.info("Start up the World Controller Message........");
-            IPFS worldIpfs = new IPFS(ConfigHelper.getIpfsAddress());
+            IPFS worldIpfs = new IPFS(ConfigHelper.getInstance().getIpfsAddress());
             while (true){
                 try{
                     TimeUnit.MILLISECONDS.sleep(100);
@@ -262,8 +264,7 @@ private void initialize(){
      */
     private void loadEnv(){
         logger.info("=====>>>>>>> NBS Chain Client4J ENV initializing......");
-        Properties props = ConfigHelper.getEnv();
-
+        Properties props = ConfigHelper.getInstance().getEnv();
         for(String k : props.stringPropertyNames()){
             String v = props.getProperty(k);
             logger.info(k+"="+v);