From 3410f4b0ba507c4484241201ec184358e9c758ad Mon Sep 17 00:00:00 2001
From: EDY <728892034@qq.com>
Date: Fri, 11 Jul 2025 14:30:28 +0800
Subject: [PATCH] yuhua

---
 autobasic/guosheng_clienttrader.py     |  2 +-
 autobasic/gx_clienttrader.py           |  2 +-
 autobasic/haitong_clienttrader.py      |  2 +-
 autobasic/hengtai_clienttrader.py      |  4 ++--
 autobasic/hf_clienttrader.py           |  2 +-
 autobasic/huaxin_clienttrader.py       |  6 +++---
 autobasic/huaxinqidian_clienttrader.py |  6 +++---
 autobasic/jh_clienttrader.py           |  6 +++---
 autobasic/jy_clienttrader.py           |  6 +++---
 autobasic/ky_clienttrader.py           |  6 +++---
 autobasic/pa_clienttrader.py           |  6 +++---
 autobasic/sw_clienttrader.py           |  6 +++---
 autobasic/wh_clienttrader.py           |  6 +++---
 autobasic/xy_clienttrader.py           |  6 +++---
 autobasic/yh_clienttrader.py           |  6 +++---
 autobasic/zhongshan_clienttrader.py    |  6 +++---
 autobasic/zhongyou_clienttrader.py     |  6 +++---
 autobasic/zs_clienttrader.py           |  6 +++---
 autobasic/zxjt_clienttrader.py         |  1 -
 autobasic/zxzq_clienttrader.py         |  6 +++---
 trade_logic.py                         |  6 ++++++
 trade_port_save.py                     |  2 +-
 trade_port_trade.py                    | 14 --------------
 23 files changed, 55 insertions(+), 64 deletions(-)

diff --git a/autobasic/guosheng_clienttrader.py b/autobasic/guosheng_clienttrader.py
index b2a2771..e1b1da4 100644
--- a/autobasic/guosheng_clienttrader.py
+++ b/autobasic/guosheng_clienttrader.py
@@ -22,7 +22,7 @@ warnings.filterwarnings('ignore')
 scripts_path = os.path.dirname(os.path.realpath(__file__))
 root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
 
-path = r'C:\trade_software\国盛证券同花顺新一代\xiadan.exe'
+path = r'C:\国盛证券同花顺新一代\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/gx_clienttrader.py b/autobasic/gx_clienttrader.py
index b39f2d1..13386dc 100644
--- a/autobasic/gx_clienttrader.py
+++ b/autobasic/gx_clienttrader.py
@@ -22,7 +22,7 @@ warnings.filterwarnings('ignore')
 scripts_path = os.path.dirname(os.path.realpath(__file__))
 root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
 
-path = r'C:\trade_software\goldsun\TdxW.exe'
+path = r'C:\goldsun\TdxW.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/haitong_clienttrader.py b/autobasic/haitong_clienttrader.py
index 1c1c8aa..a7289c2 100644
--- a/autobasic/haitong_clienttrader.py
+++ b/autobasic/haitong_clienttrader.py
@@ -22,7 +22,7 @@ warnings.filterwarnings('ignore')
 scripts_path = os.path.dirname(os.path.realpath(__file__))
 root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
 
-path = r'C:\trade_software\e海通财独立交易\AlternateTradeSys5.18.73\xiadan.exe'
+path = r'C:\e海通财独立交易\AlternateTradeSys5.18.73\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/hengtai_clienttrader.py b/autobasic/hengtai_clienttrader.py
index c168373..8577a2e 100644
--- a/autobasic/hengtai_clienttrader.py
+++ b/autobasic/hengtai_clienttrader.py
@@ -22,7 +22,7 @@ warnings.filterwarnings('ignore')
 scripts_path = os.path.dirname(os.path.realpath(__file__))
 root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
 
-path = r'C:\trade_software\恒泰证券网上交易独立委托\xiadan.exe'
+path = r'C:\恒泰证券网上交易独立委托\xiadan.exe'
 
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
@@ -96,7 +96,7 @@ class HENGTAIClientTrader:
         set_proxy(proxy_ip,proxy_port)
         self.log.info('全局代理设置成功')
 
-        
+
         self._app = pywinauto.Application().start(self.path)
         time.sleep(0.5)
         self._app.top_window().Edit1.type_keys(self.securities_name)
diff --git a/autobasic/hf_clienttrader.py b/autobasic/hf_clienttrader.py
index 3a69df7..e4da908 100644
--- a/autobasic/hf_clienttrader.py
+++ b/autobasic/hf_clienttrader.py
@@ -22,7 +22,7 @@ warnings.filterwarnings('ignore')
 scripts_path = os.path.dirname(os.path.realpath(__file__))
 root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
 
-path = r'C:\trade_software\华福证券独立下单\xiadan.exe'
+path = r'C:\华福证券独立下单\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/huaxin_clienttrader.py b/autobasic/huaxin_clienttrader.py
index ca2f126..4c4256f 100644
--- a/autobasic/huaxin_clienttrader.py
+++ b/autobasic/huaxin_clienttrader.py
@@ -19,10 +19,10 @@ import datetime
 from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\华鑫同花顺独立下单\xiadan.exe'
+path = r'C:\华鑫同花顺独立下单\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/huaxinqidian_clienttrader.py b/autobasic/huaxinqidian_clienttrader.py
index 7a3a3a3..01e09f8 100644
--- a/autobasic/huaxinqidian_clienttrader.py
+++ b/autobasic/huaxinqidian_clienttrader.py
@@ -17,10 +17,10 @@ import datetime
 from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\华鑫同花顺独立下单(奇点)\xiadan.exe'
+path = r'C:\华鑫同花顺独立下单(奇点)\xiadan.exe'
 
 
 class HuaXinClientTrader:
diff --git a/autobasic/jh_clienttrader.py b/autobasic/jh_clienttrader.py
index 5c80ee2..f37959d 100644
--- a/autobasic/jh_clienttrader.py
+++ b/autobasic/jh_clienttrader.py
@@ -19,10 +19,10 @@ import datetime
 from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\江海证券同花顺独立下单\xiadan.exe'
+path = r'C:\江海证券同花顺独立下单\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/jy_clienttrader.py b/autobasic/jy_clienttrader.py
index fbca879..0c52974 100644
--- a/autobasic/jy_clienttrader.py
+++ b/autobasic/jy_clienttrader.py
@@ -19,10 +19,10 @@ from tools import *
 from config import ssid,password
 
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\金元证券金融终端2.0\xiadan.exe'
+path = r'C:\金元证券金融终端2.0\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/ky_clienttrader.py b/autobasic/ky_clienttrader.py
index 607fa3a..7688af2 100644
--- a/autobasic/ky_clienttrader.py
+++ b/autobasic/ky_clienttrader.py
@@ -20,10 +20,10 @@ from tools import *
 from config import ssid,password
 
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\开源证券独立下单\xiadan.exe'
+path = r'C:\开源证券独立下单\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/pa_clienttrader.py b/autobasic/pa_clienttrader.py
index 0113074..04188db 100644
--- a/autobasic/pa_clienttrader.py
+++ b/autobasic/pa_clienttrader.py
@@ -17,10 +17,10 @@ import datetime
 from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\平安证券智投版\xiadan.exe'
+path = r'C:\平安证券智投版\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/sw_clienttrader.py b/autobasic/sw_clienttrader.py
index 498d379..531fd30 100644
--- a/autobasic/sw_clienttrader.py
+++ b/autobasic/sw_clienttrader.py
@@ -19,10 +19,10 @@ import datetime
 from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\sywgtonghuashun\xiadan.exe'
+path = r'C:\sywgtonghuashun\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/wh_clienttrader.py b/autobasic/wh_clienttrader.py
index 0311081..58cad13 100644
--- a/autobasic/wh_clienttrader.py
+++ b/autobasic/wh_clienttrader.py
@@ -18,10 +18,10 @@ import datetime
 from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\万和证券财智通金融终端\xiadan.exe'
+path = r'C:\万和证券财智通金融终端\xiadan.exe'
 
 
 class WanHeClientTrader:
diff --git a/autobasic/xy_clienttrader.py b/autobasic/xy_clienttrader.py
index 7f87a6d..a948211 100644
--- a/autobasic/xy_clienttrader.py
+++ b/autobasic/xy_clienttrader.py
@@ -18,10 +18,10 @@ from tools import *
 from config import ssid,password
 
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\xyzqzhb\xiadan.exe'
+path = r'C:\xyzqzhb\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/yh_clienttrader.py b/autobasic/yh_clienttrader.py
index 4bf852c..d7a27e6 100644
--- a/autobasic/yh_clienttrader.py
+++ b/autobasic/yh_clienttrader.py
@@ -20,10 +20,10 @@ from config import ssid,password
 from tools import *
 
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\双子星金融终端独立交易-中国银河证券\xiadan.exe'
+path = r'C:\双子星金融终端独立交易-中国银河证券\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/zhongshan_clienttrader.py b/autobasic/zhongshan_clienttrader.py
index c35ffd1..f34e868 100644
--- a/autobasic/zhongshan_clienttrader.py
+++ b/autobasic/zhongshan_clienttrader.py
@@ -20,10 +20,10 @@ import datetime
 from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\中山赢者专业版\xiadan.exe'
+path = r'C:\中山赢者专业版\xiadan.exe'
 
 
 class ZSZQClientTrader:
diff --git a/autobasic/zhongyou_clienttrader.py b/autobasic/zhongyou_clienttrader.py
index 22eea27..6bb51bf 100644
--- a/autobasic/zhongyou_clienttrader.py
+++ b/autobasic/zhongyou_clienttrader.py
@@ -19,10 +19,10 @@ import datetime
 from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\zhongyou\xiadan.exe'
+path = r'C:\zhongyou\xiadan.exe'
 
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
diff --git a/autobasic/zs_clienttrader.py b/autobasic/zs_clienttrader.py
index bc858fe..c985d3e 100644
--- a/autobasic/zs_clienttrader.py
+++ b/autobasic/zs_clienttrader.py
@@ -19,10 +19,10 @@ from tools import *
 from config import ssid,password
 
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\zd_zsone\TdxW.exe'
+path = r'C:\zd_zsone\TdxW.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/autobasic/zxjt_clienttrader.py b/autobasic/zxjt_clienttrader.py
index 3a47d16..c6348ac 100644
--- a/autobasic/zxjt_clienttrader.py
+++ b/autobasic/zxjt_clienttrader.py
@@ -19,7 +19,6 @@ import datetime
 from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
-scripts_path = os.path.dirname(os.path.realpath(__file__))
 from pathlib import Path
 root_path = Path(__file__).parent.parent
 
diff --git a/autobasic/zxzq_clienttrader.py b/autobasic/zxzq_clienttrader.py
index 078d2b1..30eab80 100644
--- a/autobasic/zxzq_clienttrader.py
+++ b/autobasic/zxzq_clienttrader.py
@@ -20,10 +20,10 @@ from tools import *
 from config import ssid,password
 warnings.filterwarnings('ignore')
 
-scripts_path = os.path.dirname(os.path.realpath(__file__))
-root_path = scripts_path[:scripts_path.find(project_name)+len(project_name)]
+from pathlib import Path
+root_path = Path(__file__).parent.parent
 
-path = r'C:\trade_software\zxzq\xiadan.exe'
+path = r'C:\zxzq\xiadan.exe'
 engine = create_engine(
             'mysql+pymysql://cn_ainvest_db:cn_ainvest_sd3a1@rm-2zewagytttzk6f24xno.mysql.rds.aliyuncs.com:3306/',
             encoding="utf-8", echo=False)
diff --git a/trade_logic.py b/trade_logic.py
index 56fa728..0036227 100644
--- a/trade_logic.py
+++ b/trade_logic.py
@@ -188,6 +188,12 @@ class Trade:
         elif self.broker == '国盛' or self.broker == '国盛证券':
             from autobasic import guosheng_clienttrader
             user = guosheng_clienttrader.GuoShengClientTrader(self.user)
+        elif self.broker == '长江' or self.broker == '长江证券':
+            from autobasic import cj_clienttrader
+            user = cj_clienttrader.ChangJiangClientTrader(self.user)
+        elif self.broker == '江海' or self.broker == '江海证券':
+            from autobasic import jh_clienttrader
+            user = jh_clienttrader.JHClientTrader(self.user)
         else:
             self.log.error('暂不支持该券商')
         return user
diff --git a/trade_port_save.py b/trade_port_save.py
index 0d57a6a..404d9e3 100644
--- a/trade_port_save.py
+++ b/trade_port_save.py
@@ -181,7 +181,7 @@ if __name__ == '__main__':
     #
     # userlist = ['13708491492','138187729
 
-    userlist = [  '13653488300']
+    userlist = [  '18636191815']
     print(userlist)
     for user in userlist:
         SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__))
diff --git a/trade_port_trade.py b/trade_port_trade.py
index 7be11ca..13090d7 100644
--- a/trade_port_trade.py
+++ b/trade_port_trade.py
@@ -97,12 +97,6 @@ class auto_trade:
             logger.info(user)
             try:
                 self.trade_main(user)
-                writer = ExcelDataWriter()
-                writer.update_latest_record(
-                    status='成功',
-                    remarks='实盘数据',
-                    risk_response=''
-                )
                 logger.info(f'{user}交易已经完成')
 
             except Exception as er:
@@ -119,14 +113,6 @@ class auto_trade:
                 else:
                     logger.error('交易错误')
                     logger.error(er)
-                #
-                writer = ExcelDataWriter()
-                writer.update_latest_record(
-                    status='失败',
-                    remarks='实盘数据',
-                    risk_response=str(er)
-                )
-
 
                 continue