增加图片处理

Author: lamborc

README.md

@@ -1 +1,6 @@
-# nbs-client-test
+# nbs-client-test
+
+## compile to jar command
+First make sure maven is properly installed
+command :
+mvn clean package appassembler:assemble -Dmaven.test.skip=true -X

conf/nbs-conf.properties

@@ -2,8 +2,6 @@
 #Thu Jun 21 11:59:01 CST 2018
 nbs.client.merkle.root=.merkleroot
 nbs.client.merkle.add.log.name=.merkle
-nbs.client.merkle.root.hash=skjfhsafkdasfd
-
 nbs.client.profile.root=profile
 nbs.client.files.root=nbs
 nbs.client.im.topic.subworld =disabled

conf/nbs.db

@@ -12,6 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <main-class>io.nbs.client.App</main-class>
         <!-- dependency version -->
         <ipfs.api.version>v1.2.0</ipfs.api.version>
         <logback.version>1.2.3</logback.version>
@@ -99,11 +100,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.7.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
                     <encoding>UTF-8</encoding>
+                    <compilerArgument>-XDignore.symbol.file</compilerArgument>
                 </configuration>
             </plugin>
             <plugin>
@@ -139,7 +141,7 @@
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>UI.AppMainWindow</mainClass>
+                            <mainClass>io.nbs.client.App</mainClass>
                         </manifest>
                     </archive>
                 </configuration>
@@ -167,7 +169,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>UI.AppMainWindow</mainClass>
+                            <mainClass>${main-class}</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>
@@ -213,7 +215,7 @@
                     <repositoryName>lib</repositoryName>
                     <programs>
                         <program>
-                            <mainClass>UI.AppMainWindow</mainClass>
+                            <mainClass>${main-class}</mainClass>
                             <name>nbs-client4j</name>
                             <jvmSettings>
                                 <extraArguments>

pom.xml

@@ -116,7 +116,7 @@ public class AppMainWindow {
     public static void main(String[] args){
         String basedir = System.getProperty("app.home");
         System.out.println("nbs-client-dir>>>>>>>>>>"+basedir);
-        EventQueue.invokeLater(
+      /*  EventQueue.invokeLater(
                 new Runnable() {
                     @Override
                     public void run() {
@@ -129,7 +129,7 @@ public void run() {
 
                     }
                 }
-        );
+        );*/
     }
 
 

src/main/java/UI/AppMainWindow.java

@@ -1,5 +1,9 @@
 package io.nbs.client;
 
+import io.nbs.commons.helper.ConfigurationHelper;
+
+import java.util.Properties;
+
 /**
  * @Package : UI
  * @Description :
@@ -14,7 +18,14 @@
 public class App {
 
     public static void main(String[] agrs){
-        Launcher launcher = new Launcher();
+        ConfigurationHelper configHelper = ConfigurationHelper.getInstance();
+        Properties cfg = configHelper.getCfgProps();
+   /*     for(String k : cfg.stringPropertyNames()){
+            System.out.println(k+"="+cfg.getProperty(k));
+        }*/
+
+        Launcher launcher = new Launcher(configHelper);
         launcher.launch();
+
     }
 }

src/main/java/io/ipfs/nbs/helper/HttpURLImageHelper.java

@@ -69,10 +69,10 @@ public class Launcher {
         FILE_SEPARATOR = System.getProperty("file.separator");
     }
 
-    public Launcher(){
+    public Launcher(ConfigurationHelper helper){
         context = this;
         logo = IconUtil.getIcon(this,"/icons/nbs.png");
-        cfgHelper = ConfigurationHelper.getInstance();
+        cfgHelper =helper;
     }
     public Launcher(String[] args){
         context = this;

src/main/java/io/nbs/client/App.java

@@ -1,7 +1,5 @@
-package io.nbs.commons.helper;
+package io.nbs.client.helper;
 
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
 import io.nbs.client.Launcher;
 import io.nbs.client.cnsts.AppGlobalCnst;
 import io.nbs.commons.utils.IconUtil;
@@ -215,8 +213,9 @@ private void compressImage(Image img,File destFile,int w,int h) throws IOExcepti
         BufferedImage image = new BufferedImage(w,h,BufferedImage.SCALE_SMOOTH);
         image.getGraphics().drawImage(img,0,0,w,h,null);
         FileOutputStream out = new FileOutputStream(destFile);
-        JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
-        encoder.encode(image);
+        String destName = destFile.getName();
+        String suffix = destName.substring(destName.lastIndexOf(".")+1);
+        ImageIO.write(image,suffix,destFile);
         out.close();
     }
 

src/main/java/io/nbs/client/Launcher.java

@@ -1,9 +1,5 @@
 package io.nbs.client.helper;
 
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-import io.ipfs.api.IPFS;
-import io.ipfs.multihash.Multihash;
 import io.nbs.client.Launcher;
 import io.nbs.client.cnsts.AppGlobalCnst;
 import io.nbs.commons.helper.ConfigurationHelper;
@@ -20,7 +16,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 
 /**
@@ -185,8 +180,9 @@ else if (imageSize[0] < imageSize[1] && imageSize[1] > 200)
 
             File cacheFile = new File(AppGlobalCnst.consturactPath(IMAGE_CACHE_ROOT_PATH,identify + "_thumb") );
             FileOutputStream out = new FileOutputStream(cacheFile);
-            JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
-            encoder.encode(tag);
+           // JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
+            //ImageIO.write(tag,"png",cacheFile);
+
             out.close();
         }
         catch (IOException ex)