diff --git a/__pycache__/config.cpython-36.pyc b/__pycache__/config.cpython-36.pyc index a0d78b7..5e677b3 100644 Binary files a/__pycache__/config.cpython-36.pyc and b/__pycache__/config.cpython-36.pyc differ diff --git a/__pycache__/tools.cpython-36.pyc b/__pycache__/tools.cpython-36.pyc index 77cd86b..d3f223b 100644 Binary files a/__pycache__/tools.cpython-36.pyc and b/__pycache__/tools.cpython-36.pyc differ diff --git a/__pycache__/trade_logic.cpython-36.pyc b/__pycache__/trade_logic.cpython-36.pyc index 04aef1a..71de022 100644 Binary files a/__pycache__/trade_logic.cpython-36.pyc and b/__pycache__/trade_logic.cpython-36.pyc differ diff --git a/autobasic/__pycache__/hualong_clienttrader.cpython-36.pyc b/autobasic/__pycache__/hualong_clienttrader.cpython-36.pyc index dbd3490..edb1a05 100644 Binary files a/autobasic/__pycache__/hualong_clienttrader.cpython-36.pyc and b/autobasic/__pycache__/hualong_clienttrader.cpython-36.pyc differ diff --git a/autobasic/hualong_clienttrader.py b/autobasic/hualong_clienttrader.py index a09fe72..fb36cc8 100644 --- a/autobasic/hualong_clienttrader.py +++ b/autobasic/hualong_clienttrader.py @@ -775,7 +775,7 @@ class HLClientTrader: self._app.window(control_id=0x0, class_name='#32770').window(control_id=0x1B67, class_name='Button').click() if __name__ == '__main__': - account_name = str('13903472399') + account_name = str('15935756162') a = HLClientTrader(account_name) a.login() diff --git a/broker_xiadan/hualong/T0002/cccache.dat b/broker_xiadan/hualong/T0002/cccache.dat index 4f1a669..0f98fe8 100644 Binary files a/broker_xiadan/hualong/T0002/cccache.dat and b/broker_xiadan/hualong/T0002/cccache.dat differ diff --git a/broker_xiadan/hualong/T0002/hostip.ini b/broker_xiadan/hualong/T0002/hostip.ini index 50a5f29..4f5c588 100644 --- a/broker_xiadan/hualong/T0002/hostip.ini +++ b/broker_xiadan/hualong/T0002/hostip.ini @@ -1,2 +1,2 @@ [WTHOST] -HostIP=180.95.226.86 +HostIP=61.178.68.15 diff --git a/broker_xiadan/hualong/T0002/usercomm.ini b/broker_xiadan/hualong/T0002/usercomm.ini index 8ec2cdf..41fdbc5 100644 --- a/broker_xiadan/hualong/T0002/usercomm.ini +++ b/broker_xiadan/hualong/T0002/usercomm.ini @@ -2,7 +2,7 @@ ssl=3 SAVEZH=0 [WTHOST] -PrimaryHost=5 +PrimaryHost=1 QHPrimaryHost=0 XYPrimaryHost=0 QQPrimaryHost=0 diff --git a/broker_xiadan/hualong/T0002/wt_cache/TcApi_Cache/HOST-61.178.68.15(443)-2.TCS b/broker_xiadan/hualong/T0002/wt_cache/TcApi_Cache/HOST-61.178.68.15(443)-2.TCS index 49b9ae9..db975d0 100644 Binary files a/broker_xiadan/hualong/T0002/wt_cache/TcApi_Cache/HOST-61.178.68.15(443)-2.TCS and b/broker_xiadan/hualong/T0002/wt_cache/TcApi_Cache/HOST-61.178.68.15(443)-2.TCS differ diff --git a/broker_xiadan/东吴证券金融终端独立下单/UserBehavior/CBASLog/logec308451c1d095c528cfa3c009ea7235.cbas b/broker_xiadan/东吴证券金融终端独立下单/UserBehavior/CBASLog/logec308451c1d095c528cfa3c009ea7235.cbas index 4812ac4..e33749e 100644 Binary files a/broker_xiadan/东吴证券金融终端独立下单/UserBehavior/CBASLog/logec308451c1d095c528cfa3c009ea7235.cbas and b/broker_xiadan/东吴证券金融终端独立下单/UserBehavior/CBASLog/logec308451c1d095c528cfa3c009ea7235.cbas differ diff --git a/broker_xiadan/东吴证券金融终端独立下单/disconnect.log b/broker_xiadan/东吴证券金融终端独立下单/disconnect.log index 4101e08..75c757f 100644 --- a/broker_xiadan/东吴证券金融终端独立下单/disconnect.log +++ b/broker_xiadan/东吴证券金融终端独立下单/disconnect.log @@ -162,3 +162,5 @@ [2025-06-30 16:56:10:552][0x01610C8A] Զδ [2025-06-30 17:01:00:624][0x0183050E] ϵͳ [2025-06-30 17:01:00:626][0x0183050E] Զδ +[2025-06-30 17:29:58:868][0x02F70B3A] ϵͳ +[2025-06-30 17:29:58:870][0x02F70B3A] Զδ diff --git a/broker_xiadan/东吴证券金融终端独立下单/user.dat b/broker_xiadan/东吴证券金融终端独立下单/user.dat index 5032a50..035d825 100644 Binary files a/broker_xiadan/东吴证券金融终端独立下单/user.dat and b/broker_xiadan/东吴证券金融终端独立下单/user.dat differ diff --git a/broker_xiadan/东吴证券金融终端独立下单/xiadan.ini b/broker_xiadan/东吴证券金融终端独立下单/xiadan.ini index 0a5bd58..f87b66c 100644 --- a/broker_xiadan/东吴证券金融终端独立下单/xiadan.ini +++ b/broker_xiadan/东吴证券金融终端独立下单/xiadan.ini @@ -465,7 +465,7 @@ WNDNAME=Ths_UserBehavior_test [WT_SERVER] LASTUPDATE=20141016 -TCP/IP_ACCOUNTTYPE2= +TCP/IP_ACCOUNTTYPE1= TCP/IP_ADDRESS0=wtssl.dwstock.com TCP/IP_ADDRESS1=58.240.173.150 TCP/IP_ADDRESS2=114.94.49.59 @@ -502,7 +502,7 @@ TCP/IP_DEPTID3=0100 TCP/IP_DEPTID4=0100 TCP/IP_DEPTID5=0100 TCP/IP_DEPTID6=0100 -TCP/IP_DEPTLIST2= +TCP/IP_DEPTLIST1= TCP/IP_DEPTNAME0=ʨɽ·Ӫҵ TCP/IP_DEPTNAME1=ʨɽ·Ӫҵ TCP/IP_DEPTNAME10=ʨɽ·Ӫҵ @@ -566,7 +566,7 @@ TCP/IP_POWER9=0 TCP/IP_PROXYPORT=0 TCP/IP_PROXYTYPE=0 TCP/IP_SERVER_NUM=7 -TCP/IP_SITEID2= +TCP/IP_SITEID1= TCP/IP_SSLCERT_PORT0=2235 TCP/IP_SSLCERT_PORT1=2235 TCP/IP_SSLCERT_PORT10=2235 diff --git a/broker_xiadan/东吴证券金融终端独立下单/xiadan.ini_bak b/broker_xiadan/东吴证券金融终端独立下单/xiadan.ini_bak index 33c4bd2..cf674c1 100644 --- a/broker_xiadan/东吴证券金融终端独立下单/xiadan.ini_bak +++ b/broker_xiadan/东吴证券金融终端独立下单/xiadan.ini_bak @@ -203,7 +203,7 @@ JJ_UNABLEKKZQ=1 NEED_APPROPRIATENESS_MANAGE=161 TJD_STAGGING_CD_TIP=\nñʧЧɾ\nȷ?\n WT_2016_NOTSEND_RZRQ_CX_RQFZDDMX=1 -WT_3MASK=50*;2*;51*;58*;03*;18:9*;42*;56*;706080;009*;01*;02*;09*;100*;101*;102*;103*;104*;105*;106*;107*;108*;109*;11*;12*;131*;130*;133*;134*;135*;136*;137*;138*;139*;14*;15*;16*;17*;18*;19*;404*;81*;821*;35:5*; +WT_3MASK=50*;2*;51*;58*;52*;03*;18:9*;42*;56*;706080;009*;01*;02*;09*;100*;101*;102*;103*;104*;105*;106*;107*;108*;109*;11*;12*;131*;130*;133*;134*;135*;136*;137*;138*;139*;14*;15*;16*;17*;18*;19*;404*;81*;821*;35:5*; WT_449_RQFZRZFZ_SUP_CHECK=0 WT_450_RQFZRZFZ_SUP_CHECK=1 WT_452_RQFZRZFZ_SUP_CHECK=1 @@ -322,7 +322,6 @@ WT_TJD_STAGGING_TIP3= WT_TJD_STAGGING_TIP4=֧ѹ깺롢깺ڵԤԼڵ
¹ɡתծδͨгĹƱ깺Ȩޡ WT_TONGXUN=0 WT_UPGRADEPORT=0 -WT_UPGRADEURL=http://xiucai-client.oss-cn-shanghai.aliyuncs.com/new_xiadan.exe WT_USESPRITE=0 WT_WIDTH=1494 WT_XDATA_ACCOUNT_ENCODE=1 @@ -333,7 +332,7 @@ WT_YYBIDS=0100|ʨɽ·Ӫҵ WT_ZCSX_ENABLE=1 WT_ZCSX_INTERVAL=1000 WT_ZCSX_WT_INTERVAL=10 -WT_ZHANGMASK=11*;12*;13*;10*;181*;12*;0707*;35:10*;35:11*;35:12*;35:13*;35:143*;35:144*;35:146*;35:149*;35:19*;19:009*;19:01*;19:02*;19:09*;19:101*;19:102*;19:103*;19:104*;19:105*;19:106*;19:107*;19:108*;19:12*;19:13*;19:14*;19:15*;19:16*;19:17*;19:18*;19:19*;19:2*;404*;81*; +WT_ZHANGMASK=11*;12*;13*;10*;181*;12*;0707*;35:10*;35:11*;35:12*;35:13*;35:143*;35:144*;35:146*;35:149*;35:19*;19:009*;19:01*;19:02*;19:09*;19:101*;19:102*;19:103*;19:104*;19:105*;19:106*;19:107*;19:108*;19:12*;19:13*;19:14*;19:15*;19:16*;19:17*;19:18*;19:19*;19:2*;404*;81*;821*;35:5*; WT_ZJHQ_FILTERBYZQDM=1 WT_ZXHQCHANGELSH_UPDATEYHSL=1 WT_ZXHQDQHY_LISTCHECK=1 @@ -489,7 +488,7 @@ TCP/IP_CRYPTPROTOCOL3=SSL TCP/IP_CRYPTPROTOCOL4=SSL TCP/IP_CRYPTPROTOCOL5=SSL TCP/IP_CRYPTPROTOCOL6=SSL -TCP/IP_CUR_SERVER=2 +TCP/IP_CUR_SERVER=1 TCP/IP_DEPTID0=0100 TCP/IP_DEPTID1=0100 TCP/IP_DEPTID2=0100 diff --git a/broker_xiadan/东吴证券金融终端独立下单/xml.log b/broker_xiadan/东吴证券金融终端独立下单/xml.log index 96d18bb..47c19d0 100644 --- a/broker_xiadan/东吴证券金融终端独立下单/xml.log +++ b/broker_xiadan/东吴证券金融终端独立下单/xml.log @@ -27326,3 +27326,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config.py b/config.py index 134fbcc..6c201f2 100644 --- a/config.py +++ b/config.py @@ -12,6 +12,6 @@ proxifier_path = r"C:\Program Files (x86)\Proxifier\Proxifier.exe" ppx_path = r"C:\Users\EDY\AppData\Roaming\Proxifier4\Profiles" # 第四类配置 -wlan_name = 'WLAN' +wlan_name = 'WLAN 2' diff --git a/imgs/temp1231.png b/imgs/temp1231.png index 455e0f8..bacb6d2 100644 Binary files a/imgs/temp1231.png and b/imgs/temp1231.png differ diff --git a/logs/13903472399.log b/logs/13903472399.log index c9c13cf..5efa787 100644 --- a/logs/13903472399.log +++ b/logs/13903472399.log @@ -89,3 +89,12 @@ [2025-06-30 16:39:36] [INFO] 代理IP已经获取{'ip': '121.61.19.102', 'port': 40004, 'prov': '湖北', 'city': '咸宁', 'isp': '电信', 'expire': '2025-06-30 16:44:36'} [2025-06-30 16:39:40] [INFO] 全局代理设置成功 [2025-06-30 16:39:52] [INFO] 获取服务器信息 +[2025-06-30 17:05:55] [INFO] Start login +[2025-06-30 17:06:12] [INFO] 代理IP已经获取{'ip': '119.102.159.13', 'port': 40006, 'prov': '湖北', 'city': '黄冈', 'isp': '电信', 'expire': '2025-06-30 17:11:12'} +[2025-06-30 17:06:16] [INFO] 全局代理设置成功 +[2025-06-30 17:06:30] [INFO] 上正在按多线程方式查找最快主站 +[2025-06-30 17:07:53] [WARNING] There are running programs, and there are processes in retreat +[2025-06-30 17:07:53] [INFO] Start login +[2025-06-30 17:08:14] [INFO] 代理IP已经获取{'ip': '117.90.218.116', 'port': 40023, 'prov': '江苏', 'city': '镇江', 'isp': '电信', 'expire': '2025-06-30 17:13:14'} +[2025-06-30 17:08:18] [INFO] 全局代理设置成功 +[2025-06-30 17:08:30] [INFO] 获取服务器信息 diff --git a/logs/15652609813.log b/logs/15652609813.log index b5eac35..6d48053 100644 --- a/logs/15652609813.log +++ b/logs/15652609813.log @@ -120,3 +120,7 @@ [2025-06-30 17:00:11] [INFO] Start login [2025-06-30 17:00:34] [INFO] 代理IP已经获取{'ip': '117.84.65.18', 'port': 40025, 'prov': '江苏', 'city': '无锡', 'isp': '电信', 'expire': '2025-06-30 17:05:34'} [2025-06-30 17:00:37] [INFO] 全局代理设置成功 +[2025-06-30 17:28:33] [INFO] Start login +[2025-06-30 17:29:05] [INFO] Start login +[2025-06-30 17:29:26] [INFO] 代理IP已经获取{'ip': '113.76.36.163', 'port': 40029, 'prov': '广东', 'city': '珠海', 'isp': '电信', 'expire': '2025-06-30 17:34:26'} +[2025-06-30 17:29:30] [INFO] 全局代理设置成功 diff --git a/logs/15935756162.log b/logs/15935756162.log index f01fae2..b03ec38 100644 --- a/logs/15935756162.log +++ b/logs/15935756162.log @@ -112,3 +112,14 @@ [2025-06-30 16:50:14] [INFO] 人验证码不匹本请重新输入 [2025-06-30 16:50:14] [WARNING] Verification code error [2025-06-30 16:50:19] [INFO] 和主站协商密钥 +[2025-06-30 17:12:04] [INFO] Start login +[2025-06-30 17:12:25] [INFO] 代理IP已经获取{'ip': '117.93.156.57', 'port': 40016, 'prov': '江苏', 'city': '盐城', 'isp': '电信', 'expire': '2025-06-30 17:17:25'} +[2025-06-30 17:12:29] [INFO] 全局代理设置成功 +[2025-06-30 17:12:41] [INFO] 人验证码不匹本请重新输入 +[2025-06-30 17:12:41] [WARNING] Verification code error +[2025-06-30 17:12:46] [INFO] 和主站协商密钥 +[2025-06-30 17:13:21] [WARNING] There are running programs, and there are processes in retreat +[2025-06-30 17:13:21] [INFO] Start login +[2025-06-30 17:13:46] [INFO] 代理IP已经获取{'ip': '180.112.218.214', 'port': 40006, 'prov': '江苏', 'city': '无锡', 'isp': '电信', 'expire': '2025-06-30 17:18:46'} +[2025-06-30 17:13:49] [INFO] 全局代理设置成功 +[2025-06-30 17:14:02] [INFO] 和主站协商密钥 diff --git a/mysql_table/ip_tracking.xlsx b/mysql_table/ip_tracking.xlsx index a5d5a93..025c0fa 100644 Binary files a/mysql_table/ip_tracking.xlsx and b/mysql_table/ip_tracking.xlsx differ diff --git a/tools.py b/tools.py index b6a9030..fd70e0f 100644 --- a/tools.py +++ b/tools.py @@ -864,12 +864,10 @@ class SetMac(object): mac_info = subprocess.check_output('GETMAC /v /FO list', stderr=subprocess.STDOUT) mac_info = mac_info.decode('gbk') self.logger.info('Your MAC address:\n'+mac_info) - # 想要匹配的连接名 - target_connection_name = "WLAN 2" # 构建正则表达式模式 pattern = re.compile( - r"连接名:\s+" + re.escape(target_connection_name) + r".*?物理地址:\s+([0-9A-Fa-f-]+)", + r"连接名:\s+" + re.escape(wlan_name) + r".*?物理地址:\s+([0-9A-Fa-f-]+)", re.DOTALL ) # 执行搜索 @@ -883,7 +881,7 @@ class SetMac(object): """ mac_info = subprocess.check_output('GETMAC /v /FO list', stderr=subprocess.STDOUT) mac_info = mac_info.decode('gbk') - search = re.search(r'(WLAN 2)\s+网络适配器: (.+)\s+物理地址:', mac_info) + search = re.search(r'({})\s+网络适配器: (.+)\s+物理地址:'.format(wlan_name), mac_info) self.logger.info(search) target_name, target_device = (search.group(1), search.group(2).strip()) if search else ('', '') diff --git a/trade_port_save.py b/trade_port_save.py index 2b69b95..7fae165 100644 --- a/trade_port_save.py +++ b/trade_port_save.py @@ -181,7 +181,7 @@ if __name__ == '__main__': # # userlist = ['13708491492','138187729 - userlist = [ '15847893305', '15935144173', '15935352028', '15935756162', '17696048251', '17835945987'] + userlist = [ '15935756162'] print(userlist) for user in userlist: SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__))