From 00445f3cfbf4d7191cd2358aecf2a665b7f9da11 Mon Sep 17 00:00:00 2001
From: tychxn <tychxn@gmail.com>
Date: Thu, 6 Feb 2020 03:04:24 +0800
Subject: [PATCH] Feat: add config

---
 config.ini      |  5 ++++-
 jd_assistant.py | 34 ++++++++++++++--------------------
 util.py         |  2 --
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/config.ini b/config.ini
index 1693c60..a417fdd 100644
--- a/config.ini
+++ b/config.ini
@@ -7,9 +7,12 @@
 payment_pwd =
 
 [config]
-# eid 和 fp 两个参数必须填写，可以通过浏览器打开目录中的 get_eid_fp.html 页面进行自动获取
+# eid, fp, track_id, risk_control 四个参数必须填写，具体请参考 wiki-常见问题
+# 随意填写可能导致订单无法提交等问题
 eid =
 fp =
+track_id =
+risk_control =
 
 # 查询库存请求超时(秒)，可选配置，默认10秒
 timeout =
diff --git a/jd_assistant.py b/jd_assistant.py
index 6a82974..4db5784 100644
--- a/jd_assistant.py
+++ b/jd_assistant.py
@@ -16,7 +16,6 @@
 from messenger import Messenger
 from timer import Timer
 from util import (
-    DEFAULT_TRACK_ID,
     DEFAULT_TIMEOUT,
     DEFAULT_USER_AGENT,
     check_login,
@@ -39,36 +38,31 @@
 class Assistant(object):
 
     def __init__(self):
-        self.username = ''
-        self.nick_name = ''
-        self.is_login = False
-
         use_random_ua = global_config.getboolean('config', 'random_useragent')
         self.user_agent = DEFAULT_USER_AGENT if not use_random_ua else get_random_useragent()
-        self.headers = {
-            'User-Agent': self.user_agent,
-        }
-        self.sess = requests.session()
-
-        self.item_cat = dict()
-        self.item_vender_ids = dict()  # 记录商家id
-
-        self.risk_control = ''
+        self.headers = {'User-Agent': self.user_agent}
         self.eid = global_config.get('config', 'eid').strip()
         self.fp = global_config.get('config', 'fp').strip()
-        if not self.eid or not self.fp:
-            raise AsstException('请在 config.ini 中配置 eid 和 fp 参数')
+        self.track_id = global_config.get('config', 'track_id').strip()
+        self.risk_control = global_config.get('config', 'risk_control').strip()
+        if not self.eid or not self.fp or not self.track_id or not self.risk_control:
+            raise AsstException('请在 config.ini 中配置 eid, fp, track_id, risk_control 参数，具体请参考 wiki-常见问题')
 
-        self.track_id = DEFAULT_TRACK_ID
         self.timeout = float(global_config.get('config', 'timeout') or DEFAULT_TIMEOUT)
+        self.send_message = global_config.getboolean('messenger', 'enable')
+        self.messenger = Messenger() if self.send_message else None
+
+        self.item_cat = dict()
+        self.item_vender_ids = dict()  # 记录商家id
 
         self.seckill_init_info = dict()
         self.seckill_order_data = dict()
         self.seckill_url = dict()
 
-        self.send_message = global_config.getboolean('messenger', 'enable')
-        self.messenger = Messenger() if self.send_message else None
-
+        self.username = ''
+        self.nick_name = ''
+        self.is_login = False
+        self.sess = requests.session()
         try:
             self._load_cookies()
         except Exception:
diff --git a/util.py b/util.py
index f60d6d4..f93444c 100644
--- a/util.py
+++ b/util.py
@@ -23,8 +23,6 @@
 
 DEFAULT_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.181 Safari/537.36'
 
-DEFAULT_TRACK_ID = '9643cbd55bbbe103eef18a213e069eb0'
-
 DEFAULT_TIMEOUT = 10