fixed 支持jdk11、jdk17的修改

fuint-application/src/main/java/com/fuint/common/service/impl/StoreServiceImpl.java

@@ -517,7 +517,7 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
     public Map<String, Object> getLatAndLngByAddress(String addr) {
         String key = env.getProperty("amap.key");
         Map<String, Object> map = new HashMap<>();
-        if (key == null || key.length() < 10) {
+        if (StringUtil.isEmpty(key) || key.length() < 10) {
             map.put("lat", "");
             map.put("lng", "");
             return map;

fuint-utils/src/main/java/com/fuint/utils/AESUtil.java

@@ -1,135 +0,0 @@
-package com.fuint.utils;
-
-import com.sun.org.apache.xerces.internal.impl.dv.util.HexBin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import javax.crypto.*;
-import javax.crypto.spec.SecretKeySpec;
-
-/**
- * AES对称加/解密工具类
- *
- * Created by FSQ
- * CopyRight https://www.fuint.cn
- */
-public class AESUtil {
-    private static final Logger logger = LoggerFactory.getLogger(AESUtil.class);
-
-    //密钥生成算法
-    private static String KEY_AES = "AES";
-
-    //密钥长度
-    private static int KEY_LENGTH = 128;
-
-    //默认字符集
-    private static final String CHARSET = "UTF-8";
-
-    /**
-     * AES加密
-     *
-     * @param data     待加密的内容
-     * @param password 加密密码
-     * @return byte[]
-     */
-    public static String encrypt(byte[] data, String password) {
-        try {
-            SecretKeySpec key = getKey(password);
-            Cipher cipher = Cipher.getInstance(KEY_AES);// 创建密码器
-            cipher.init(Cipher.ENCRYPT_MODE, key);// 初始化
-            return HexBin.encode(cipher.doFinal(data));
-        } catch (NoSuchAlgorithmException e) {
-            logger.error(e.getMessage(), e);
-        } catch (IllegalBlockSizeException e) {
-            logger.error(e.getMessage(), e);
-        } catch (InvalidKeyException e) {
-            logger.error(e.getMessage(), e);
-        } catch (BadPaddingException e) {
-            logger.error(e.getMessage(), e);
-        } catch (NoSuchPaddingException e) {
-            logger.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-    /**
-     * AES加密
-     *
-     * @param data     待加密的内容
-     * @param password 加密密码
-     * @return String
-     */
-    public static String encrypt(String data, String password) {
-        try {
-            return encrypt(data.getBytes(CHARSET), password);
-        } catch (UnsupportedEncodingException e) {
-            logger.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-    /**
-     * AES解密
-     *
-     * @param data     待解密内容
-     * @param password 解密密钥
-     * @return byte[]
-     */
-    public static byte[] decrypt(byte[] data, String password) {
-        try {
-            SecretKeySpec key = getKey(password);
-            Cipher cipher = Cipher.getInstance(KEY_AES);// 创建密码器
-            cipher.init(Cipher.DECRYPT_MODE, key);// 初始化
-            return cipher.doFinal(HexBin.decode(new String(data, CHARSET)));
-        } catch (NoSuchAlgorithmException e) {
-            logger.error(e.getMessage(), e);
-        } catch (IllegalBlockSizeException e) {
-            logger.error(e.getMessage(), e);
-        } catch (InvalidKeyException e) {
-            logger.error(e.getMessage(), e);
-        } catch (BadPaddingException e) {
-            logger.error(e.getMessage(), e);
-        } catch (NoSuchPaddingException e) {
-            logger.error(e.getMessage(), e);
-        } catch (UnsupportedEncodingException e) {
-            logger.error(e.getMessage(), e);
-        }
-
-        return null;
-    }
-
-    /**
-     * AES解密
-     *
-     * @param data     待解密内容
-     * @param password 解密密钥
-     * @return String
-     */
-    public static String decrypt(String data, String password) {
-        try {
-            byte[] bytes = decrypt(data.getBytes(CHARSET), password);
-            return new String(bytes, CHARSET);
-        } catch (UnsupportedEncodingException e) {
-            logger.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-    /**
-     * 通过密码计算key
-     *
-     * @param password 对称密码
-     * @return SecretKeySpec 计算的128位随机key
-     * @throws NoSuchAlgorithmException
-     */
-    private static SecretKeySpec getKey(String password) throws NoSuchAlgorithmException {
-        KeyGenerator kgen = KeyGenerator.getInstance(KEY_AES);
-        kgen.init(KEY_LENGTH, new SecureRandom(password.getBytes()));
-        SecretKey secretKey = kgen.generateKey();
-        byte[] enCodeFormat = secretKey.getEncoded();
-        return new SecretKeySpec(enCodeFormat, KEY_AES);
-    }
-}

pom.xml

@@ -60,6 +60,18 @@
             <artifactId>HikariCP</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>javax.xml.soap</groupId>
+            <artifactId>javax.xml.soap-api</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.messaging.saaj</groupId>
+            <artifactId>saaj-impl</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>