get data circle update

.gitignore

@@ -58,3 +58,4 @@ docs/_build/
 # PyBuilder
 target/
 
+.idea/

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/UniappTool.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="cn.fjdmy.uniapp.UniappProjectDataService">
+    <option name="generalBasePath" value="$PROJECT_DIR$" />
+    <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
+    <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
+    <option name="scanNum" value="1" />
+    <option name="type" value="store" />
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/python-yzy.iml" filepath="$PROJECT_DIR$/.idea/python-yzy.iml" />
+    </modules>
+  </component>
+</project>

.idea/python-yzy.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

charles.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIFPjCCBCagAwIBAgIGAY3bBeZpMA0GCSqGSIb3DQEBCwUAMIGjMTQwMgYDVQQDDCtDaGFybGVz
+IFByb3h5IENBICgyNCBGZWIgMjAyNCwgMTkyLjE2OC4wLjkpMSUwIwYDVQQLDBxodHRwczovL2No
+YXJsZXNwcm94eS5jb20vc3NsMREwDwYDVQQKDAhYSzcyIEx0ZDERMA8GA1UEBwwIQXVja2xhbmQx
+ETAPBgNVBAgMCEF1Y2tsYW5kMQswCQYDVQQGEwJOWjAeFw0yNDAyMjMxMjEwMTNaFw0yNTAyMjIx
+MjEwMTNaMIGjMTQwMgYDVQQDDCtDaGFybGVzIFByb3h5IENBICgyNCBGZWIgMjAyNCwgMTkyLjE2
+OC4wLjkpMSUwIwYDVQQLDBxodHRwczovL2NoYXJsZXNwcm94eS5jb20vc3NsMREwDwYDVQQKDAhY
+SzcyIEx0ZDERMA8GA1UEBwwIQXVja2xhbmQxETAPBgNVBAgMCEF1Y2tsYW5kMQswCQYDVQQGEwJO
+WjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJnhglPsxO5uW9d2fG+Vad+Gd+n3zZW
+1voRnZZRJRk2/7ON3WetzKAFuwfCeb8qLZ+YeeBxWKEgAdMBg4F6la5muWwqFxoEFRiGSsWhqxxx
+I3aAWOIraw7dKjoLStHWWtPhc1RRl2XNGm6U+UU+IFWIDitF+MCg1QIa64nHymxcSZDQPcuNPS8x
+Sev8sqVr1r0xR/wC1FbF3Bfjljlis4qEEi8SYWcCbLT15OX8xIw2Fp4hYeVpF/4a2ksgGxbrUx0z
+Q1q++3vvejE+X262we60F0yv5NRap3BzD15DSLhTswBL6/9vtxLUy1MZpkBrWB7bn0RL+YAjpuNI
+pkycLbECAwEAAaOCAXQwggFwMA8GA1UdEwEB/wQFMAMBAf8wggEsBglghkgBhvhCAQ0EggEdE4IB
+GVRoaXMgUm9vdCBjZXJ0aWZpY2F0ZSB3YXMgZ2VuZXJhdGVkIGJ5IENoYXJsZXMgUHJveHkgZm9y
+IFNTTCBQcm94eWluZy4gSWYgdGhpcyBjZXJ0aWZpY2F0ZSBpcyBwYXJ0IG9mIGEgY2VydGlmaWNh
+dGUgY2hhaW4sIHRoaXMgbWVhbnMgdGhhdCB5b3UncmUgYnJvd3NpbmcgdGhyb3VnaCBDaGFybGVz
+IFByb3h5IHdpdGggU1NMIFByb3h5aW5nIGVuYWJsZWQgZm9yIHRoaXMgd2Vic2l0ZS4gUGxlYXNl
+IHNlZSBodHRwOi8vY2hhcmxlc3Byb3h5LmNvbS9zc2wgZm9yIG1vcmUgaW5mb3JtYXRpb24uMA4G
+A1UdDwEB/wQEAwICBDAdBgNVHQ4EFgQU3a/VBgRHc3tpbcDVyclIl4T4NfgwDQYJKoZIhvcNAQEL
+BQADggEBAJait+i0+r3DVHiQHl7H/72iCf2QOinYhTwJp8HAuAWiuuTSaMrvd+bQ4/Dpp99aSPPY
+j9F2E2DdFhMJEVi2OEplO6PPXc0uRp9B5xFXjGxCWvFWtivBoo0jsozFtjz2ZyL0kKoJwGVcG57f
+Hrb+rUPWzjnD4huCyZw0pB8VGXFW847398bjkaJQibKNoprJHEWKmduDs1RjvTsX3Z3oK+redgNA
+voGofHQsgUjh4rdDHoxOrd4FuNPz2tBTIyuF8TIr+QfXgxcYadFNMfJ1TbNDvNKNHadXUm1JDj2Y
+U1xH58LhDES4ILVFAz2N6dTF+DTXM61748af6zk5iw1ZRoA=
+-----END CERTIFICATE-----

main.py

@@ -26,16 +26,16 @@ from selenium.webdriver.support import expected_conditions
 isProfession = False
 driver = ''
 # 起始id
-startId = 10001
+startId = 10006
 # 结束id
-endId = 11500
+endId = 12900
 # ignores
 ignores = []
 # indicate, higher priority than start-end for no-seq targets
 targets = []
 
-card_id = "16416117"
-card_pwd = "396254"
+card_id = "15700779"
+card_pwd = "244796"
 
 phone = '13974787400'
 phone_pwd = 'Xj654123'
@@ -44,14 +44,14 @@ hide_guide = False
 stop = False
 retry_times_max = 1  # 搜索loading时，间隔几次重新点击搜索
 retry_current = 0  # 暂时没有用途了
-batch_count = 2  # 有几个批次
+batch_count = 3  # 有几个批次
 subject_default_top = True  # 默认理科、物理
-plan_change_years = [2,3]  # 计划取几年？从 2 开始
-profession_change_years = [1,2,3,4]  # 专业取几年？从 2 开始
+plan_change_years = [2,3]  # 计划取几年？从 1 开始
+profession_change_years = [1]  # 专业取几年？从 1 开始
 # 登录方式 1 卡号 2 手机密码
 loginType = 1
 # 数据类型 1 招生计划 2 历年录取 3 两者都有
-dataType = 1
+dataType = 2
 
 
 def randomSleep():
@@ -356,9 +356,12 @@ def get_data(tab_index, change_years):
         if change_years[0] == 1: # 如果第 1 个是默认年份，直接开始批次切换
             cicle()
         for year in change_years:
-            # 从第二个年份开始切换
-            change_time(year)
-            cicle()
+            if year == 1:
+                cicle()
+            else:
+                # 从第二个年份开始切换
+                change_time(year)
+                cicle()
     else:
         raise Exception("切换tab失败")