fix: 适配新版数字京师

Author: LeafYeeXYZ

catch.go

@@ -66,6 +66,8 @@ func (a *App) CatchCoursePub(
 				dialog.Accept()
 			})
 
+			page.SetDefaultNavigationTimeout(60_000)
+
 			// 跳转到登录页面
 			if useWebVpn {
 				_, err = page.Goto("https://one.bnu.edu.cn/dcp/forward.action?path=/portal/portal&p=home")
@@ -76,17 +78,17 @@ func (a *App) CatchCoursePub(
 			}
 
 			// 输入学号
-			ele = page.Locator("#un")
+			ele = page.Locator("#loginForm > div > div.username > input")
 			err = ele.Fill(studentID)
 			if err != nil { errCh <- err; return }
 
 			// 输入密码
-			ele = page.Locator("#pd")
+			ele = page.Locator("#password-input")
 			err = ele.Fill(password)
 			if err != nil { errCh <- err; return }
 
 			// 点击登录按钮
-			ele = page.Locator("#index_login_btn")
+			ele = page.Locator("#loginForm > div.login-btn-row > a")
 			err = ele.Click()
 			if err != nil { errCh <- err; return }
 
@@ -111,7 +113,7 @@ func (a *App) CatchCoursePub(
 				})
 				// 点击 "教务管理系统"
 				page.Evaluate(`() => {
-					const items = document.querySelectorAll('.ml_item_name')
+					const items = document.querySelectorAll('#common_div > ul > li > div.text-box')
 					for (const item of items) {
 						if (item.textContent?.includes('教务管理系统')) {
 							item.parentElement?.click()
@@ -315,6 +317,8 @@ func (a *App) CatchCourseMaj(
 				dialog.Accept()
 			})
 
+			page.SetDefaultNavigationTimeout(60_000)
+
 			// 跳转到登录页面
 			if useWebVpn {
 				_, err = page.Goto("https://one.bnu.edu.cn/dcp/forward.action?path=/portal/portal&p=home")
@@ -325,17 +329,17 @@ func (a *App) CatchCourseMaj(
 			}
 
 			// 输入学号
-			ele = page.Locator("#un")
+			ele = page.Locator("#loginForm > div > div.username > input")
 			err = ele.Fill(studentID)
 			if err != nil { errCh <- err; return }
 
 			// 输入密码
-			ele = page.Locator("#pd")
+			ele = page.Locator("#password-input")
 			err = ele.Fill(password)
 			if err != nil { errCh <- err; return }
 
 			// 点击登录按钮
-			ele = page.Locator("#index_login_btn")
+			ele = page.Locator("#loginForm > div.login-btn-row > a")
 			err = ele.Click()
 			if err != nil { errCh <- err; return }
 
@@ -360,7 +364,7 @@ func (a *App) CatchCourseMaj(
 				})
 				// 点击 "教务管理系统"
 				page.Evaluate(`() => {
-					const items = document.querySelectorAll('.ml_item_name')
+					const items = document.querySelectorAll('#common_div > ul > li > div.text-box')
 					for (const item of items) {
 						if (item.textContent?.includes('教务管理系统')) {
 							item.parentElement?.click()

frontend/src/components/Header.tsx

@@ -20,6 +20,8 @@ import {
   QuestionOutlined,
 } from '@ant-design/icons'
 
+const VERSION = '2.3.0'
+
 export function Header() {
 
   // 窗口置顶按钮
@@ -41,7 +43,7 @@ export function Header() {
         className='w-full h-full flex items-center justify-start text-sm gap-2 pl-3'
       >
         <span className='font-bold' data-tg-tour='测试'>小鸦抢课</span>
-        <Tag id='version' className='m-0 border-rose-950 bg-white leading-none py-[0.15rem] px-[0.3rem]'>2.2.0</Tag>
+        <Tag id='version' className='m-0 border-rose-950 bg-white leading-none py-[0.15rem] px-[0.3rem]'>{VERSION}</Tag>
         <Tag id='status' className='m-0 border-rose-950 bg-white leading-none py-[0.15rem] px-[0.3rem]'>{systemStatus}</Tag>
       </p>
       <button

watch.go

@@ -150,17 +150,17 @@ func (a *App) watchCoursePubCore(
 			}
 
 			// 输入学号
-			ele = page.Locator("#un")
+			ele = page.Locator("#loginForm > div > div.username > input")
 		  err = ele.Fill(studentID)
 			if err != nil { errCh <- err; return }
 
 			// 输入密码
-			ele = page.Locator("#pd")
+			ele = page.Locator("#password-input")
 			err = ele.Fill(password)
 			if err != nil { errCh <- err; return }
 
 			// 点击登录按钮
-			ele = page.Locator("#index_login_btn")
+			ele = page.Locator("#loginForm > div.login-btn-row > a")
 			err = ele.Click()
 			if err != nil { errCh <- err; return }
 
@@ -185,7 +185,7 @@ func (a *App) watchCoursePubCore(
 				})
 				// 点击 "教务管理系统"
 				page.Evaluate(`() => {
-					const items = document.querySelectorAll('.ml_item_name')
+					const items = document.querySelectorAll('#common_div > ul > li > div.text-box')
 					for (const item of items) {
 						if (item.textContent?.includes('教务管理系统')) {
 							item.parentElement?.click()
@@ -397,17 +397,17 @@ func (a *App) watchCoursePubSyncCore(
 	}
 
 	// 输入学号
-	ele = page.Locator("#un")
+	ele = page.Locator("#loginForm > div > div.username > input")
 	err = ele.Fill(studentID)
 	if err != nil { ch <- err; return }
 
 	// 输入密码
-	ele = page.Locator("#pd")
+	ele = page.Locator("#password-input")
 	err = ele.Fill(password)
 	if err != nil { ch <- err; return }
 
 	// 点击登录按钮
-	ele = page.Locator("#index_login_btn")
+	ele = page.Locator("#loginForm > div.login-btn-row > a")
 	err = ele.Click()
 	if err != nil { ch <- err; return }
 
@@ -432,7 +432,7 @@ func (a *App) watchCoursePubSyncCore(
 		})
 		// 点击 "教务管理系统"
 		page.Evaluate(`() => {
-			const items = document.querySelectorAll('.ml_item_name')
+			const items = document.querySelectorAll('#common_div > ul > li > div.text-box')
 			for (const item of items) {
 				if (item.textContent?.includes('教务管理系统')) {
 					item.parentElement?.click()
@@ -633,17 +633,17 @@ func (a *App) watchCourseMajCore(
 	}
 
 	// 输入学号
-	ele = page.Locator("#un")
+	ele = page.Locator("#loginForm > div > div.username > input")
 	err = ele.Fill(studentID)
 	if err != nil { ch <- err; return }
 
 	// 输入密码
-	ele = page.Locator("#pd")
+	ele = page.Locator("#password-input")
 	err = ele.Fill(password)
 	if err != nil { ch <- err; return }
 
 	// 点击登录按钮
-	ele = page.Locator("#index_login_btn")
+	ele = page.Locator("#loginForm > div.login-btn-row > a")
 	err = ele.Click()
 	if err != nil { ch <- err; return }
 
@@ -672,7 +672,7 @@ func (a *App) watchCourseMajCore(
 		})
 		// 点击 "教务管理系统"
 		page.Evaluate(`() => {
-			const items = document.querySelectorAll('.ml_item_name')
+			const items = document.querySelectorAll('#common_div > ul > li > div.text-box')
 			for (const item of items) {
 				if (item.textContent?.includes('教务管理系统')) {
 					item.parentElement?.click()