From ff498308b300253a9dad228ede9dd68e3503effb Mon Sep 17 00:00:00 2001 From: lsy <18332763730@163.com> Date: Mon, 2 Oct 2017 10:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=B8=B8=E7=94=A8=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=E5=89=A5=E7=A6=BB=E6=88=90=E5=8D=95=E7=8B=AC=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- all/bash/fastdfs_run.sh | 4 ++- boot-starter-elasticsearch/pom.xml | 3 +++ boot-starter-util/pom.xml | 24 ++++++++++++++++++ .../java/com/micro/fast}/util/AESUtil.java | 2 +- .../java/com/micro/fast/util/FileUtils.java | 4 +-- .../java/com/micro/fast}/util/MD5Util.java | 2 +- .../src/main/java/com/micro/fast/util/My.java | 19 ++++++++++++++ .../com/micro/fast}/util/WatermarkerUtil.java | 2 +- .../com/micro/fast/util/package-info.java | 4 +++ common/pom.xml | 8 +++++- .../fast/common/config/DataSourceConfig.java | 2 +- .../micro/fast/common/util/AESUtilTest.java | 25 ------------------- .../micro/fast/common/util/MD5UtilTest.java | 14 ----------- .../fast/common/util/WatermarkerUtilTest.java | 15 ----------- pom.xml | 2 ++ 15 files changed, 68 insertions(+), 62 deletions(-) create mode 100644 boot-starter-util/pom.xml rename {common/src/main/java/com/micro/fast/common => boot-starter-util/src/main/java/com/micro/fast}/util/AESUtil.java (97%) rename common/src/main/java/com/micro/fast/common/util/FileUtil.java => boot-starter-util/src/main/java/com/micro/fast/util/FileUtils.java (94%) rename {common/src/main/java/com/micro/fast/common => boot-starter-util/src/main/java/com/micro/fast}/util/MD5Util.java (95%) create mode 100644 boot-starter-util/src/main/java/com/micro/fast/util/My.java rename {common/src/main/java/com/micro/fast/common => boot-starter-util/src/main/java/com/micro/fast}/util/WatermarkerUtil.java (99%) create mode 100644 boot-starter-util/src/main/java/com/micro/fast/util/package-info.java delete mode 100644 common/src/test/java/com/micro/fast/common/util/AESUtilTest.java delete mode 100644 common/src/test/java/com/micro/fast/common/util/MD5UtilTest.java delete mode 100644 common/src/test/java/com/micro/fast/common/util/WatermarkerUtilTest.java diff --git a/all/bash/fastdfs_run.sh b/all/bash/fastdfs_run.sh index d6eb73f..96cc823 100644 --- a/all/bash/fastdfs_run.sh +++ b/all/bash/fastdfs_run.sh @@ -5,4 +5,6 @@ echo '正在开启tracker' # 开启存储服务 echo '正在开启storage' /usr/bin/fdfs_storaged /etc/fdfs/storage.conf -echo 'tracker和storage开启完毕' \ No newline at end of file +echo 'tracker和storage开启完毕' +# 检查服务的开启状态 +ps -ef | grep fdfs \ No newline at end of file diff --git a/boot-starter-elasticsearch/pom.xml b/boot-starter-elasticsearch/pom.xml index fb24d21..4669d3b 100644 --- a/boot-starter-elasticsearch/pom.xml +++ b/boot-starter-elasticsearch/pom.xml @@ -22,6 +22,9 @@ UTF-8 UTF-8 1.8 + 1.8 + 1.8 + 1.8 5.6.0 diff --git a/boot-starter-util/pom.xml b/boot-starter-util/pom.xml new file mode 100644 index 0000000..6d81f60 --- /dev/null +++ b/boot-starter-util/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + + com.micro.fast + util + 0.0.1-SNAPSHOT + jar + + util + micro-fast-util + + + + junit + junit + 3.8.1 + test + + + + util + + diff --git a/common/src/main/java/com/micro/fast/common/util/AESUtil.java b/boot-starter-util/src/main/java/com/micro/fast/util/AESUtil.java similarity index 97% rename from common/src/main/java/com/micro/fast/common/util/AESUtil.java rename to boot-starter-util/src/main/java/com/micro/fast/util/AESUtil.java index 84569b3..523829a 100644 --- a/common/src/main/java/com/micro/fast/common/util/AESUtil.java +++ b/boot-starter-util/src/main/java/com/micro/fast/util/AESUtil.java @@ -1,4 +1,4 @@ -package com.micro.fast.common.util; +package com.micro.fast.util; import sun.misc.BASE64Decoder; import sun.misc.BASE64Encoder; diff --git a/common/src/main/java/com/micro/fast/common/util/FileUtil.java b/boot-starter-util/src/main/java/com/micro/fast/util/FileUtils.java similarity index 94% rename from common/src/main/java/com/micro/fast/common/util/FileUtil.java rename to boot-starter-util/src/main/java/com/micro/fast/util/FileUtils.java index 1eede01..d4e9592 100644 --- a/common/src/main/java/com/micro/fast/common/util/FileUtil.java +++ b/boot-starter-util/src/main/java/com/micro/fast/util/FileUtils.java @@ -1,4 +1,4 @@ -package com.micro.fast.common.util; +package com.micro.fast.util; import java.io.File; @@ -11,7 +11,7 @@ import java.io.File; * email 18332763730@163.com * 添加递归修改文件夹下所有特定文件的扩展名的方法 */ -public class FileUtil { +public class FileUtils { /** * 修改文件夹下的所有符合条件的文件的扩展名，递归文件夹下所有文件 * diff --git a/common/src/main/java/com/micro/fast/common/util/MD5Util.java b/boot-starter-util/src/main/java/com/micro/fast/util/MD5Util.java similarity index 95% rename from common/src/main/java/com/micro/fast/common/util/MD5Util.java rename to boot-starter-util/src/main/java/com/micro/fast/util/MD5Util.java index 5e87be3..6d1c52d 100644 --- a/common/src/main/java/com/micro/fast/common/util/MD5Util.java +++ b/boot-starter-util/src/main/java/com/micro/fast/util/MD5Util.java @@ -1,4 +1,4 @@ -package com.micro.fast.common.util; +package com.micro.fast.util; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/boot-starter-util/src/main/java/com/micro/fast/util/My.java b/boot-starter-util/src/main/java/com/micro/fast/util/My.java new file mode 100644 index 0000000..e6a12e5 --- /dev/null +++ b/boot-starter-util/src/main/java/com/micro/fast/util/My.java @@ -0,0 +1,19 @@ +package com.micro.fast.util; + + +/** + * 永远 + */ +public class My { + private static final String world="李新"; + @Override + public final String toString() { + return My.world; + } + + public static void main(String[] args) { + My my= new My(); + System.out.println(my.world); + } +} + diff --git a/common/src/main/java/com/micro/fast/common/util/WatermarkerUtil.java b/boot-starter-util/src/main/java/com/micro/fast/util/WatermarkerUtil.java similarity index 99% rename from common/src/main/java/com/micro/fast/common/util/WatermarkerUtil.java rename to boot-starter-util/src/main/java/com/micro/fast/util/WatermarkerUtil.java index 0323e25..c6c939a 100644 --- a/common/src/main/java/com/micro/fast/common/util/WatermarkerUtil.java +++ b/boot-starter-util/src/main/java/com/micro/fast/util/WatermarkerUtil.java @@ -1,4 +1,4 @@ -package com.micro.fast.common.util; +package com.micro.fast.util; diff --git a/boot-starter-util/src/main/java/com/micro/fast/util/package-info.java b/boot-starter-util/src/main/java/com/micro/fast/util/package-info.java new file mode 100644 index 0000000..1f7d1f4 --- /dev/null +++ b/boot-starter-util/src/main/java/com/micro/fast/util/package-info.java @@ -0,0 +1,4 @@ +/** + * 常用工具类模块 + */ +package com.micro.fast.util; \ No newline at end of file diff --git a/common/pom.xml b/common/pom.xml index 143d8f1..db5b3da 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -76,7 +76,7 @@ com.alibaba druid - 1.0.26 + 1.0.27 @@ -87,6 +87,12 @@ org.apache.tomcat.embed tomcat-embed-el + + + com.micro.fast + util + 0.0.1-SNAPSHOT + com.google.guava diff --git a/common/src/main/java/com/micro/fast/common/config/DataSourceConfig.java b/common/src/main/java/com/micro/fast/common/config/DataSourceConfig.java index 985a54b..c8c9d14 100644 --- a/common/src/main/java/com/micro/fast/common/config/DataSourceConfig.java +++ b/common/src/main/java/com/micro/fast/common/config/DataSourceConfig.java @@ -6,7 +6,7 @@ import com.alibaba.druid.support.http.WebStatFilter; import com.alibaba.druid.support.spring.stat.DruidStatInterceptor; import com.micro.fast.common.config.param.DruidParamConfig; import com.micro.fast.common.config.param.JdbcConnectionParamConfig; -import com.micro.fast.common.util.AESUtil; +import com.micro.fast.util.AESUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/src/test/java/com/micro/fast/common/util/AESUtilTest.java b/common/src/test/java/com/micro/fast/common/util/AESUtilTest.java deleted file mode 100644 index fbfbc58..0000000 --- a/common/src/test/java/com/micro/fast/common/util/AESUtilTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.micro.fast.common.util; - -import org.junit.Test; - -import static org.junit.Assert.*; - -public class AESUtilTest { - @Test - public void AESEncode() throws Exception { - String[] keys = new String[]{"studyj2e"}; - System.out.println("key | AESEncode | AESDecode"); - for (String key : keys) { - System.out.print(key+" | "); - String aesEncode = AESUtil.AESEncode("studyj2e"); - System.out.print(aesEncode+" | "); - String aesDecode = AESUtil.AESDecode(aesEncode); - System.out.println(aesDecode); - } - } - - @Test - public void AESDecode() throws Exception { - } - -} \ No newline at end of file diff --git a/common/src/test/java/com/micro/fast/common/util/MD5UtilTest.java b/common/src/test/java/com/micro/fast/common/util/MD5UtilTest.java deleted file mode 100644 index b366dc6..0000000 --- a/common/src/test/java/com/micro/fast/common/util/MD5UtilTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.micro.fast.common.util; - -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; - -public class MD5UtilTest { - @Test - public void MD5EncodeStrUtf8() throws Exception { - MD5Util.MD5EncodeStrUtf8("李守余"); - Assert.assertEquals("7F8D114165AB73DBDAFF9EF4A85A5E0A",MD5Util.MD5EncodeStrUtf8("李守余")); - } -} \ No newline at end of file diff --git a/common/src/test/java/com/micro/fast/common/util/WatermarkerUtilTest.java b/common/src/test/java/com/micro/fast/common/util/WatermarkerUtilTest.java deleted file mode 100644 index ff6bb7b..0000000 --- a/common/src/test/java/com/micro/fast/common/util/WatermarkerUtilTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.micro.fast.common.util; - -import org.junit.Test; - -import java.io.File; - -import static org.junit.Assert.*; - -public class WatermarkerUtilTest { - @Test - public void markerWord() throws Exception { - new WatermarkerUtil().markerWord("www.suixiangcang.com",new File("/root/dev/u=132629542,1898058257&fm=27&gp=0.jpg"),"/home"); - } - -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4ed49a0..34a30dd 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,9 @@ 1.8 + boot-starter-util boot-starter-elasticsearch + boot-starter-fastdfs-client common config-server eureka-server