From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java
index dff01c7..1d44981 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/dto/OrderNotify.java
@@ -48,34 +48,34 @@
private String summary;
- @Data
- public class NotifyResource {
-
- /**
- * 鍔犲瘑绠楁硶绫诲瀷
- * 浠呮敮鎸丄EAD_AES_256_GCM
- */
- private String algorithm;
-
- /**
- * 鏁版嵁瀵嗘枃
- */
- private String ciphertext;
-
- /**
- * 闄勫姞鏁版嵁
- */
- public String associated_data;
-
- /**
- * 鍘熷绫诲瀷
- * 鍘熷鍥炶皟绫诲瀷涓猴細transaction
- */
- private String original_type;
-
- /**
- * 闅忔満涓�
- */
- private String nonce;
- }
+ //@Data
+ //public class NotifyResource {
+ //
+ // /**
+ // * 鍔犲瘑绠楁硶绫诲瀷
+ // * 浠呮敮鎸丄EAD_AES_256_GCM
+ // */
+ // private String algorithm;
+ //
+ // /**
+ // * 鏁版嵁瀵嗘枃
+ // */
+ // private String ciphertext;
+ //
+ // /**
+ // * 闄勫姞鏁版嵁
+ // */
+ // public String associated_data;
+ //
+ // /**
+ // * 鍘熷绫诲瀷
+ // * 鍘熷鍥炶皟绫诲瀷涓猴細transaction
+ // */
+ // private String original_type;
+ //
+ // /**
+ // * 闅忔満涓�
+ // */
+ // private String nonce;
+ //}
}
\ No newline at end of file
--
Gitblit v1.8.0