工行修改版本号

4dkankan-common-utils/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.fdkankan</groupId>
         <artifactId>4dkankan-utils</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/ImageUtil.java

@@ -1,5 +1,7 @@
 package com.fdkankan.common.constant;
 
+import cn.hutool.core.img.ImgUtil;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -79,9 +81,12 @@ public class ImageUtil {
     }
 
     public static void main(String[] args) throws Exception{
-        FileInputStream fis = new FileInputStream(new File("F:\\test\\1.png"));
+        FileInputStream fis = new FileInputStream(new File("C:\\Users\\dsx\\Desktop\\5474a1e8d93747f3aec79e6021c10a3b.jpeg"));
+        String picType = getPicType(fis);
+        System.out.println(picType);
         boolean image = ImageUtil.isImage(fis);
         System.out.println(image);
+
     }
 
 }

4dkankan-common-web/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>4dkankan-utils</artifactId>
     <groupId>com.fdkankan</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>GH-3.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-common-utils</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>GH-3.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-utils-redis</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
+      <version>GH-3.0.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>

4dkankan-utils-app-push/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-db/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>com.fdkankan</groupId>
         <artifactId>4dkankan-utils</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>4dkankan-utils-db</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>GH-3.0.0-SNAPSHOT</version>
     <dependencies>
 
         <dependency>

4dkankan-utils-db/src/main/java/com/fdkankan/db/config/DruidConfig.java

@@ -19,12 +19,18 @@ import com.alibaba.druid.support.http.WebStatFilter;
 @Configuration
 @EnableConfigurationProperties({DruidDataSourceProperties.class})
 public class DruidConfig {
+
+
+
     @Autowired
     private DruidDataSourceProperties properties;
 
     @Bean
     @ConditionalOnMissingBean
     public DataSource druidDataSource() {
+
+//        String
+
         DruidDataSource druidDataSource = new DruidDataSource();
         druidDataSource.setDriverClassName(properties.getDriverClassName());
         druidDataSource.setUrl(properties.getUrl());

4dkankan-utils-db/src/main/java/com/fdkankan/db/utils/SM4.java

@@ -0,0 +1,75 @@
+//package com.fdkankan.db.utils;
+//
+//import java.io.File;
+//import org.springframework.core.io.ClassPathResource;
+//import com.icbc.hsm.software.apiLib.Cipher;
+//import com.icbc.hsm.software.basic.HsmKeyParameter;
+//import com.icbc.hsm.software.security.KeyLoader;
+//import com.icbc.hsm.utils.encoders.Hex;
+//
+//public class SM4 {
+//
+//	private final static String algorithm = "SM4";//加密算法
+//	private final static String pass = null;//不预留口令，设置为null
+//	private static String cmcKeyPath="";
+//
+//	public static String encryptBySM4FromFile(String sourceData) throws Exception {
+//		cmcKeyPath=(new ClassPathResource("CMC_SM4KEY_DMSP.key").getFile()).getPath();
+//		File cmcKeyFile = new File(cmcKeyPath);
+//		String cmcKey = FileUtil.getFileConent(cmcKeyFile,"UTF-8");
+//
+//		String pass = encryptBySM4(sourceData,cmcKey);
+//		return pass;
+//	}
+//
+//	public static String decryptBySM4FromFile(String sourceData) throws Exception {
+//		cmcKeyPath=(new ClassPathResource("CMC_SM4KEY_DMSP.key").getFile()).getPath();
+//		File cmcKeyFile = new File(cmcKeyPath);
+//		String cmcKey = FileUtil.getFileConent(cmcKeyFile,"UTF-8");
+//
+//		String pass = decryptBySM4(sourceData,cmcKey);
+//		return pass;
+//	}
+//
+//	public static String encryptBySM4(String sourceData, String sm4Dek) throws Exception {
+//		// 1. 获得密钥对象
+//		HsmKeyParameter keyParm = null;
+//		try {
+//			keyParm = KeyLoader.loadOneKey(sm4Dek, pass);
+//		} catch (Exception e) {
+//			throw e;
+//		}
+//		// 2. 获得算法实例
+//		Cipher cipher = Cipher.getInstance(algorithm);
+//		// 3. 获得加密结果
+//		byte[] data = sourceData.getBytes();
+//		byte[] encrytedData = null;
+//		try {
+//			encrytedData = cipher.encipher(keyParm, data);
+//		} catch (Exception e) {
+//			throw e;
+//		}
+//		return Hex.toHexString(encrytedData);//密文转换成String
+//	}
+//
+//	public static String decryptBySM4(String encrytedData, String sm4Dek) throws Exception {
+//		// 1. 获得密钥对象
+//		HsmKeyParameter keyParm = null;
+//		try {
+//			keyParm = KeyLoader.loadOneKey(sm4Dek, pass);
+//		} catch (Exception e) {
+//			throw e;
+//		}
+//		// 2. 获得算法实例
+//		Cipher cipher = Cipher.getInstance(algorithm);
+//		// 3. 获得解密结果
+//		byte[] decryptedData = null;
+//		try {
+//			decryptedData = cipher.decipher(keyParm, Hex.decode(encrytedData));
+//		} catch (Exception e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		return new String(decryptedData);
+//	}
+//}

4dkankan-utils-dingtalk/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

4dkankan-utils-email/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-fyun-https/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>4dkankan-utils-fyun-https</artifactId>
     <properties>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

4dkankan-utils-fyun-local/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>4dkankan-utils-fyun-local</artifactId>
     <properties>
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

4dkankan-utils-fyun-oss/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>4dkankan-utils-fyun-oss</artifactId>
     <properties>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

4dkankan-utils-fyun-parent/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

4dkankan-utils-fyun-s3/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>4dkankan-utils-fyun-s3</artifactId>
     <properties>
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-parent</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.amazonaws</groupId>

4dkankan-utils-fyun/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

4dkankan-utils-image/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

4dkankan-utils-mongodb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-mq/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.fdkankan</groupId>
         <artifactId>4dkankan-utils</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-pay/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>4dkankan-utils</artifactId>
     <groupId>com.fdkankan</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>GH-3.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-rabbitmq/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>4dkankan-utils</artifactId>
     <groupId>com.fdkankan</groupId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>GH-3.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-redis/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.fdkankan</groupId>
         <artifactId>4dkankan-utils</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-rubber-sheeting/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

4dkankan-utils-sensitive-word/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-sms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

4dkankan-utils-wechat/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>4dkankan-utils</artifactId>
         <groupId>com.fdkankan</groupId>
-        <version>3.0.0-SNAPSHOT</version>
+        <version>GH-3.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <version>GH-3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

pom.xml

@@ -31,7 +31,7 @@
 
     <groupId>com.fdkankan</groupId>
     <artifactId>4dkankan-utils</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>GH-3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>