Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

 screen-common/src/main/java/com/moral/util/AESUtils.java

@@ -67,8 +67,8 @@
    //解密
    public static String decrypt(String content, String key) {
        try {
            SecretKeySpec skey = new SecretKeySpec(key.getBytes(), algorithm);
            IvParameterSpec iv = new IvParameterSpec(key.getBytes(), 0, offset);
            SecretKeySpec skey = new SecretKeySpec(key.getBytes("utf-8"), algorithm);
            IvParameterSpec iv = new IvParameterSpec(key.getBytes("utf-8"), 0, offset);
            Cipher cipher = Cipher.getInstance(transformation);
            cipher.init(Cipher.DECRYPT_MODE, skey, iv);// 初始化
            byte[] result = cipher.doFinal(new Base64().decode(content));