From 6bbe6bac71bfe1d0dd2df4151df714ab3884aadc Mon Sep 17 00:00:00 2001
From: "MATRIX\\29620" <2962004889@qq.com>
Date: Mon, 20 Jan 2025 17:31:23 +0800
Subject: [PATCH] no message

---
 .../__pycache__/command_02.cpython-311.pyc    | Bin 16149 -> 18347 bytes
 charging_pile_proxy/commands/command_02.py    |  64 ++++++++++++++----
 charging_pile_proxy/test.log                  |   2 +
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/charging_pile_proxy/commands/__pycache__/command_02.cpython-311.pyc b/charging_pile_proxy/commands/__pycache__/command_02.cpython-311.pyc
index eeff710635478184353eb30dede461b64c661cc1..dd6f8095278a63c4e3113af68da3ea0a80d4d5aa 100644
GIT binary patch
delta 1997
zcmZXUYi!e16u|$t{kNsBtz$3Rt!wuP*lv!lV~ll=0>WOzfj|@up_KhQ*w`c7c0izm
zffG=iL#~sTu#O0GPS{L?s9+?1FfM-SNE1k-i63a$5;Y{+4}JhW=idd=dDH%S?!D)n
zd+zDEXZXm(5J?%+YE>MJ@b81WH`u;Rsncf0Q(->$`TMhz$D&`4#R7MucZcH4t$mHe
zSx{>OKGF^xjc0(CDmFY78@&1W4vSqGh@LtTyK=@6Pl1iuTeqWQr(=PWvy&$r=C~S`
zq91<u=+39n8|NJ6h}34^7GDI5vC;A9&~1mAqPICz6V0RV1)`HDVjq74N6(ulPKu6<
zB<72`SYQ-_d>lCDFwgx9BhLOwDM*iNz(<KW_QAE-M_)zz@78XOv(nTYGR~S)i^+I!
zf9hE!sb)%j0jXsr`eyk`(5H6h*N@8ApjgQY4fRXwQEWh%5N1Rpz`|2Z7i~st2o4!m
z$xO8<+YzDz2}+rOxsU>+N)|J{O*XL(bFoge!fVqV2p79%UZ>uPq8qU*__ujXk+A~h
zO28pS&02BLZEW(T#*}JU8|N&Nh@{j;H!_*!IN8ijS$0*mp~Y^*9z;8$1F;vO1VrSX
z?$#c`6Onax^m=^}zN4qTn>MmS>r%3VHCyxLVr+-mKC6vv3|_T9lo!3Y*JgBsRYA8P
z#2aoysghkOYbRxFk-ZSESYj_AhuKDZuHjwSj41ZFy>6e6(m|Z@?cHrXaN;|5t6IFh
z2OYSB-`YnchD|8Hj_5+5IX#c?GH=Dtl4pdiURifmTEKoR)am+&kHFsi5TwkVVU+QH
z65!dI<pr$1a=ldM)3VWQL*6A$kYAQw2la{PCWI3d16-fPFJbp8vtQ+scm13T{~&Ql
zxCTyGG{6bU>u}`>ytX*{q!P|Ay$<rk{0hhQ@qR9#ga9&1{KU^MFpwohtn$mKL{N7V
zLBsZCX2=EY7S58we5(#Qdhzk7Vz*AuP7Wt3-a(hc615@90Iko%fC&^Bmk!^*Qe^Bc
zV-X9fw83eGpRm2kJhnPRLv+lhI-H*7CxTKBdWj({zQnULYLg-z)-!}m_B69MJqzT_
z|Ld^R>LQZOrqsuZmw<*oS>v)KIeUb|lLS56t|=yZc1mN?8~idnPsmwl&F*QIn3M97
zyU>|nWD!jv$z#tn<ws3@iX#d^v4s;v=>R#v9hAPw9UvAneHkuBOA*P*N<7PQ*r-ob
zEhdbL53B+uv8KfifbWg2LR29f2z+m}1_9m4#ZmD=)ZyHTSdCbNSc`ZC(2LzC(U|7?
zFV22{aw}a2D=l<AYBT}7SY77%L9yXcEdE19Y+qGY?tXV?yWsYDTy50d<<UURdPDGk
z_j6BpE7R#7NTZsx;2UYfBo%}+r8AoRuqHpG$$!ZHSlqI_7#tm6t7y`3Kd6mJYkfNW
z{NzjpPU}?7ymZ=NYH~`aoidPv&MFtFOHLT{w`Ca9i~iRLQ;Xz9*YjfinazpN2iY$U
zD{(SKwKwwu+Fe9kLg1r^=Q~twkOe@jV>heI$W``Rb@|a2iz;!740ZYe5k(vA>DuEt
zxZvQ3!sXiS@wr@LlEju^kz-@&7CJpNqV##ZJ{Kg+o!GyMu9RIpt$STw0PTdiR}M(z
zTZ}oP$ri0zd%C*74gCzZpQ2t7`=Z9w5|?vnS?9E8wV}M7Gdg!z=k9Nc^2(4ZXNJ!W
z^SL2D_g9>*IA1kVd$IO{^AqQT9NYaI+f0r<oMVR#_{{JXVZI{7SFo1af~6%g{S)pv
zb`UPF<bkpLzOj6&Va8Y!HrDhvgn0uSsGU+{FjP#WmpSW}sBXX<8<%&Ix$6#PZ6Kt9
PJmHdlwoBNbb<6$(wNLnS

delta 1553
zcmZ9LZ%k8H6u|F$y=`fsfCxB{lnN@minO*OP#GdBFyeGfx4C~Ij8_p5I&a%$l6K$*
z_#c!zCT@;Di^3e+aA}-QU9#`{u+}tjX|iM=d{6l12bXM1mhGHZCz~hl{oc9fo_p>+
z@18S1DvZCEK4-C*3COL;*^VLmH|e#OoL~lwm%cc&xNuClIj2tFQSOWed7Gt02=a)<
z3A}F^><?yxmsuUZrk?%!!ELTi4k{;x)yZ?7U^+}JUcaHtomQuhFD?vwY{678Dd)ex
zfBUlX)di0&p>w(p1XIAM&RkVSZ+L7Bqb;GEwp=+itt<?yAAJW~KVF{PNtv2Tj<bk5
zJp+e)Fn!EpTlyO$$p1($S{Y1(7-cqf<cj*?x5~hsXZHtrdB$o%;>{Tw1S#@P#+XUi
z%uRVkLIp3&Yc{yRpE-FbZ^p0%RW~orZ&+W6Y89doVM9~{B+Br2F%M#EWHi4@Us!><
z6QKnVQOf}=MU9}jxmx&vP{+G$8#1+3m^Ryk*vqfjcBa07Y764U$RpdFF?$p0Za|;0
zrd|`)#1~4N(l>+cDv`v5Sng!oxL$f+sOKl7x2j*p6|W!;AYMhhhIk!e0wfIH-gckt
zP3RAI1^s~p?ecZ@vT9yzUoY(8&Gt10?QGrrh}|h{i+pDP*|2swuX+rFRl#;3v<#b2
zbMwhfoq~g>xQZdgGFOq%&G)(r@{ht~!g#37-xdfk7RC|n>^<m%9fw@@R4x0LFhEP>
zmTOAPuS2~7@g@S7vlEDR?yvY!bc(!gOKplQh6Py{7RPk!EHos_`aV4&Lt-A`lWTLu
zu#S(USb5ZJ(HTPmZ^>PwO9|=tuUk4RO#ur8dn_T{tU$;-yh-_l$mUO<vI!(arj2~N
zBYSLJmO~_sL{1$fa@s7UK9A{Z5~d;v(OJ;vA6p0s>qETOv8pVj3+bQoHUysRNr-F-
z8JH-i_X=_bKa!Jekm)`mW%Bx}z801V;r1}7o@6(e)$6Ah7sitvknAsIWD5IB>pp0R
z72v8|9(-_aSUETHua%X9l{o;B-?z64wHtBx#0HgIf`;Wv*Xmnbu5UjkYO^uyN*3nh
zJM6+L{=*Lc=96eRg*dHEA=(l6mo@i<`FUS^_da;N0X7QOT;8#BlW?A2-0AL@Ov#<$
z@(6nykT4!(zMezgcb_^;vLdh!BqLT+uYB0c5@v90^#@pIZwK3jt4#r~KhP?-1=`qo
zZQKL<w)z3=4H*0JKiZOlhvQAVGW#!p?Jt~cggY4^3N=N|<uU4rQ%96Kelw7aXHIsX
z=^ki&Xdqepg@I=HW)}|ZhM5()7c66ziLR*R`Mm7rikRI4THLxdmRS?etQmMti?upN
z3*xjON(+9$&?OTd06Z~T8mFbvjkHv=S59<J^?clO(Rayr&+5Kwb;qm~acf1?TnSH%
zR>f&mlveSdb`@n4ecC;0y-TeVM`KiqQz=R%zN+EcMofiiSMvWm_%o%Z$0r95du!Px
caKYO1f5{&;^sOuw8ij}CKin<w!N!t*0AF6JPXGV_

diff --git a/charging_pile_proxy/commands/command_02.py b/charging_pile_proxy/commands/command_02.py
index 7c2c85b..595576d 100644
--- a/charging_pile_proxy/commands/command_02.py
+++ b/charging_pile_proxy/commands/command_02.py
@@ -257,22 +257,62 @@ def test_command():
     # 创建响应处理器
     handler = Command02()
 
-    # 原始测试数据
-    hex_string = "4A5801031767631136065701100019010909371501000000000000000000004D"
-
-    # 解析数据长度字段以确定正确的数据包长度
-    expected_len = 14 + 16 + 1  # 头部(14字节) + 数据域(16字节) + 校验码(1字节)
-
-    # 确保只取需要的字节
-    test_data = bytes.fromhex(hex_string[:expected_len * 2])  # *2是因为hex字符串中一个字节用两个字符表示
+    # 直接使用完整的测试数据，不进行裁剪
+    test_data = bytes.fromhex("4A5801031767631136065701100019010909371501000000000000000000004D")
 
     print("\n测试数据:")
-    print(f"原始数据: {hex_string}")
-    print(f"处理后数据: {test_data.hex().upper()}")
+    print(f"数据内容: {test_data.hex().upper()}")
     print(f"数据长度: {len(test_data)}字节")
 
-    # 打印详细字段解析
-    handler.debug_print_fields(test_data)
+    # 修改validate_frame方法来处理多余字节
+    def validate_frame(self, data):
+        """验证帧格式"""
+        try:
+            print("\n开始验证帧格式:")
+            print(f"数据内容: {data.hex().upper()}")
+            print(f"数据长度: {len(data)}字节")
+
+            # 1. 基本格式检查
+            if len(data) < 14:
+                print("数据长度不足14字节")
+                return False
+
+            if data[0:2] != b'JX':
+                print("帧起始标志不是'JX'")
+                return False
+
+            # 2. 获取数据域长度
+            data_len = struct.unpack("<H", data[12:14])[0]
+            expected_total_len = 14 + data_len + 1  # 头部(14) + 数据域 + 校验码(1)
+
+            print(f"\n数据结构分析:")
+            print(f"起始标识: {data[0:2].hex().upper()}")
+            print(f"命令字: {data[2]:02X}")
+            print(f"桩号: {data[3:11].hex().upper()}")
+            print(f"加密方式: {data[11]:02X}")
+            print(f"数据长度: {data_len}")
+            print(f"数据域: {data[14:14 + data_len].hex().upper()}")
+            print(f"校验码: {data[-1]:02X}")
+
+            # 3. 校验码验证
+            check_data = data[2:-1]  # 从命令字节开始到校验码之前
+            calculated_check = 0
+            for b in check_data:
+                calculated_check ^= b
+
+            if calculated_check != data[-1]:
+                print(f"校验码不匹配: 计算值={calculated_check:02X}, 接收值={data[-1]:02X}")
+                return False
+
+            print("校验通过")
+            return True
+
+        except Exception as e:
+            print(f"验证帧格式异常: {str(e)}")
+            return False
+
+    # 覆盖原方法
+    handler.validate_frame = validate_frame.__get__(handler)
 
     # 创建模拟socket
     class MockSocket:
diff --git a/charging_pile_proxy/test.log b/charging_pile_proxy/test.log
index a4741e7..59f0b90 100644
--- a/charging_pile_proxy/test.log
+++ b/charging_pile_proxy/test.log
@@ -6,3 +6,5 @@
 2025-01-17 17:12:27,913 - ERROR - 代理服务器错误: [WinError 10013] 以一种访问权限不允许的方式做了一个访问套接字的尝试。
 2025-01-20 09:45:44,376 - INFO - 代理服务器已启动，监听地址: 0.0.0.0:52461
 2025-01-20 10:43:46,823 - INFO - 代理服务器已启动，监听地址: 0.0.0.0:52461
+2025-01-20 14:37:17,844 - INFO - 代理服务器已启动，监听地址: 0.0.0.0:52461
+2025-01-20 16:13:14,958 - INFO - 代理服务器已启动，监听地址: 0.0.0.0:52461