加入浏览器登录获取cookie功能，更新readme

Author: MrLinda

.gitignore

@@ -4,3 +4,4 @@
 /dist/
 /build/
 /config.ini
+/edgedriver_win64/

README.MD

@@ -2,6 +2,7 @@
 
 ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/MrLinda/WHUAutoEvaluate/total)
 
+
 ## 介绍
 
 同学们在考试过后需要在评价系统中评教后才能查询成绩，往往大多数人都厌烦这种~~形式主义的~~行为，于是我就做了这个脚本，帮助大家快速评教
@@ -17,9 +18,30 @@
 ## 环境
 
 > python
+> 
+> requests
+> 
+> selenium
 
 ## 使用方法
 
+### 下载
+
+[进入下载页面](https://github.com/MrLinda/WHUAutoEvaluate/releases)
+
+### 船新版本
+
+1. 打开软件
+2. 点击获取按钮
+3. 在弹出的Edge窗口中登录
+4. 等待片刻即可获取到教务系统cookie
+5. 点击查询，会将本次需要评教的课程显示出来
+6. 在得分百分比处填写需要给课程评的分数、在每门课程完成时间填写一门课评价完之后等待的时间
+7. 点击自动评教，等待完成
+8. 如果需要修改评分，可以在左侧列表中选中课程后使用软件右下区域修改评分
+
+### 老版本
+
 打开[评教系统](https://ugsqs.whu.edu.cn/new/student/)
 
 按下`F12`打开开发者工具
@@ -40,9 +62,4 @@ Edge:
 
 ![](./images/EXE.png)
 
-### 正式版
-
-按提示填入Cookie即可
-
-[下载](https://github.com/MrLinda/WHUAutoEvaluate/releases)
 

downloaddriver.py

@@ -0,0 +1,9 @@
+import os
+import shutil
+from webdriver_manager.microsoft import EdgeChromiumDriverManager
+
+def download_driver():
+    driver_path = EdgeChromiumDriverManager().install()
+    new_path = './edgedriver_win64'
+    os.makedirs("./edgedriver_win64/", exist_ok=True)
+    shutil.copy(driver_path, new_path)

getcookie.py

@@ -0,0 +1,49 @@
+from selenium import webdriver
+from selenium.webdriver.edge.service import Service
+
+import time
+import os
+import downloaddriver as dd
+
+
+def check_cookie(cookies):
+    for cookie in cookies:
+
+        if cookie['name'] == 'insert_cookie':
+            insert_cookie = cookie['value']
+        if cookie['name'] == 'iPlanetDirectoryPro':
+            iPlanetDirectoryPro = cookie['value']
+        if cookie['name'] == 'JSESSIONID' and cookie['path'] == '/':
+            JSESSIONID = cookie['value']
+
+    try:
+        return JSESSIONID, insert_cookie, iPlanetDirectoryPro
+    except:
+        return '', '', ''
+
+
+
+class GetCookie:
+    def __init__(self):
+        ser = Service()
+        if not os.path.exists("./edgedriver_win64/msedgedriver.exe"):
+            dd.download_driver()
+        ser.path = './edgedriver_win64/msedgedriver.exe'
+        browser = webdriver.Edge(service=ser)
+        url = 'https://ugsqs.whu.edu.cn/new/student/'
+
+        browser.get(url)
+        cookies = browser.get_cookies()
+
+        # print(browser.current_url.split('/')[2])
+        while browser.current_url.split('/')[2] == 'cas.whu.edu.cn':
+            time.sleep(1)
+            pass
+
+        cookies = browser.get_cookies()
+        print(cookies)
+        self.JSESSIONID, self.insert_cookie, self.iPlanetDirectoryPro = check_cookie(cookies)
+
+
+
+# c = GetCookie()

images/Edge.png

@@ -7,7 +7,7 @@
 import tkinter as tk
 from tkinter import messagebox
 from tkinter import ttk
-
+from getcookie import GetCookie
 
 flag_check = False
 courses = []
@@ -112,7 +112,9 @@ def auto_evaluate():
             'Referer': 'https://ugsqs.whu.edu.cn/new/student/rank/evaluate2.jsp',
             'cookie': cookie
         }
-        score_index = input_level.get()
+        score_index = int(input_level.get())
+        if score_index < 0:
+            score_index = 0
         evaluate_progress['value'] = 0
         for course in courses:
             if course['PJJGID'] is None:
@@ -150,7 +152,7 @@ def auto_evaluate():
                         wdvalue.append(('wdvalue', 0))
                     elif i['zbtx'] == '单选题':
                         dxid.append(('dxid', i['id']))
-                        dxvalue.append(('dxvalue', int(i['zbfz']) * int(score_index) / 100))
+                        dxvalue.append(('dxvalue', int(i['zbfz']) * score_index / 100))
                         # i['id']
                         # i['xxList']['zbxxfz']
                 data = dxid + dxvalue + sfjft + wdid + wdvalue
@@ -246,6 +248,18 @@ def change_evaluate():
         messagebox.showerror('错误', '请先获取数据！')
 
 
+def get_cookie():
+    gc = GetCookie()
+    if gc.insert_cookie != '':
+        input_jsessionID.delete(0, tk.END)
+        input_jsessionID.insert(tk.END, gc.JSESSIONID)
+        input_cookie.delete(0, tk.END)
+        input_cookie.insert(tk.END, gc.insert_cookie)
+        input_iPlanetDirectoryPro.delete(0, tk.END)
+        input_iPlanetDirectoryPro.insert(tk.END, gc.iPlanetDirectoryPro)
+
+
+
 def new_thread(target):
     if threading.active_count() == 1:
         add_thread = threading.Thread(target=target)
@@ -266,6 +280,10 @@ def change_evaluate_button_callback():
     new_thread(change_evaluate)
 
 
+def get_cookie_button_callback():
+    new_thread(get_cookie)
+
+
 if __name__ =='__main__':
     window = tk.Tk()
     window.title('WHU自动评教')
@@ -275,26 +293,29 @@ def change_evaluate_button_callback():
                                      (window.winfo_screenwidth() - window_width) / 2,
                                      (window.winfo_screenheight() - window_height) / 2))
 
-    label_jsessionID = tk.Label(window, text='JSEESIONID:', width=24)
+    label_jsessionID = tk.Label(window, text='JSEESIONID:', width=20)
     label_jsessionID.grid(row=0, column=0)
-    input_jsessionID = tk.Entry(window, width=60)
+    input_jsessionID = tk.Entry(window, width=36)
     input_jsessionID.grid(row=0, column=1)
 
     label_cookie = tk.Label(window, text='insert_cookie:')
     label_cookie.grid(row=1, column=0)
-    input_cookie = tk.Entry(window, width=60)
+    input_cookie = tk.Entry(window, width=36)
     input_cookie.grid(row=1, column=1)
 
     label_iPlanetDirectoryPro = tk.Label(window, text='iPlanetDirectoryPro:')
     label_iPlanetDirectoryPro.grid(row=2, column=0)
-    input_iPlanetDirectoryPro = tk.Entry(window, width=60)
+    input_iPlanetDirectoryPro = tk.Entry(window, width=36)
     input_iPlanetDirectoryPro.grid(row=2, column=1)
 
+    button_check = tk.Button(window, text='获取', width=20, height=3, command=get_cookie_button_callback)
+    button_check.grid(row=0, column=2, rowspan=3, padx=20, columnspan=1)
+
     button_check = tk.Button(window, text='查询', width=20, height=3, command=query_button_callback)
-    button_check.grid(row=0, column=2, rowspan=3, padx=30, columnspan=2)
+    button_check.grid(row=0, column=3, rowspan=3, padx=20, columnspan=2)
 
     course_table = ttk.Treeview(window, height=24, selectmode='browse')
-    course_table.grid(row=3, column=0, columnspan=2, rowspan=24)
+    course_table.grid(row=3, column=0, columnspan=3, rowspan=24)
     course_table["columns"] = ("Course", "Teacher", "State")
     course_table.heading("#0", text="序号")
     course_table.column("#0", width=60)
@@ -306,30 +327,30 @@ def change_evaluate_button_callback():
     course_table.column("State", width=80)
 
     label_level = tk.Label(window, text='得分百分比:')
-    label_level.grid(row=9, column=2)
+    label_level.grid(row=9, column=3)
     input_level = tk.Spinbox(window, from_=0, to=100, increment=20, width=12)
-    input_level.grid(row=9, column=3)
+    input_level.grid(row=9, column=4)
 
     label_delay = tk.Label(window, text='每门课程完成时间（秒）:')
-    label_delay.grid(row=10, column=2, columnspan=2)
+    label_delay.grid(row=10, column=3, columnspan=2)
     input_delay = tk.Entry(window, width=5)
     input_delay.insert(0, 10)
-    input_delay.grid(row=11, column=3)
+    input_delay.grid(row=11, column=4)
 
     button_auto = tk.Button(window, text='自动评教', width=20, height=3, command=auto_evaluate_button_callback)
-    button_auto.grid(row=12, column=2, rowspan=3, padx=30, columnspan=2)
+    button_auto.grid(row=12, column=3, rowspan=3, padx=30, columnspan=2)
 
     evaluate_progress = ttk.Progressbar(window, length=180)
-    evaluate_progress.grid(row=15, column=2, columnspan=2)
+    evaluate_progress.grid(row=15, column=3, columnspan=2)
     evaluate_progress['maximum'] = 100
 
     label_level2 = tk.Label(window, text='得分百分比:')
-    label_level2.grid(row=22, column=2)
+    label_level2.grid(row=22, column=3)
     input_level2 = tk.Spinbox(window, value=(20, 40, 60, 80, 100), width=12)
-    input_level2.grid(row=22, column=3)
+    input_level2.grid(row=22, column=4)
 
     button_auto = tk.Button(window, text='修改评价', width=20, height=3, command=change_evaluate_button_callback)
-    button_auto.grid(row=24, column=2, rowspan=3, padx=30, columnspan=2)
+    button_auto.grid(row=24, column=3, rowspan=3, padx=30, columnspan=2)
 
     conf = configparser.ConfigParser()
     config_path = './config.ini'

main.py

@@ -0,0 +1,2 @@
+requests~=2.31.0
+selenium~=4.19.0