Merge branch '20240418_sun' of sckj/mz-cloud into master

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/DESedeEncryptAndDecryptFile.java

@@ -141,7 +141,7 @@ public class DESedeEncryptAndDecryptFile {
     public static String decrypt(String data) {
         String res = null;
         try {
-            res = new String(decryptMode(hexString2ByteArray(data), ResourceUtil.getConfigByName("face.desKey")), StandardCharsets.UTF_8);
+            res = new String(decryptMode(hexString2ByteArray(data), ResourceUtil.getConfigByName("offline.desKey")), StandardCharsets.UTF_8);
         } catch (Exception e) {
             throw new ServiceException(e.getMessage());
         }
@@ -151,7 +151,7 @@ public class DESedeEncryptAndDecryptFile {
     public static String encrypt(String data) {
         String res = null;
         try {
-            res = byteArray2HexString(encryptMode(data.getBytes(), ResourceUtil.getConfigByName("face.desKey")));
+            res = byteArray2HexString(encryptMode(data.getBytes(), ResourceUtil.getConfigByName("offline.desKey")));
         } catch (Exception e) {
             throw new ServiceException(e.getMessage());
         }

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/YlServer.java

@@ -45,7 +45,7 @@ public class YlServer {
         // 查询
         InLnstLrxx lrxx = new InLnstLrxx();
 //        lrxx.setYlcode("1100302424");
-        lrxx.setLrZjhm("152326197904090050");
+        lrxx.setLrZjhm("220104199607156937");
         TreeMap<String, Object> lr = new TreeMap<>();
         TreeMap<String, Object> map = new TreeMap<>();
         if (StringUtils.isNotEmpty(lrxx.getYlcode())) {