增加图片处理

Author: lamborc

conf/nbs.db

@@ -81,7 +81,12 @@
             <artifactId>android.nine.patch</artifactId>
             <version>1.0</version>
         </dependency>
-
+        <!-- https://mvnrepository.com/artifact/com.miglayout/miglayout-swing -->
+        <dependency>
+            <groupId>com.miglayout</groupId>
+            <artifactId>miglayout-swing</artifactId>
+            <version>5.1</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -199,7 +204,7 @@
                     <repositoryLayout>flat</repositoryLayout>
                     <repositoryName>lib</repositoryName>
                     <binFolder>bin</binFolder>
-                    <copyConfigurationDirectory>true</copyConfigurationDirectory>
+                    <copyConfigurationDirectory>false</copyConfigurationDirectory>
                     <configurationDirectory>resources</configurationDirectory>
                     <configurationSourceDirectory>src/main/resources</configurationSourceDirectory>
                     <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>

pom.xml

@@ -12,16 +12,14 @@
 import com.nbs.entity.PeerInfoBase;
 import com.nbs.ipfs.IPFSHelper;
 import com.nbs.ipfs.entity.IpfsMessage;
-import com.nbs.tools.ConfigHelper;
 import com.nbs.tools.PropertyUtil;
 import com.nbs.ui.frames.MainFrameOld;
-import UI.common.Base64CodecUtil;
+import io.nbs.commons.utils.Base64CodecUtil;
+import io.nbs.commons.helper.ConfigurationHelper;
 import io.nbs.commons.utils.BaseURLUtil;
 import io.nbs.commons.helper.RadomCharactersHelper;
 import io.ipfs.api.IPFS;
 import io.ipfs.api.JSONParser;
-import io.ipfs.api.MerkleNode;
-import io.ipfs.api.NamedStreamable;
 import io.ipfs.multihash.Multihash;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -112,6 +110,7 @@ public class AppMainWindow {
      * 联系人缓存
      */
     public static Map<String,ContactsItem> peerItems = new HashMap<>();
+    private ConfigurationHelper configurationHelper;
 
     public static void main(String[] args){
         String basedir = System.getProperty("app.home");
@@ -143,7 +142,7 @@ public void run() {
      * @throws
      */
     public AppMainWindow(){
-
+        configurationHelper = ConfigurationHelper.getInstance();
         initialize();
         //订阅世界消息
        // subCtrlWorld();
@@ -166,7 +165,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.getInstance().getIpfsAddress());
+            IPFS worldIpfs = new IPFS(ConfigurationHelper.getInstance().getIPFSAddress());
             while (true){
                 try{
                     TimeUnit.MILLISECONDS.sleep(100);
@@ -266,27 +265,27 @@ private void loadEnv(){
         logger.info(BaseURLUtil.getAppBaseDir());
         logger.info(BaseURLUtil.getAppJarPath());
         logger.info("=====>>>>>>> NBS Chain Client4J ENV initializing......");
-        Properties props = ConfigHelper.getInstance().getEnv();
+        Properties props = ConfigurationHelper.getInstance().getCfgProps();
         for(String k : props.stringPropertyNames()){
             String v = props.getProperty(k);
             logger.info(k+"="+v);
         }
 
-        /**
+/*        *//**
          * 初始化文件目录
-         */
-        File ipfsDir = new File(ConfigHelper.NBS_FILES_IPFS_ROOT);
+         *//*
+        File ipfsDir = new File(AppGlobalCnst.consturactPath(AppGlobalCnst.NBS_ROOT));
         if(ipfsDir.isDirectory()&& !ipfsDir.exists()){
             ipfsDir.mkdirs();
         }
 
-        /**
+        *//**
          * 初始化
-         */
-        File f = new File(ConfigHelper.NBS_CACHE_AVATAR_ROOT_PATH);
+         *//*
+        File f = new File(configurationHelper.);
         if(!f.exists()){
             f.mkdirs();
-        }
+        }*/
 
         /**
          * 构造id SELF
@@ -308,10 +307,10 @@ public void initAvatar(){
         try {
             String avatarHash,suffix,fileName;
             Map cfgMap = ipfs.config.show();
-            if(cfgMap.containsKey(ConfigHelper.JSON_AVATAR_KEY)&&cfgMap.containsKey(ConfigHelper.JSON_AVATAR_SUFFIX_KEY)){
+            if(cfgMap.containsKey(ConfigurationHelper.JSON_AVATAR_KEY)&&cfgMap.containsKey(ConfigurationHelper.JSON_AVATAR_SUFFIX_KEY)){
                 //
             }else {
-                File defaultAvatarImage = new File(ConfigHelper.PROFILE_ROOT+ "defaults/nbs.png");
+               /* File defaultAvatarImage = new File(ConfigurationHelper.PROFILE_ROOT+ "defaults/nbs.png");
                 if(!defaultAvatarImage.exists()||defaultAvatarImage.isDirectory())return;
                 fileName = defaultAvatarImage.getName();
                 suffix = fileName.substring(fileName.lastIndexOf("."));
@@ -330,6 +329,7 @@ public void initAvatar(){
                 }
                 SEFL_BASE.setAvatarHash(avatarHash);
                 SEFL_BASE.setAvatarSuffix(suffix);
+                */
             }
         } catch (IOException e) {
             e.printStackTrace();
@@ -402,7 +402,7 @@ private void safeAndFreshIM(ContactsItem item){
             @Override
             public void run() {
                 //TODO save sqlite
-                String headRootPath = ConfigHelper.NBS_CACHE_AVATAR_ROOT_PATH;
+                String headRootPath = ".nbs";
                 try {
                     if(StringUtils.isNotBlank(item.getAvatar())){
                         FileOutputStream fos ;
@@ -515,7 +515,7 @@ private static String _getNickName(){
         String tempNick = RadomCharactersHelper.getInstance().generated("NBSChain_",6);
         try {
             Map cfgMap = ipfs.config.show();
-            if(cfgMap.containsKey(ConfigHelper.JSON_NICKNAME_KEY)){
+           /* if(cfgMap.containsKey(ConfigHelper.JSON_NICKNAME_KEY)){
                 Object no = cfgMap.get(ConfigHelper.JSON_NICKNAME_KEY);
                 if(no!=null&&no.toString().trim().length()<=0){
                     Map res = ipfs.config.set(ConfigHelper.JSON_NICKNAME_KEY,tempNick);
@@ -526,7 +526,8 @@ private static String _getNickName(){
             }else {
                 Map res = ipfs.config.set(ConfigHelper.JSON_NICKNAME_KEY,tempNick);
                 return tempNick;
-            }
+            }*/
+           return null;
         } catch (IOException e) {
             logger.error("GET NICKNAME ERROR :",e.getMessage());
             return null;
@@ -550,11 +551,11 @@ private static String getPeerId(){
     }
 
 
-    /**-------------------------------------------------*/
-    /**
+   /* *//**-------------------------------------------------*//*
+    *//**
      * 订阅世界主题
      * 控制
-     */
+     *//*
     private void subCtrlWorld(){
         new Thread(new Runnable() {
             @Override
@@ -568,5 +569,5 @@ public void run() {
                 }
             }
         }).start();
-    }
+    }*/
 }

src/main/java/UI/AppMainWindow.java

@@ -1,6 +1,5 @@
 package UI;
 
-import com.nbs.tools.ConfigHelper;
 import com.nbs.tools.PropertyUtil;
 
 import javax.swing.*;

src/main/java/UI/ConstantsUI.java

@@ -2,8 +2,8 @@
 
 import UI.ConstantsUI;
 import io.nbs.client.ui.components.NBSIconButton;
-import com.nbs.tools.ConfigHelper;
 import com.nbs.tools.PropertyUtil;
+import io.nbs.commons.helper.ConfigurationHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -203,7 +203,7 @@ public void actionPerformed(ActionEvent e) {
                 try {
                     java.net.URI uri = java.net.URI.create(site);
                     java.awt.Desktop desktop = java.awt.Desktop.getDesktop();
-                    String v =ConfigHelper.getInstance().getIpfsAddress();
+                    String v =ConfigurationHelper.getInstance().getIPFSAddress();
                     logger.info(v);
                     if(desktop.isSupported(Desktop.Action.BROWSE)){
                             desktop.browse(uri);
@@ -224,12 +224,12 @@ public void actionPerformed(ActionEvent e) {
             @Override
             public void actionPerformed(ActionEvent e) {
                 logger.info(">>>>NBS TEST BUTTON.");
-                try {
+  /*              try {
                     ConfigHelper.getInstance().storeClientAddFileRootHash("skjfhsafkdasfd","TEST");
                     logger.info(ConfigHelper.getInstance().getClientAddFileRootHash());
                 } catch (IOException e1) {
                     e1.printStackTrace();
-                }
+                }*/
             }
         });
     }

src/main/java/UI/panel/about/AboutPanel.java

@@ -1,8 +1,8 @@
 package com.nbs.ipfs;
 
-import com.nbs.tools.ConfigHelper;
-import UI.common.Base64CodecUtil;
+import io.nbs.commons.utils.Base64CodecUtil;
 import io.ipfs.api.IPFS;
+import io.nbs.commons.helper.ConfigurationHelper;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,7 +37,7 @@ public class IPFSHelper {
     public static final String NBSWORLD_IMS_TOPIC = Base64CodecUtil.encode("nbsio.net");
 
     public IPFSHelper() {
-        ipfs = new IPFS(ConfigHelper.getInstance().getIpfsAddress());
+        ipfs = new IPFS(ConfigurationHelper.getInstance().getIPFSAddress());
         try {
             Map m = ipfs.id();
             secMap.putAll(m);
@@ -62,7 +62,7 @@ public static IPFSHelper getInstance(){
      * @return
      */
     public IPFS rebuild(){
-        ipfs = new IPFS(ConfigHelper.getInstance().getIpfsAddress());
+        ipfs = new IPFS(ConfigurationHelper.getInstance().getIPFSAddress());
         return ipfs;
     }
 
@@ -100,7 +100,7 @@ private int getRadom(int len){
     public String updateNick(String nick) throws IOException {
         if(ipfs==null||StringUtils.isBlank(nick))return null;
         nick = nick.trim();
-        ipfs.config.set(ConfigHelper.JSON_NICKNAME_KEY,nick);
+        ipfs.config.set(ConfigurationHelper.JSON_NICKNAME_KEY,nick);
         return nick;
     }