miniprogram/api/EduBase.ts

@@ -1,95 +0,0 @@
-import { API, IAnyData, GeneralCallbackResult } from "../core/Api";
-import { EventType } from "../core/Emitter";
-
-interface ILoginEvent {
-
-    /**
-     * session 过期
-     */
-    expire: GeneralCallbackResult;
-
-    /**
-     * 登录失败
-     */
-    unauthorized: GeneralCallbackResult;
-
-    /**
-     * 未知的问题
-     */
-    error: GeneralCallbackResult;
-
-    /**
-     * 数据损坏或丢失
-     */
-    badData: GeneralCallbackResult;
-}
-
-/**
- * 教务处基础 API
- * @template I API 输入数据
- * @template O API 输出数据
- * @template E API 中的事件
- * @template U 用户自定义的输出数据
- */
-abstract class EduBase<
-	I extends IAnyData = IAnyData, 
-	O extends IAnyData = IAnyData,
-	E extends Record<EventType, any> = {}
-> extends API<I, O, {
-	[P in (keyof ILoginEvent | keyof E)]: P extends keyof ILoginEvent ? ILoginEvent[P] : E[P]
-}> {
-
-	protected useEduCallback(
-		parseFunction: (data: any) => O
-	): void {
-
-		this.addFailedCallBack();
-
-        this.on("success", (data) => {
-
-            let isSuccess = true;
-            let errMsg = "";
-            let res: O | undefined;
-            const info: any = data.data;
-
-            // 数据缺失检测
-            if(!info) {
-                isSuccess = false;
-                errMsg = "Bad Data";
-                this.emit("badData", { errMsg });
-            }
-
-            if (isSuccess) switch (info.code) {
-                case (1):
-                    res = parseFunction(info.data);
-                    errMsg = info.err_msg ?? "Success";
-                    this.emit("ok", res!);
-                    break;
-
-                case (2):
-                    isSuccess = false;
-                    errMsg = info.err_msg ?? "Session Expire";
-                    this.emit("expire", { errMsg });
-                    break;
-
-                case (3):
-                    isSuccess = false;
-                    errMsg = info.err_msg ?? "Unauthorized";
-                    this.emit("unauthorized", { errMsg });
-                    break;
-
-                case (4):
-                    isSuccess = false;
-                    errMsg = info.err_msg ?? "Error";
-                    this.emit("error", { errMsg });
-                    break;
-            }
-
-            if (!isSuccess) this.emit("no", { errMsg });
-            this.emit("done", { errMsg, data: res });
-        });
-	}
-}
-
-export { EduBase };
-export default EduBase;

miniprogram/api/Login.ts

@@ -1,5 +1,4 @@
-import { HTTPMethod, IParamSetting } from "../core/Api";
+import { API, HTTPMethod, IParamSetting, GeneralCallbackResult } from "../core/Api";
-import { EduBase } from "./EduBase";
 
 interface ILoginInput {
 
@@ -43,12 +42,35 @@ interface ILoginOutput {
     eduSession: string;
 }
 
+interface ILoginEvent {
+
+    /**
+     * session 过期
+     */
+    expire: GeneralCallbackResult;
+
+    /**
+     * 登录失败
+     */
+    unauthorized: GeneralCallbackResult;
+
+    /**
+     * 未知的问题
+     */
+    error: GeneralCallbackResult;
+
+    /**
+     * 数据损坏或丢失
+     */
+    badData: GeneralCallbackResult;
+}
+
 /**
  * Login API
  * 此 API 用来向教务处发起登录请求
  * 请求成功后将获得教务处返回的 session
  */
-class Login extends EduBase<ILoginInput, ILoginOutput> {
+class Login extends API<ILoginInput, ILoginOutput, ILoginEvent> {
 
     public override url: string = "/login";
 
@@ -70,13 +92,57 @@ class Login extends EduBase<ILoginInput, ILoginOutput> {
         super();
         this.initDebugLabel("Login");
 
-        this.useEduCallback((data) => ({
+        this.addFailedCallBack();
-            idCardLast6: data.idCard,
+
-            eduService: data.ip,
+        this.on("success", (data) => {
-            actualName: data.name,
+
-            isSubscribeWxAccount: data.official,
+            let isSuccess = true;
-            eduSession: data.session
+            let errMsg = "";
-        }));
+            let res: ILoginOutput | undefined;
+            const info: any = data.data;
+
+            // 数据缺失检测
+            if(!info) {
+                isSuccess = false;
+                errMsg = "Bad Data";
+                this.emit("badData", { errMsg });
+            }
+
+            if (isSuccess) switch (info.code) {
+                case (1):
+                    res = {
+                        idCardLast6: info.data.idCard,
+                        eduService: info.data.ip,
+                        actualName: info.data.name,
+                        isSubscribeWxAccount: info.data.official,
+                        eduSession: info.data.session
+                    };
+                    errMsg = info.err_msg ?? "Success";
+                    this.emit("ok", res);
+                    break;
+
+                case (2):
+                    isSuccess = false;
+                    errMsg = info.err_msg ?? "Session Expire";
+                    this.emit("expire", { errMsg });
+                    break;
+
+                case (3):
+                    isSuccess = false;
+                    errMsg = info.err_msg ?? "Unauthorized";
+                    this.emit("unauthorized", { errMsg });
+                    break;
+
+                case (4):
+                    isSuccess = false;
+                    errMsg = info.err_msg ?? "Error";
+                    this.emit("error", { errMsg });
+                    break;
+            }
+
+            if (!isSuccess) this.emit("no", { errMsg });
+            this.emit("done", { errMsg, data: res });
+        });
     }
 }
 

miniprogram/api/Schedule.ts

@@ -1,5 +1,4 @@
-import { HTTPMethod, IParamSetting } from "../core/Api";
+import { API, HTTPMethod, IParamSetting, GeneralCallbackResult} from "../core/Api";
-import { EduBase } from "./EduBase";
 
 interface IScheduleInput {
 
@@ -37,7 +36,7 @@ interface IClassData {
     week: string;
 }
 
-type IScheduleOutput = {
+interface IScheduleOutput {
 
     /**
      * 课程列表
@@ -50,15 +49,38 @@ type IScheduleOutput = {
     index: number;
 }[];
 
+interface IScheduleEvent {
+    /**
+     * session 过期
+     */
+    expire: GeneralCallbackResult;
+
+     /**
+      * 登录失败
+      */
+    unauthorized: GeneralCallbackResult;
+ 
+     /**
+      * 未知的问题
+      */
+    error: GeneralCallbackResult;
+ 
+     /**
+      * 数据损坏或丢失
+      */
+    badData: GeneralCallbackResult;
+}
+
+
 /**
  * Schedule API
  * 需要session与semester
  * 此 API 用来向教务处发起获取课程表的请求
  * 请求成功后将获得教务处返回的课程表JSON文件
  */
-class Schedlue extends EduBase<IScheduleInput, IScheduleOutput> {
+class Schedlue extends API<IScheduleInput, IScheduleOutput, IScheduleEvent> {
     
-    public override baseUrl: string = "https://jwc.2333.pub";
+    public override baseUrl: string = "jwc.2333.pub";
  
     public override url = "/course_timetable";
 
@@ -80,31 +102,7 @@ class Schedlue extends EduBase<IScheduleInput, IScheduleOutput> {
         super();
         this.initDebugLabel("Schedule");
         
-        this.useEduCallback((data) => {
+        this.addFailedCallBack();
-            const res: IScheduleOutput = [];
-
-            for( let i = 0; i < data.length; i++ ) {
-                const classList: IClassData[] = [];
-                const CTTDetails = data[i].CTTDetails ?? [];
-
-                for( let j = 0; j < CTTDetails.length; j++ ) {
-
-                    classList.push({
-                        name: CTTDetails[j].Name,
-                        room: CTTDetails[j].Room,
-                        teacher: CTTDetails[j].Teacher,
-                        week: CTTDetails[j].Week,
-                    })
-                }
-
-                res.push({
-                    classList,
-                    index: data[i].Id
-                })
-            }
-            return res;
-
-        });
     }
 }
 

miniprogram/core/Api.ts

@@ -698,4 +698,4 @@ enum HTTPMethod {
 }
 
 export default API;
-export { API, IParamSetting, IAppAPIParam, IAnyData, ICallBack, HTTPMethod, RequestPolicy, GeneralCallbackResult }
+export { API, IParamSetting, IAppAPIParam, ICallBack, HTTPMethod, RequestPolicy, GeneralCallbackResult }

miniprogram/pages/Timetable/TestCore.ts

@@ -1,6 +1,5 @@
 import { Modular, Manager, ILifetime } from "../../core/Module";
 import { Login } from "../../api/Login";
-import { Schedlue } from "../../api/Schedule"
 import { Storage } from "../../core/Storage";
 
 /**
@@ -29,14 +28,12 @@ implements Partial<ILifetime> {
             s.set("be", 12);
         }, 1000)
         
-        // new Login().param({studentId: "2017060129", password: ""})
+        new Login().param({studentId: "2017060129", password: "hch2000210%"})
-        // .request().wait({
+        .request().wait({
-        //     ok: (w) => {console.log("ok", w)},
+            ok: (w) => {console.log("ok", w)},
-        //     no: (w) => {console.log("no", w)},
+            no: (w) => {console.log("no", w)},
-        //     done: (w) => {console.log("done", w)}
+            done: (w) => {console.log("done", w)}
-        // });
+        });
-        // new Schedlue().param({cookie:"C729D1AB1B17077485ACCD9279135C22",semester:"2020-2021-2"})
-        // .request()
     }
 }