修改打包不能读取配置问题

Author: lamborc

.gitignore

@@ -19,6 +19,7 @@
 *.tar.gz
 *.rar
 target
+out
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

config/nbs-conf.properties

@@ -6,5 +6,6 @@ nbs.client.merkle.root.hash=skjfhsafkdasfd
 
 nbs.client.profile.root=profile
 nbs.client.files.root=nbs
-
+nbs.client.im.topic.subworld =disabled
+nbs.client.i18n.home=zh_cn
 nbs.server.address=/ip4/127.0.0.1/tcp/5001

pom.xml

@@ -147,14 +147,13 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <assembleDirectory>${project.build.directory}/nbs</assembleDirectory>
+                    <assembleDirectory>${project.basedir}/out</assembleDirectory>
                     <repositoryLayout>flat</repositoryLayout>
                     <repositoryName>lib</repositoryName>
                     <binFolder>bin</binFolder>
                     <configurationDirectory>conf</configurationDirectory>
                     <configurationSourceDirectory>src/main/resources</configurationSourceDirectory>
                     <configurationDirectory>true</configurationDirectory>
-
                     <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
                     <encoding>UTF-8</encoding>
                     <logsDirectory>logs</logsDirectory>

src/main/java/UI/AppMainWindow.java

@@ -15,6 +15,7 @@
 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.RadomCharactersHelper;
@@ -260,13 +261,14 @@ private void initialize(){
      * 加载环境配置
      */
     private void loadEnv(){
+        logger.info("=====>>>>>>> NBS Chain Client4J ENV initializing......");
         Properties props = ConfigHelper.getEnv();
-        logger.info("ENV ============================>>");
+
         for(String k : props.stringPropertyNames()){
             String v = props.getProperty(k);
             logger.info(k+"="+v);
         }
-        logger.info("ENV ============================<<");
+
         /**
          * 初始化文件目录
          */
@@ -290,7 +292,9 @@ private void loadEnv(){
             SEFL_BASE = initCurrentPeerInfo();
         }
         SERVER_STAT = true;
-        logger.info("NBS Client Start success.");
+        String s = PropertyUtil.getProperty("PKUI_PANEL_ABOUT_LABEL");
+        logger.info(ConstantsUI.BUTTON_ICON_ROOT);
+        logger.info("=====>>>>>>> NBS Chain Client4J ENV initialized Success......");
     }
 
 
@@ -358,9 +362,6 @@ public void run() {
     }
 
 
-
-
-
     /**
      *
      * @param m

src/main/java/UI/ConstantsUI.java

@@ -1,5 +1,6 @@
 package UI;
 
+import com.nbs.tools.ConfigHelper;
 import com.nbs.tools.PropertyUtil;
 
 import javax.swing.*;
@@ -19,8 +20,7 @@ public class ConstantsUI {
      * 软件名称、版本
      */
     public final static String APP_NAME = "NBS Chain";
-    public final static String APP_VERSION = "v0.1";
-    public final static String CRLF_PANEL = "\\r\\n";
+
 
     public final static String ENTER_CHARACTER = "\n";
     public final static String WSPACE_CHARACTER4 = "        ";
@@ -56,8 +56,7 @@ public class ConstantsUI {
     /**
      * 图标路径
      */
-    public static final String BUTTON_ICON_ROOT = "/icon"+File.separator
-            +PropertyUtil.getProperty("nbs.button.dir","")+ File.separator;
+    public static final String BUTTON_ICON_ROOT = "/icon/zh_cn/";
 
     /**
      * 主图标
@@ -133,7 +132,8 @@ public class ConstantsUI {
             AppMainWindow.class.getResource("/icon/data.png"));
     public final static ImageIcon ICON_FILE_ENABLED = new ImageIcon(
             AppMainWindow.class.getResource("/icon/data_enabled.png"));
-    public final static ImageIcon ICON_FILE_LS = new ImageIcon(AppMainWindow.class.getResource(BUTTON_ICON_ROOT+"file_ls_normal.png"));
+
+    public final static ImageIcon ICON_FILE_LS = new ImageIcon(AppMainWindow.class.getResource("/icon/zh_cn/" +"file_ls_normal.png"));
     public final static ImageIcon ICON_FILE_LS_ENABLED = new ImageIcon(AppMainWindow.class.getResource(BUTTON_ICON_ROOT+"file_ls_enabled.png"));
     public final static ImageIcon ICON_FILE_LS_DISABLED = new ImageIcon(AppMainWindow.class.getResource(BUTTON_ICON_ROOT+"file_ls_disabled.png"));
 

src/main/java/UI/panel/fm/FilePanel.java

@@ -151,6 +151,7 @@ public void actionPerformed(ActionEvent e) {
                     }
                 } catch (IOException e1) {
                     e1.printStackTrace();
+                    logger.error("Query Hash",e1.getMessage());
                 }
 
             }

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

@@ -1,10 +1,7 @@
 package com.nbs.tools;
 
-import UI.ConstantsUI;
-import com.nbs.utils.FormatCnst;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.commons.lang3.time.DateUtils;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,7 +25,9 @@ public class ConfigHelper {
      * 系统当前路径
      */
     public final static String CURRENT_DIR = System.getProperty("user.dir");
+    public final static String OS_FILE_SEPARATOR = File.separator;
     public static final String CONF_ROOT = CURRENT_DIR + File.separator+"config" + File.separator;
+    private static final String CONF_FILE = "nbs-conf.properties";
     public static final String PROFILE_ROOT = CURRENT_DIR + File.separator+"profile" + File.separator;
     public static final String NBS_FILES_ROOT_PATH = CURRENT_DIR + File.separator +"nbs" + File.separator;
     public static final String NBS_FILES_IPFS_ROOT = NBS_FILES_ROOT_PATH + "ipfs"+  File.separator;
@@ -37,7 +36,7 @@ public class ConfigHelper {
      */
     public static final String NBS_TEMP_ROOT = NBS_FILES_ROOT_PATH + "_temp" + File.separator;
     public static final String NBS_CACHE_AVATAR_ROOT_PATH = NBS_FILES_ROOT_PATH +"cache"+ File.separator+ "avatar" + File.separator;
-    private static final String CONF_FILE = "nbs-conf.properties";
+
 
     public static final String PK_CFG_IPFS_ADDR = "nbs.server.address";
     private static final String CLIENT_ADD_FILE_ROOT = "nbs.client.merkle.root";
@@ -49,13 +48,13 @@ public class ConfigHelper {
     public static String JSON_AVATAR_NAME_KEY = "avatar-name";
     public static String JSON_AVATAR_SUFFIX_KEY = "suffix";
 
-
     private static Properties env = new Properties();
+    private static Properties i18nProps = new Properties();
     static {
         InputStream is = null;
         try{
             is = new BufferedInputStream(new FileInputStream(
-                    CnstTools.PROPS_ROOT_PATH + CONF_FILE));
+                    CONF_ROOT + CONF_FILE));
             env.load(is);
             is.close();
         }catch (IOException ioe){
@@ -67,6 +66,18 @@ public class ConfigHelper {
                 }
             }
         }
+        if(is != null)is=null;
+        /**
+         * i18n
+         */
+        try{
+            is = new BufferedInputStream(new FileInputStream(
+                    CONF_ROOT + "zh-cn.properties"));
+            i18nProps.load(is);
+            is.close();
+        }catch (Exception e){
+            logger.error("load i18n config error.");
+        }
     }
 
     /**
@@ -196,4 +207,40 @@ public static boolean storeClientAddFileRootHash(String hash,String comments) th
     public static String getAddLogFileName(){
         return env.getProperty("nbs.client.merkle.add.log.name","");
     }
+
+    /**
+     * 控制显示会员
+     * @return
+     */
+    public static boolean subWorldPeers(){
+        String stats = env.getProperty("nbs.client.im.topic.subworld","enabled");
+        return(stats.equalsIgnoreCase("enabled")
+                || stats.equalsIgnoreCase("true")
+                || stats.equalsIgnoreCase("1")
+        )  ? true : false;
+    }
+
+    public static String getI18nResourceHome(){
+        String i18nHome = env.getProperty("nbs.client.i18n.home","zh_cn");
+        return OS_FILE_SEPARATOR+"icon"+OS_FILE_SEPARATOR+i18nHome+OS_FILE_SEPARATOR;
+    }
+
+    /**
+     *
+     * @param key
+     * @return
+     */
+    public static String getI18nProperty(String key){
+        return i18nProps.getProperty(key);
+    }
+
+    /**
+     *
+     * @param key
+     * @param defaultVal
+     * @return
+     */
+    public static String getI18nProperty(String key,String defaultVal){
+        return i18nProps.getProperty(key,defaultVal);
+    }
 }

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

@@ -17,9 +17,6 @@
  * All rights reserved.
  */
 public class PropertyUtil {
-
-
-
     /**
      * @Date    : 2018/6/13 15:49
      * @Author  : lanbery
@@ -35,6 +32,7 @@ public static String getProperty(String key){
 
             InputStream in = new BufferedInputStream(
                     new FileInputStream(ConfigHelper.CONF_ROOT+"zh-cn.properties"));
+            System.out.println(ConfigHelper.CONF_ROOT+"zh-cn.properties");
             props.load(in);
             String v = props.getProperty(key);
             return v;

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

@@ -155,7 +155,12 @@ private List<ContactsEntity> getContacts(){
         IPFS ipfs = IPFSHelper.getInstance().getIpfs();
 
         try {
-            Object obj = ipfs.pubsub.peers();
+            Object obj = null;
+            if(ConfigHelper.subWorldPeers()){
+                obj = ipfs.pubsub.peers(IPFSHelper.NBSWORLD_IMS_TOPIC);
+            }else {
+                obj = ipfs.pubsub.peers();
+            }
             if(obj==null)return contacts;
             List<String> peers = (List<String>)JSONParser.getValue(obj,"Strings");
             if(peers!=null&&peers.size()>0){