From c0ceef9f86c0abb288ade6a7770c02326848f8a4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 二月 2025 13:58:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/AESUtil.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/AESUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/AESUtil.java
index 3de41ea..bebde8e 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/AESUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/AESUtil.java
@@ -99,9 +99,9 @@
 
 
     public static void main(String[] ages){
-        String encrypt = AESUtil.encrypt("{\"OperatorID\":\"MA25CNM38\",\"OperatorSecret\":\"7hUeAsYVBrjw8sup\"}", "YPFVz1OvAS4nSwLW", "5tLoP60aR9QUB5Mx");
-        System.err.println(encrypt);
-//        String travel = AESUtil.decrypt("IGc1VSVN8ruGbmmXUQQKZQ==");
-//        System.err.println(travel);
+//        String encrypt = AESUtil.encrypt("{\"OperatorSecret\":\"cn51EeFQDTSMsn11R1ZNsYSEYBxDYcKK\",\"OperatorID\":\"MA25CNM38\"}", "YPFVz1OvAS4nSwLW", "5tLoP60aR9QUB5Mx");
+//        System.err.println(encrypt);
+        String travel = AESUtil.decrypt("VOXZLgEoOOmtrwaSLHiBVdsWW0F2FWCceJyAvasTxM3ZgADBdBikMNZX9I2JPaqfrMrjXP4sjSpDdUKNTbsNotGYfcj0vFrz8kSsT8RWoA+zgVKAxwKkeSvKEvLPEwLoz0rbDTW1BhL/lf8j7SqS9Q5f+Dqx3pdPDe5xF6/rCQ8vLFlEdi0x6O3UZjQFgiIDhPRghcTd3/BEPY6nF0wsQlyECgeSQzqAnTa7DDLsiJ1uWuaeKyAa6cGRiWZ7IovXs5GyPJ0mH7c/IczHZa7Afzt/PDDE0GOGGFuodWdOvQ2hgcbmrSQ/JEr2DO4UGXd8yhGlIFhzXueuiJIPlVrjB45gy7+JFOjMdMcjufk8RBq7bdXcDqz8Ktlv6yjv826jb0TcZeUA5Rmn4OIqZRVdm3KW/11ILOSeHLsqTLBZamNJAZjH0/4AAY+63Eh590S01ADHkkK1/hHvp5V/Orlp7w==", "eKfRG4Jx5BsxwEJM", "3KrwBfr6AhsmYFnP");
+        System.err.println(travel);
     }
 }

--
Gitblit v1.7.1