Update YdszTool.py

Author: Tongrens

YdszTool.py

@@ -33,6 +33,7 @@ def login(self):
         class NoRedirHandler(urllib.request.HTTPRedirectHandler):
             def http_error_302(self, req, fp, code, msg, headers):
                 return fp
+
             http_error_301 = http_error_302
 
         print('正在登录...')
@@ -150,7 +151,10 @@ def run(self):
                 self.login()
                 break
             except Exception as e:
+<<<<<<< Updated upstream
                 print(datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
+=======
+>>>>>>> Stashed changes
                 if '由于目标计算机积极拒绝，无法连接。' in str(e) or 'Errno 111' in str(e):
                     print('一网通已关闭，正在重试...')
                     sleep(2)
@@ -205,7 +209,11 @@ def win_run():
                 print('开始时间小于当前时间')
                 return
             self.max_site = int(yysc_inp.get())
+<<<<<<< Updated upstream
             self.shopNum = '1001' if value1.get() == '西丽湖' else '1002'
+=======
+            self.shopNum = '1001' if value1.get() == '西丽湖' else self.shopNum = '1002'
+>>>>>>> Stashed changes
             self.post_type = value2.get()
             if self.shopNum == '1001':
                 self.shopName = 'xlh' + self.post_dict[self.post_type]
@@ -322,7 +330,7 @@ def linux_run(self):
     max_site = 3  # 最多预约几小时(最多3小时)
     shopNum = '1001'  # 西丽湖：1001  留仙洞：1002
     post_type = '羽毛球'  # 羽毛球, 健身中心, 游泳, 风雨篮球, 灯光篮球, 网球, 体能中心
-    run_type = 1  # 1：Windows端  2：Linux端
+    run_type = 2  # 1：Windows端  2：Linux端
     main = Ydsz(username, password, day, starttime, endtime, max_site, shopNum, post_type)
     main.win_box() if run_type == 1 else main.linux_run()
     input('程序结束，按回车键退出')