ref: 重新修改包名以及groupId

README.md

@@ -67,7 +67,7 @@ JDK版本：1.8及以上，推荐JDK 11及以上
 
 ```xml
 <dependency>
-  <groupId>cn.linghang</groupId>
+  <groupId>cn.wustlinghang.mywust</groupId>
   <artifactId>mywust-core</artifactId>
   <version>0.0.1-fixed</version>
 </dependency>

mywust-common/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>mywust</artifactId>
-        <groupId>cn.linghang</groupId>
+        <groupId>cn.wustlinghang.mywust</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

mywust-common/src/main/java/cn/wustlinghang/mywust/captcha/SolvedImageCaptcha.java

@@ -1,6 +1,5 @@
-package cn.linghang.mywust.captcha;
+package cn.wustlinghang.mywust.captcha;
 
-import lombok.Data;
 import lombok.Getter;
 
 /**

mywust-common/src/main/java/cn/wustlinghang/mywust/captcha/UnsolvedImageCaptcha.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.captcha;
+package cn.wustlinghang.mywust.captcha;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

mywust-common/src/main/java/cn/wustlinghang/mywust/data/global/Building.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.data.global;
+package cn.wustlinghang.mywust.data.global;
 
 import java.util.StringJoiner;
 

mywust-common/src/main/java/cn/wustlinghang/mywust/data/global/Campus.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.data.global;
+package cn.wustlinghang.mywust.data.global;
 
 import java.util.StringJoiner;
 

mywust-common/src/main/java/cn/wustlinghang/mywust/data/global/Classroom.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.data.global;
+package cn.wustlinghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

mywust-common/src/main/java/cn/wustlinghang/mywust/data/global/College.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.data.global;
+package cn.wustlinghang.mywust.data.global;
 
 import java.util.StringJoiner;
 

mywust-common/src/main/java/cn/wustlinghang/mywust/data/global/Course.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.data.global;
+package cn.wustlinghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

mywust-common/src/main/java/cn/wustlinghang/mywust/data/global/Score.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.data.global;
+package cn.wustlinghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

mywust-common/src/main/java/cn/wustlinghang/mywust/data/global/StudentInfo.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.data.global;
+package cn.wustlinghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

mywust-common/src/main/java/cn/wustlinghang/mywust/data/physics/PhysicsCourse.java

@@ -1,6 +1,6 @@
-package cn.linghang.mywust.data.physics;
+package cn.wustlinghang.mywust.data.physics;
 
-import cn.linghang.mywust.data.global.Course;
+import cn.wustlinghang.mywust.data.global.Course;
 import lombok.Getter;
 import lombok.Setter;
 

mywust-common/src/main/java/cn/wustlinghang/mywust/data/undergrad/ExamDelayApplication.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.data.undergrad;
+package cn.wustlinghang.mywust.data.undergrad;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

mywust-common/src/main/java/cn/wustlinghang/mywust/exception/ApiException.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.exception;
+package cn.wustlinghang.mywust.exception;
 
 public class ApiException extends BasicException {
     private final Code code;

mywust-common/src/main/java/cn/wustlinghang/mywust/exception/BasicException.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.exception;
+package cn.wustlinghang.mywust.exception;
 
 public class BasicException extends Exception {
     public BasicException() {

mywust-common/src/main/java/cn/wustlinghang/mywust/exception/ParseException.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.exception;
+package cn.wustlinghang.mywust.exception;
 
 import java.util.StringJoiner;
 

mywust-core/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>mywust</artifactId>
-        <groupId>cn.linghang</groupId>
+        <groupId>cn.wustlinghang.mywust</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -12,13 +12,13 @@
     <artifactId>mywust-core</artifactId>
     <dependencies>
         <dependency>
-            <groupId>cn.linghang</groupId>
+            <groupId>cn.wustlinghang.mywust</groupId>
             <artifactId>mywust-network</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>cn.linghang</groupId>
+            <groupId>cn.wustlinghang.mywust</groupId>
             <artifactId>mywust-util</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
@@ -37,7 +37,7 @@
         </dependency>
 
         <dependency>
-            <groupId>cn.linghang</groupId>
+            <groupId>cn.wustlinghang.mywust</groupId>
             <artifactId>mywust-common</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>

mywust-core/src/main/java/cn/linghang/mywust/core/parser/Parser.java

@@ -1,7 +0,0 @@
-package cn.linghang.mywust.core.parser;
-
-import cn.linghang.mywust.exception.ParseException;
-
-public interface Parser<T> {
-    public T parse(String html) throws ParseException;
-}

mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/CaptchaSolver.java

@@ -1,9 +0,0 @@
-package cn.linghang.mywust.core.request.service.captcha.solver;
-
-import cn.linghang.mywust.captcha.SolvedImageCaptcha;
-import cn.linghang.mywust.captcha.UnsolvedImageCaptcha;
-import cn.linghang.mywust.exception.ApiException;
-
-public interface CaptchaSolver {
-    SolvedImageCaptcha solve(UnsolvedImageCaptcha unsolvedImageCaptcha) throws ApiException;
-}

mywust-core/src/main/java/cn/wustlinghang/mywust/core/api/ConstantParams.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.api;
+package cn.wustlinghang.mywust.core.api;
 
 import java.util.Collections;
 import java.util.HashMap;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/api/GraduateUrls.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.api;
+package cn.wustlinghang.mywust.core.api;
 
 public class GraduateUrls {
     public static final String GRADUATE_CAPTCHA_API = "http://59.68.177.189/pyxx/PageTemplate/NsoftPage/yzm/createyzm.aspx";

mywust-core/src/main/java/cn/wustlinghang/mywust/core/api/LibraryUrls.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.api;
+package cn.wustlinghang.mywust.core.api;
 
 public class LibraryUrls {
     public static final String LIBRARY_SESSION_COOKIE_API = "https://libsys.wust.edu.cn/meta-local/opac/cas/rosetta?ticket=%s";

mywust-core/src/main/java/cn/wustlinghang/mywust/core/api/PhysicsSystemUrls.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.api;
+package cn.wustlinghang.mywust.core.api;
 
 public class PhysicsSystemUrls {
     public static final String PHYSICS_LOGIN_INDEX = "http://wlsy.wust.edu.cn/Page/BI/BI000.aspx";

mywust-core/src/main/java/cn/wustlinghang/mywust/core/api/UndergradUrls.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.api;
+package cn.wustlinghang.mywust.core.api;
 
 import lombok.Getter;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/api/UnionAuthUrls.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.api;
+package cn.wustlinghang.mywust.core.api;
 
 public class UnionAuthUrls {
     /**

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/HuangjiahuClassroomNameParser.java

@@ -1,7 +1,7 @@
-package cn.linghang.mywust.core.parser;
+package cn.wustlinghang.mywust.core.parser;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.data.global.Classroom;
+import cn.wustlinghang.mywust.data.global.Classroom;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/Parser.java

@@ -0,0 +1,7 @@
+package cn.wustlinghang.mywust.core.parser;
+
+import cn.wustlinghang.mywust.exception.ParseException;
+
+public interface Parser<T> {
+    public T parse(String html) throws ParseException;
+}

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/graduate/GraduateCourseTableParser.java

@@ -1,9 +1,9 @@
-package cn.linghang.mywust.core.parser.graduate;
+package cn.wustlinghang.mywust.core.parser.graduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.data.global.Classroom;
+import cn.wustlinghang.mywust.data.global.Classroom;
-import cn.linghang.mywust.data.global.Course;
+import cn.wustlinghang.mywust.data.global.Course;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/graduate/GraduateScoreParser.java

@@ -1,8 +1,8 @@
-package cn.linghang.mywust.core.parser.graduate;
+package cn.wustlinghang.mywust.core.parser.graduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.data.global.Score;
+import cn.wustlinghang.mywust.data.global.Score;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/graduate/GraduateStudentInfoPageParser.java

@@ -1,9 +1,9 @@
-package cn.linghang.mywust.core.parser.graduate;
+package cn.wustlinghang.mywust.core.parser.graduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.core.util.JsoupUtil;
+import cn.wustlinghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.data.global.StudentInfo;
+import cn.wustlinghang.mywust.data.global.StudentInfo;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/graduate/GraduateTrainingPlanPageParser.java

@@ -1,8 +1,8 @@
-package cn.linghang.mywust.core.parser.graduate;
+package cn.wustlinghang.mywust.core.parser.graduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.core.util.JsoupUtil;
+import cn.wustlinghang.mywust.core.util.JsoupUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/physics/PhysicsCoursePageParser.java

@@ -1,10 +1,10 @@
-package cn.linghang.mywust.core.parser.physics;
+package cn.wustlinghang.mywust.core.parser.physics;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.HuangjiahuClassroomNameParser;
+import cn.wustlinghang.mywust.core.parser.HuangjiahuClassroomNameParser;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.data.global.Classroom;
+import cn.wustlinghang.mywust.data.global.Classroom;
-import cn.linghang.mywust.data.physics.PhysicsCourse;
+import cn.wustlinghang.mywust.data.physics.PhysicsCourse;
 import org.jsoup.Jsoup;
 import org.jsoup.select.Elements;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/physics/PhysicsIndexPageParser.java

@@ -1,7 +1,7 @@
-package cn.linghang.mywust.core.parser.physics;
+package cn.wustlinghang.mywust.core.parser.physics;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/physics/PhysicsScoreListPageParser.java

@@ -1,8 +1,8 @@
-package cn.linghang.mywust.core.parser.physics;
+package cn.wustlinghang.mywust.core.parser.physics;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.core.util.JsoupUtil;
+import cn.wustlinghang.mywust.core.util.JsoupUtil;
 import lombok.Data;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/physics/PhysicsScorePageParser.java

@@ -1,9 +1,9 @@
-package cn.linghang.mywust.core.parser.physics;
+package cn.wustlinghang.mywust.core.parser.physics;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.core.util.JsoupUtil;
+import cn.wustlinghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.data.global.Score;
+import cn.wustlinghang.mywust.data.global.Score;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/UndergradCourseTableParser.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.parser.undergraduate;
+package cn.wustlinghang.mywust.core.parser.undergraduate;
-
+
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.core.util.JsoupUtil;
+import cn.wustlinghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.data.global.Classroom;
+import cn.wustlinghang.mywust.data.global.Classroom;
-import cn.linghang.mywust.data.global.Course;
+import cn.wustlinghang.mywust.data.global.Course;
-import cn.linghang.mywust.util.StringUtil;
+import cn.wustlinghang.mywust.util.StringUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/UndergradCreditStatusIndexParser.java

@@ -1,7 +1,7 @@
-package cn.linghang.mywust.core.parser.undergraduate;
+package cn.wustlinghang.mywust.core.parser.undergraduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/UndergradCreditStatusParser.java

@@ -1,7 +1,7 @@
-package cn.linghang.mywust.core.parser.undergraduate;
+package cn.wustlinghang.mywust.core.parser.undergraduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
 import org.jsoup.Jsoup;
 import org.jsoup.select.Elements;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/UndergradExamDelayParser.java

@@ -1,9 +1,9 @@
-package cn.linghang.mywust.core.parser.undergraduate;
+package cn.wustlinghang.mywust.core.parser.undergraduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.core.util.JsoupUtil;
+import cn.wustlinghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.data.undergrad.ExamDelayApplication;
+import cn.wustlinghang.mywust.data.undergrad.ExamDelayApplication;
 import lombok.extern.slf4j.Slf4j;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/UndergradScoreParser.java

@@ -1,9 +1,9 @@
-package cn.linghang.mywust.core.parser.undergraduate;
+package cn.wustlinghang.mywust.core.parser.undergraduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.core.util.JsoupUtil;
+import cn.wustlinghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.data.global.Score;
+import cn.wustlinghang.mywust.data.global.Score;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/UndergradStudentInfoPageParser.java

@@ -1,9 +1,9 @@
-package cn.linghang.mywust.core.parser.undergraduate;
+package cn.wustlinghang.mywust.core.parser.undergraduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.core.util.JsoupUtil;
+import cn.wustlinghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.data.global.StudentInfo;
+import cn.wustlinghang.mywust.data.global.StudentInfo;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/UndergradTrainingPlanPageParser.java

@@ -1,7 +1,7 @@
-package cn.linghang.mywust.core.parser.undergraduate;
+package cn.wustlinghang.mywust.core.parser.undergraduate;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
 import org.jsoup.Jsoup;
 import org.jsoup.select.Elements;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/global/GlobalCourseTableParser.java

@@ -1,9 +1,9 @@
-package cn.linghang.mywust.core.parser.undergraduate.global;
+package cn.wustlinghang.mywust.core.parser.undergraduate.global;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.data.global.Classroom;
+import cn.wustlinghang.mywust.data.global.Classroom;
-import cn.linghang.mywust.data.global.Course;
+import cn.wustlinghang.mywust.data.global.Course;
-import cn.linghang.mywust.util.StringUtil;
+import cn.wustlinghang.mywust.util.StringUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/global/UndergradAllCourseScheduleParser.java

@@ -1,8 +1,8 @@
-package cn.linghang.mywust.core.parser.undergraduate.global;
+package cn.wustlinghang.mywust.core.parser.undergraduate.global;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.data.global.Course;
+import cn.wustlinghang.mywust.data.global.Course;
 
 import java.util.List;
 import java.util.regex.Pattern;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/parser/undergraduate/global/UndergradTeacherCourseParser.java

@@ -1,8 +1,8 @@
-package cn.linghang.mywust.core.parser.undergraduate.global;
+package cn.wustlinghang.mywust.core.parser.undergraduate.global;
 
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.Parser;
+import cn.wustlinghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.data.global.Course;
+import cn.wustlinghang.mywust.data.global.Course;
 
 import java.util.List;
 import java.util.regex.Pattern;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/RequestFactory.java

@@ -1,6 +1,6 @@
-package cn.linghang.mywust.core.request.factory;
+package cn.wustlinghang.mywust.core.request.factory;
 
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
 
 import java.net.URL;
 import java.nio.charset.StandardCharsets;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/auth/UnionAuthRequestFactory.java

@@ -1,9 +1,9 @@
-package cn.linghang.mywust.core.request.factory.auth;
+package cn.wustlinghang.mywust.core.request.factory.auth;
 
-import cn.linghang.mywust.core.api.UnionAuthUrls;
+import cn.wustlinghang.mywust.core.api.UnionAuthUrls;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.util.StringUtil;
+import cn.wustlinghang.mywust.util.StringUtil;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/graduate/GraduateRequestFactory.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.factory.graduate;
+package cn.wustlinghang.mywust.core.request.factory.graduate;
-
+
-import cn.linghang.mywust.captcha.SolvedImageCaptcha;
+import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha;
-import cn.linghang.mywust.core.api.GraduateUrls;
+import cn.wustlinghang.mywust.core.api.GraduateUrls;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.core.util.PageFormExtractor;
+import cn.wustlinghang.mywust.core.util.PageFormExtractor;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.util.StringUtil;
+import cn.wustlinghang.mywust.util.StringUtil;
 import lombok.Builder;
 import lombok.Data;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/library/LibraryRequestFactory.java

@@ -1,10 +1,9 @@
-package cn.linghang.mywust.core.request.factory.library;
+package cn.wustlinghang.mywust.core.request.factory.library;
 
-import cn.hutool.core.util.URLUtil;
+import cn.wustlinghang.mywust.core.api.LibraryUrls;
-import cn.linghang.mywust.core.api.LibraryUrls;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.library.request.SearchRequest;
-import cn.linghang.mywust.core.request.factory.library.request.SearchRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpRequest;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/library/request/SearchRequest.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.request.factory.library.request;
+package cn.wustlinghang.mywust.core.request.factory.library.request;
 
 import lombok.Data;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/physics/PhysicsSystemRequestFactory.java

@@ -1,10 +1,10 @@
-package cn.linghang.mywust.core.request.factory.physics;
+package cn.wustlinghang.mywust.core.request.factory.physics;
 
-import cn.linghang.mywust.core.api.PhysicsSystemUrls;
+import cn.wustlinghang.mywust.core.api.PhysicsSystemUrls;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.core.util.PageFormExtractor;
+import cn.wustlinghang.mywust.core.util.PageFormExtractor;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.util.StringUtil;
+import cn.wustlinghang.mywust.util.StringUtil;
 
 import java.util.HashMap;
 import java.util.Map;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/BkjxRequestFactory.java

@@ -1,17 +1,16 @@
-package cn.linghang.mywust.core.request.factory.undergrade;
+package cn.wustlinghang.mywust.core.request.factory.undergrade;
 
-import cn.linghang.mywust.core.api.UndergradUrls;
+import cn.wustlinghang.mywust.core.api.UndergradUrls;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.data.global.Campus;
+import cn.wustlinghang.mywust.data.global.Campus;
-import cn.linghang.mywust.network.entitys.FormBodyBuilder;
+import cn.wustlinghang.mywust.network.entitys.FormBodyBuilder;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.util.StringUtil;
+import cn.wustlinghang.mywust.util.StringUtil;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 
 public class BkjxRequestFactory extends RequestFactory {
     public static HttpRequest sessionCookieRequest(String serviceTicket) {

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/global/BkjxAllCourseRequestFactory.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.factory.undergrade.global;
+package cn.wustlinghang.mywust.core.request.factory.undergrade.global;
 
-import cn.linghang.mywust.core.api.ConstantParams;
+import cn.wustlinghang.mywust.core.api.ConstantParams;
-import cn.linghang.mywust.core.api.UndergradUrls;
+import cn.wustlinghang.mywust.core.api.UndergradUrls;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
-import cn.linghang.mywust.network.entitys.FormBodyBuilder;
+import cn.wustlinghang.mywust.network.entitys.FormBodyBuilder;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
 
 public class BkjxAllCourseRequestFactory extends BkjxRequestFactory {
     public static HttpRequest classroomCoursePageRequest(String cookies, String term, String timeMode, String collegeId, String campusId, String buildingId, String classroomName) {
@@ -54,7 +54,7 @@ public class BkjxAllCourseRequestFactory extends BkjxRequestFactory {
                 .add("kbjcmsid", timeMode == null ? ConstantParams.DEFAULT_TIME_MODEL : timeMode)
                 // 上课学院，虽然能获取到，但是不符合预期的功能，得到的结果是这个学院上的课，而不是这个学院开的课
                 .add("skyx", "")
-                // 开课学院应该在这里指定，但是直接用学院id是获取不到的，只能用学院下级的id来获取，相关参数详见cn.linghang.mywust.core.api.ConstantParams
+                // 开课学院应该在这里指定，但是直接用学院id是获取不到的，只能用学院下级的id来获取，相关参数详见cn.wustlinghang.mywust.core.api.ConstantParams
                 .add("kkyx", subCollegeId)
                 .add("kcmc", courseName)
                 .add("zzdKcSX", "")

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/GraduateLogin.java

@@ -1,16 +1,16 @@
-package cn.linghang.mywust.core.request.service.auth;
+package cn.wustlinghang.mywust.core.request.service.auth;
-
+
-import cn.linghang.mywust.captcha.SolvedImageCaptcha;
+import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha;
-import cn.linghang.mywust.captcha.UnsolvedImageCaptcha;
+import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha;
-import cn.linghang.mywust.core.api.GraduateUrls;
+import cn.wustlinghang.mywust.core.api.GraduateUrls;
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
-import cn.linghang.mywust.core.request.service.captcha.solver.CaptchaSolver;
+import cn.wustlinghang.mywust.core.request.service.captcha.solver.CaptchaSolver;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -49,7 +49,8 @@ public class GraduateLogin {
         SolvedImageCaptcha solvedImageCaptcha = captchaSolver.solve(unsolvedImageCaptcha);
 
         // 进行登录
-        HttpRequest loginRequest = GraduateRequestFactory.loginRequest(username, password, loginIndexResponse.getStringBody(), solvedImageCaptcha);
+        String loginIndexHtml = loginIndexResponse.getStringBody();
+        HttpRequest loginRequest = GraduateRequestFactory.loginRequest(username, password, loginIndexHtml, solvedImageCaptcha);
         HttpResponse loginResponse = requester.post(loginRequest, option);
 
         // 登陆成功，应该会是302跳转，不是的话多半是认证错误

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/LibraryLogin.java

@@ -1,13 +1,13 @@
-package cn.linghang.mywust.core.request.service.auth;
+package cn.wustlinghang.mywust.core.request.service.auth;
-
+
-import cn.linghang.mywust.core.api.LibraryUrls;
+import cn.wustlinghang.mywust.core.api.LibraryUrls;
-import cn.linghang.mywust.core.api.UnionAuthUrls;
+import cn.wustlinghang.mywust.core.api.UnionAuthUrls;
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.library.LibraryRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.library.LibraryRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/PhysicsLogin.java

@@ -1,13 +1,13 @@
-package cn.linghang.mywust.core.request.service.auth;
+package cn.wustlinghang.mywust.core.request.service.auth;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.physics.PhysicsIndexPageParser;
+import cn.wustlinghang.mywust.core.parser.physics.PhysicsIndexPageParser;
-import cn.linghang.mywust.core.request.factory.physics.PhysicsSystemRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.physics.PhysicsSystemRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,7 +55,7 @@ public class PhysicsLogin {
         String redirect = physicsIndexPageParser.parse(indexHtml);
         HttpRequest systemIndexRequest = PhysicsSystemRequestFactory.physicsSystemIndexRequest(redirect, loginCookies);
 
-        requestClientOption.setFallowUrlRedirect(true);
+        requestClientOption.setFollowUrlRedirect(true);
         HttpResponse response = requester.get(systemIndexRequest, requestClientOption);
         if (response.getStatusCode() != HttpResponse.HTTP_OK) {
             throw new ApiException(ApiException.Code.COOKIE_INVALID);

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/UndergraduateLogin.java

@@ -1,14 +1,14 @@
-package cn.linghang.mywust.core.request.service.auth;
+package cn.wustlinghang.mywust.core.request.service.auth;
-
+
-import cn.linghang.mywust.core.api.UndergradUrls;
+import cn.wustlinghang.mywust.core.api.UndergradUrls;
-import cn.linghang.mywust.core.api.UnionAuthUrls;
+import cn.wustlinghang.mywust.core.api.UnionAuthUrls;
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
-import cn.linghang.mywust.util.PasswordEncoder;
+import cn.wustlinghang.mywust.util.PasswordEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/UnionLogin.java

@@ -1,12 +1,12 @@
-package cn.linghang.mywust.core.request.service.auth;
+package cn.wustlinghang.mywust.core.request.service.auth;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.auth.UnionAuthRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.auth.UnionAuthRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
-import cn.linghang.mywust.util.PasswordEncoder;
+import cn.wustlinghang.mywust.util.PasswordEncoder;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/CaptchaSolver.java

@@ -0,0 +1,9 @@
+package cn.wustlinghang.mywust.core.request.service.captcha.solver;
+
+import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha;
+import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha;
+import cn.wustlinghang.mywust.exception.ApiException;
+
+public interface CaptchaSolver {
+    SolvedImageCaptcha solve(UnsolvedImageCaptcha unsolvedImageCaptcha) throws ApiException;
+}

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/DdddOcrCaptchaSolver.java

@@ -1,12 +1,12 @@
-package cn.linghang.mywust.core.request.service.captcha.solver;
+package cn.wustlinghang.mywust.core.request.service.captcha.solver;
-
+
-import cn.linghang.mywust.captcha.SolvedImageCaptcha;
+import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha;
-import cn.linghang.mywust.captcha.UnsolvedImageCaptcha;
+import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha;
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Base64;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java

@@ -1,14 +1,14 @@
-package cn.linghang.mywust.core.request.service.captcha.solver;
+package cn.wustlinghang.mywust.core.request.service.captcha.solver;
-
+
-import cn.linghang.mywust.captcha.SolvedImageCaptcha;
+import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha;
-import cn.linghang.mywust.captcha.UnsolvedImageCaptcha;
+import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha;
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
-import cn.linghang.mywust.util.StringUtil;
+import cn.wustlinghang.mywust.util.StringUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.codec.binary.Base64;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateApiServiceBase.java

@@ -1,12 +1,12 @@
-package cn.linghang.mywust.core.request.service.graduate;
+package cn.wustlinghang.mywust.core.request.service.graduate;
-
+
-import cn.linghang.mywust.core.api.GraduateUrls;
+import cn.wustlinghang.mywust.core.api.GraduateUrls;
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateCourseTableApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.graduate;
+package cn.wustlinghang.mywust.core.request.service.graduate;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 
@@ -23,6 +23,6 @@ public class GraduateCourseTableApiService extends GraduateApiServiceBase {
         HttpResponse response = requester.get(request, option);
         super.checkResponse(response);
 
-        return new String(response.getBody());
+        return response.getStringBody();
     }
 }

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateScoreApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.graduate;
+package cn.wustlinghang.mywust.core.request.service.graduate;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 
@@ -22,6 +22,6 @@ public class GraduateScoreApiService extends GraduateApiServiceBase {
         HttpResponse response = requester.get(request, option);
         super.checkResponse(response);
 
-        return new String(response.getBody());
+        return response.getStringBody();
     }
 }

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateStudentInfoApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.graduate;
+package cn.wustlinghang.mywust.core.request.service.graduate;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 
@@ -22,6 +22,6 @@ public class GraduateStudentInfoApiService extends GraduateApiServiceBase {
         HttpResponse response = requester.get(request, option);
         super.checkResponse(response);
 
-        return new String(response.getBody());
+        return response.getStringBody();
     }
 }

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateTrainingPlanApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.graduate;
+package cn.wustlinghang.mywust.core.request.service.graduate;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.graduate.GraduateRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 
@@ -22,6 +22,6 @@ public class GraduateTrainingPlanApiService extends GraduateApiServiceBase {
         HttpResponse response = requester.get(request, option);
         super.checkResponse(response);
 
-        return new String(response.getBody());
+        return response.getStringBody();
     }
 }

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/library/LibraryApiService.java

@@ -1,10 +1,10 @@
-package cn.linghang.mywust.core.request.service.library;
+package cn.wustlinghang.mywust.core.request.service.library;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.library.LibraryRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.library.LibraryRequestFactory;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/library/LibraryApiServiceBase.java

@@ -1,8 +1,8 @@
-package cn.linghang.mywust.core.request.service.library;
+package cn.wustlinghang.mywust.core.request.service.library;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 public abstract class LibraryApiServiceBase {
     protected final Requester requester;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/physics/PhysicsApiServiceBase.java

@@ -1,8 +1,8 @@
-package cn.linghang.mywust.core.request.service.physics;
+package cn.wustlinghang.mywust.core.request.service.physics;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 public abstract class PhysicsApiServiceBase {
     protected final Requester requester;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/physics/PhysicsCourseApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.physics;
+package cn.wustlinghang.mywust.core.request.service.physics;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.physics.PhysicsSystemRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.physics.PhysicsSystemRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 
@@ -15,7 +15,7 @@ public class PhysicsCourseApiService extends PhysicsApiServiceBase {
     }
 
     public String getPage(String cookie, RequestClientOption requestClientOption) throws IOException, ApiException {
-        requestClientOption.setFallowUrlRedirect(false);
+        requestClientOption.setFollowUrlRedirect(false);
 
         // 直接请求真正的课表页
         HttpRequest coursePageRequest = PhysicsSystemRequestFactory.physicsCourseRequest(cookie);

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/physics/PhysicsScoreApiService.java

@@ -1,14 +1,14 @@
-package cn.linghang.mywust.core.request.service.physics;
+package cn.wustlinghang.mywust.core.request.service.physics;
-
+
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.physics.PhysicsScoreListPageParser;
+import cn.wustlinghang.mywust.core.parser.physics.PhysicsScoreListPageParser;
-import cn.linghang.mywust.core.request.factory.physics.PhysicsSystemRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.physics.PhysicsSystemRequestFactory;
-import cn.linghang.mywust.core.util.PageFormExtractor;
+import cn.wustlinghang.mywust.core.util.PageFormExtractor;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.ArrayList;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradApiServiceBase.java

@@ -1,13 +1,13 @@
-package cn.linghang.mywust.core.request.service.undergraduate;
+package cn.wustlinghang.mywust.core.request.service.undergraduate;
-
+
-import cn.linghang.mywust.core.api.UndergradUrls;
+import cn.wustlinghang.mywust.core.api.UndergradUrls;
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.RequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.RequestFactory;
-import cn.linghang.mywust.core.util.BkjxUtil;
+import cn.wustlinghang.mywust.core.util.BkjxUtil;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Map;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradCourseTableApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.undergraduate;
+package cn.wustlinghang.mywust.core.request.service.undergraduate;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Map;
@@ -40,7 +40,7 @@ public class UndergradCourseTableApiService extends UndergradApiServiceBase {
 
         super.checkResponse(response);
 
-        return new String(response.getBody());
+        return response.getStringBody();
     }
 
     public String getPage(String term, String cookies) throws IOException, ApiException {

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradCreditStatusApiService.java

@@ -1,13 +1,13 @@
-package cn.linghang.mywust.core.request.service.undergraduate;
+package cn.wustlinghang.mywust.core.request.service.undergraduate;
-
+
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.exception.ParseException;
+import cn.wustlinghang.mywust.exception.ParseException;
-import cn.linghang.mywust.core.parser.undergraduate.UndergradCreditStatusIndexParser;
+import cn.wustlinghang.mywust.core.parser.undergraduate.UndergradCreditStatusIndexParser;
-import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Map;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradExamDelayApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.undergraduate;
+package cn.wustlinghang.mywust.core.request.service.undergraduate;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.AllArgsConstructor;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradScoreApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.undergraduate;
+package cn.wustlinghang.mywust.core.request.service.undergraduate;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Map;
@@ -32,7 +32,7 @@ public class UndergradScoreApiService extends UndergradApiServiceBase {
 
         super.checkResponse(response);
 
-        return new String(response.getBody());
+        return response.getStringBody();
     }
 
     public String getPage(String cookies) throws IOException, ApiException {

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradStudentInfoApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.undergraduate;
+package cn.wustlinghang.mywust.core.request.service.undergraduate;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Map;
@@ -32,7 +32,7 @@ public class UndergradStudentInfoApiService extends UndergradApiServiceBase {
 
         super.checkResponse(response);
 
-        return new String(response.getBody());
+        return response.getStringBody();
     }
 
     public String getPage(String cookies) throws IOException, ApiException {

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradTrainingPlanApiService.java

@@ -1,11 +1,11 @@
-package cn.linghang.mywust.core.request.service.undergraduate;
+package cn.wustlinghang.mywust.core.request.service.undergraduate;
 
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Map;
@@ -32,7 +32,7 @@ public class UndergradTrainingPlanApiService extends UndergradApiServiceBase {
 
         super.checkResponse(response);
 
-        return new String(response.getBody());
+        return response.getStringBody();
     }
 
     public String getPage(String cookies) throws IOException, ApiException {

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/global/UndergradAllCourseScheduleApiService.java

@@ -1,12 +1,12 @@
-package cn.linghang.mywust.core.request.service.undergraduate.global;
+package cn.wustlinghang.mywust.core.request.service.undergraduate.global;
-
+
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.global.BkjxAllCourseRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.global.BkjxAllCourseRequestFactory;
-import cn.linghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase;
+import cn.wustlinghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Map;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/global/UndergradBuildingIdApiService.java

@@ -1,15 +1,15 @@
-package cn.linghang.mywust.core.request.service.undergraduate.global;
+package cn.wustlinghang.mywust.core.request.service.undergraduate.global;
-
+
-import cn.linghang.mywust.core.api.ConstantParams;
+import cn.wustlinghang.mywust.core.api.ConstantParams;
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory;
-import cn.linghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase;
+import cn.wustlinghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase;
-import cn.linghang.mywust.data.global.Building;
+import cn.wustlinghang.mywust.data.global.Building;
-import cn.linghang.mywust.data.global.Campus;
+import cn.wustlinghang.mywust.data.global.Campus;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/global/UndergradClassroomCourseApiService.java

@@ -1,12 +1,12 @@
-package cn.linghang.mywust.core.request.service.undergraduate.global;
+package cn.wustlinghang.mywust.core.request.service.undergraduate.global;
-
+
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.global.BkjxAllCourseRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.global.BkjxAllCourseRequestFactory;
-import cn.linghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase;
+import cn.wustlinghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Map;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/global/UndergradTeacherCourseApiService.java

@@ -1,12 +1,12 @@
-package cn.linghang.mywust.core.request.service.undergraduate.global;
+package cn.wustlinghang.mywust.core.request.service.undergraduate.global;
-
+
-import cn.linghang.mywust.exception.ApiException;
+import cn.wustlinghang.mywust.exception.ApiException;
-import cn.linghang.mywust.core.request.factory.undergrade.global.BkjxAllCourseRequestFactory;
+import cn.wustlinghang.mywust.core.request.factory.undergrade.global.BkjxAllCourseRequestFactory;
-import cn.linghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase;
+import cn.wustlinghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase;
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 import java.util.Map;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/util/BkjxUtil.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.util;
+package cn.wustlinghang.mywust.core.util;
 
 import java.nio.charset.StandardCharsets;
 

mywust-core/src/main/java/cn/wustlinghang/mywust/core/util/JsoupUtil.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.util;
+package cn.wustlinghang.mywust.core.util;
 
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

mywust-core/src/main/java/cn/wustlinghang/mywust/core/util/PageFormExtractor.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.core.util;
+package cn.wustlinghang.mywust.core.util;
 
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;

mywust-network-httpclient/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>mywust</artifactId>
-        <groupId>cn.linghang</groupId>
+        <groupId>cn.wustlinghang.mywust</groupId>
         <version>${revision}</version>
     </parent>
     <artifactId>mywust-network-httpclient</artifactId>

mywust-network-okhttp/pom.xml

@@ -5,7 +5,7 @@
 
     <parent>
         <artifactId>mywust</artifactId>
-        <groupId>cn.linghang</groupId>
+        <groupId>cn.wustlinghang.mywust</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -34,12 +34,12 @@
         </dependency>
 
         <dependency>
-            <groupId>cn.linghang</groupId>
+            <groupId>cn.wustlinghang.mywust</groupId>
             <artifactId>mywust-network</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>cn.linghang</groupId>
+            <groupId>cn.wustlinghang.mywust</groupId>
             <artifactId>mywust-util</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>

mywust-network-okhttp/src/main/java/cn/wustlinghang/mywust/network/okhttp/RedirectInterceptor.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.network.okhttp;
+package cn.wustlinghang.mywust.network.okhttp;
 
 import okhttp3.Interceptor;
 import okhttp3.Response;

mywust-network-okhttp/src/main/java/cn/wustlinghang/mywust/network/okhttp/SimpleOkhttpRequester.java

@@ -1,10 +1,10 @@
-package cn.linghang.mywust.network.okhttp;
+package cn.wustlinghang.mywust.network.okhttp;
 
-import cn.linghang.mywust.network.RequestClientOption;
+import cn.wustlinghang.mywust.network.RequestClientOption;
-import cn.linghang.mywust.network.Requester;
+import cn.wustlinghang.mywust.network.Requester;
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
-import cn.linghang.mywust.util.StringUtil;
+import cn.wustlinghang.mywust.util.StringUtil;
 import okhttp3.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -149,7 +149,7 @@ public class SimpleOkhttpRequester implements Requester {
         builder.callTimeout(requestClientOption.getTimeout(), TimeUnit.SECONDS)
                 .readTimeout(requestClientOption.getTimeout(), TimeUnit.SECONDS)
                 .connectTimeout(requestClientOption.getTimeout(), TimeUnit.SECONDS)
-                .followRedirects(requestClientOption.isFallowUrlRedirect())
+                .followRedirects(requestClientOption.isFollowUrlRedirect())
                 .addInterceptor(new RedirectInterceptor());
 
         // 是否忽略SSL错误

mywust-network-okhttp/src/main/java/cn/wustlinghang/mywust/network/okhttp/TrustAllCert.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.network.okhttp;
+package cn.wustlinghang.mywust.network.okhttp;
 
 import javax.net.ssl.*;
 import java.security.KeyStore;

mywust-network/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>mywust</artifactId>
-        <groupId>cn.linghang</groupId>
+        <groupId>cn.wustlinghang.mywust</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -19,7 +19,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.linghang</groupId>
+            <groupId>cn.wustlinghang.mywust</groupId>
             <artifactId>mywust-util</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>

mywust-network/src/main/java/cn/wustlinghang/mywust/network/RequestClientOption.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.network;
+package cn.wustlinghang.mywust.network;
 
 import lombok.Builder;
 import lombok.Data;
@@ -7,7 +7,7 @@ import lombok.Data;
 public class RequestClientOption {
     private Proxy proxy;
     private long timeout;
-    private boolean fallowUrlRedirect;
+    private boolean followUrlRedirect;
 
     private boolean ignoreSSLError;
 
@@ -21,14 +21,14 @@ public class RequestClientOption {
     public RequestClientOption() {
         this.proxy = null;
         this.timeout = 5;
-        this.fallowUrlRedirect = false;
+        this.followUrlRedirect = false;
         this.ignoreSSLError = true;
     }
 
-    public RequestClientOption(Proxy proxy, long timeout, boolean fallowUrlRedirect, boolean ignoreSSLError) {
+    public RequestClientOption(Proxy proxy, long timeout, boolean followUrlRedirect, boolean ignoreSSLError) {
         this.proxy = proxy;
         this.timeout = timeout;
-        this.fallowUrlRedirect = fallowUrlRedirect;
+        this.followUrlRedirect = followUrlRedirect;
         this.ignoreSSLError = ignoreSSLError;
     }
 
@@ -53,8 +53,8 @@ public class RequestClientOption {
         }
 
         @Override
-        public boolean isFallowUrlRedirect() {
+        public boolean isFollowUrlRedirect() {
-            return super.isFallowUrlRedirect();
+            return super.isFollowUrlRedirect();
         }
 
         @Override
@@ -64,7 +64,7 @@ public class RequestClientOption {
         public void setTimeout(long timeout) {}
 
         @Override
-        public void setFallowUrlRedirect(boolean fallowUrlRedirect) {}
+        public void setFollowUrlRedirect(boolean followUrlRedirect) {}
     }
 
     public static RequestClientOptionBuilder builder() {
@@ -89,7 +89,7 @@ public class RequestClientOption {
         }
 
         public RequestClientOptionBuilder fallowUrlRedirect(boolean fallowUrlRedirect) {
-            requestClientOption.setFallowUrlRedirect(fallowUrlRedirect);
+            requestClientOption.setFollowUrlRedirect(fallowUrlRedirect);
             return this;
         }
 

mywust-network/src/main/java/cn/wustlinghang/mywust/network/Requester.java

@@ -1,7 +1,7 @@
-package cn.linghang.mywust.network;
+package cn.wustlinghang.mywust.network;
 
-import cn.linghang.mywust.network.entitys.HttpRequest;
+import cn.wustlinghang.mywust.network.entitys.HttpRequest;
-import cn.linghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.entitys.HttpResponse;
 
 import java.io.IOException;
 

mywust-network/src/main/java/cn/wustlinghang/mywust/network/entitys/FormBodyBuilder.java

@@ -1,7 +1,7 @@
-package cn.linghang.mywust.network.entitys;
+package cn.wustlinghang.mywust.network.entitys;
 
-import cn.linghang.mywust.util.RepeatableComparator;
+import cn.wustlinghang.mywust.util.RepeatableComparator;
-import cn.linghang.mywust.util.StringUtil;
+import cn.wustlinghang.mywust.util.StringUtil;
 
 import java.util.Comparator;
 import java.util.HashMap;

mywust-network/src/main/java/cn/wustlinghang/mywust/network/entitys/HttpRequest.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.network.entitys;
+package cn.wustlinghang.mywust.network.entitys;
 
 import lombok.Builder;
 import lombok.Data;

mywust-network/src/main/java/cn/wustlinghang/mywust/network/entitys/HttpResponse.java

@@ -1,10 +1,11 @@
-package cn.linghang.mywust.network.entitys;
+package cn.wustlinghang.mywust.network.entitys;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
@@ -34,7 +35,11 @@ public class HttpResponse {
     private byte[] body;
 
     public String getStringBody() {
-        return new String(body);
+        return new String(body, StandardCharsets.UTF_8);
+    }
+
+    public String getStringBody(Charset charsets) {
+        return new String(body, charsets);
     }
 
     public void setBody(byte[] body) {

mywust-test/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cn.linghang</groupId>
+        <groupId>cn.wustlinghang.mywust</groupId>
         <artifactId>mywust</artifactId>
         <version>${revision}</version>
     </parent>
@@ -14,13 +14,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>cn.linghang</groupId>
+            <groupId>cn.wustlinghang.mywust</groupId>
             <artifactId>mywust-core</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>cn.linghang</groupId>
+            <groupId>cn.wustlinghang.mywust</groupId>
             <artifactId>mywust-network-okhttp</artifactId>
             <version>${project.parent.version}</version>
             <scope>test</scope>

mywust-util/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>mywust</artifactId>
-        <groupId>cn.linghang</groupId>
+        <groupId>cn.wustlinghang.mywust</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

mywust-util/src/main/java/cn/wustlinghang/mywust/util/PasswordEncoder.java

@@ -1,137 +1,137 @@
-package cn.linghang.mywust.util;
+package cn.wustlinghang.mywust.util;
-
+
-
+
-import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.binary.Hex;
-
+
-import javax.crypto.BadPaddingException;
+import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
+import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
+import javax.crypto.NoSuchPaddingException;
-import java.math.BigInteger;
+import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
+import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
+import java.security.InvalidKeyException;
-import java.security.KeyFactory;
+import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchAlgorithmException;
-import java.security.interfaces.RSAPublicKey;
+import java.security.interfaces.RSAPublicKey;
-import java.security.spec.InvalidKeySpecException;
+import java.security.spec.InvalidKeySpecException;
-import java.security.spec.RSAPublicKeySpec;
+import java.security.spec.RSAPublicKeySpec;
-
+
-import static java.lang.Integer.parseInt;
+import static java.lang.Integer.parseInt;
-
+
-/**
+/**
- * <h>密码加密工具类</h>
+ * <h>密码加密工具类</h>
- *
+ *
- * <p>使用统一登陆的加密方法对密码进行加密的工具类</p>
+ * <p>使用统一登陆的加密方法对密码进行加密的工具类</p>
- * <p>研究发现统一认证登录对密码的加密方式只是简单的RSA NoPadding加密(虽然但是，貌似私钥也放在前端了...)</p>
+ * <p>研究发现统一认证登录对密码的加密方式只是简单的RSA NoPadding加密(虽然但是，貌似私钥也放在前端了...)</p>
- * <p>加密过程大概如下：</p>
+ * <p>加密过程大概如下：</p>
- * <p>- 通过modulus模数和exponent指数生成rsa公钥</p>
+ * <p>- 通过modulus模数和exponent指数生成rsa公钥</p>
- * <p>- 将明文反转后用上面生成的公钥进行RSA加密，明文填充使用NoPadding填充（0填充）</p>
+ * <p>- 将明文反转后用上面生成的公钥进行RSA加密，明文填充使用NoPadding填充（0填充）</p>
- * <p>- 将生成的字节数组转换成16进制字符串，得到加密后的数据</p>
+ * <p>- 将生成的字节数组转换成16进制字符串，得到加密后的数据</p>
- * <br>
+ * <br>
- * <p>希望不要再改登录方式了 [拜] </p>
+ * <p>希望不要再改登录方式了 [拜] </p>
- *
+ *
- * @author : lensfrex
+ * @author : lensfrex
- * @description : 使用统一登陆的加密方法对密码进行加密的工具类
+ * @description : 使用统一登陆的加密方法对密码进行加密的工具类
- * @create : 2022-09-18 14:42:06
+ * @create : 2022-09-18 14:42:06
- * @edit : 2022-10-14 14:42:06
+ * @edit : 2022-10-14 14:42:06
- */
+ */
-public class PasswordEncoder {
+public class PasswordEncoder {
-    private static final String MODULUS = "b5eeb166e069920e80bebd1fea4829d3d1f3216f2aabe79b6c47a3c18dcee5fd22c2e7ac519cab59198ece036dcf289ea8201e2a0b9ded307f8fb704136eaeb670286f5ad44e691005ba9ea5af04ada5367cd724b5a26fdb5120cc95b6431604bd219c6b7d83a6f8f24b43918ea988a76f93c333aa5a20991493d4eb1117e7b1";
+    private static final String MODULUS = "b5eeb166e069920e80bebd1fea4829d3d1f3216f2aabe79b6c47a3c18dcee5fd22c2e7ac519cab59198ece036dcf289ea8201e2a0b9ded307f8fb704136eaeb670286f5ad44e691005ba9ea5af04ada5367cd724b5a26fdb5120cc95b6431604bd219c6b7d83a6f8f24b43918ea988a76f93c333aa5a20991493d4eb1117e7b1";
-    private static final String EXPONENT = "10001";
+    private static final String EXPONENT = "10001";
-
+
-    private static final RSAPublicKey PUBLIC_KEY = PasswordEncoder.generatePublicKey();
+    private static final RSAPublicKey PUBLIC_KEY = PasswordEncoder.generatePublicKey();
-
+
-    private static Cipher cipher;
+    private static Cipher cipher;
-
+
-    // 单例加密/解密器
+    // 单例加密/解密器
-    static {
+    static {
-        try {
+        try {
-            cipher = Cipher.getInstance("RSA/ECB/NoPadding");
+            cipher = Cipher.getInstance("RSA/ECB/NoPadding");
-            cipher.init(Cipher.ENCRYPT_MODE, PUBLIC_KEY);
+            cipher.init(Cipher.ENCRYPT_MODE, PUBLIC_KEY);
-        } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException e) {
+        } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException e) {
-            // 会报错的地方都是因为算法不正确，这里都是固定的值，出错了就是程序写错了，在测试的时候就应该发现的问题
+            // 会报错的地方都是因为算法不正确，这里都是固定的值，出错了就是程序写错了，在测试的时候就应该发现的问题
-            // 对于调用者不必处理这种异常，但是开发测试的时候应该要打日志来发现问题
+            // 对于调用者不必处理这种异常，但是开发测试的时候应该要打日志来发现问题
-            System.err.println("加密出错");
+            System.err.println("加密出错");
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-    }
+    }
-
+
-    /**
+    /**
-     * 按照统一登陆的加密方法，加密密码
+     * 按照统一登陆的加密方法，加密密码
-     *
+     *
-     * @param password 密码明文
+     * @param password 密码明文
-     * @return 加密后的密码(小写)
+     * @return 加密后的密码(小写)
-     */
+     */
-    public static String encodePassword(String password) {
+    public static String encodePassword(String password) {
-        try {
+        try {
-            // 反转明文
+            // 反转明文
-            byte[] reversedTextData = new StringBuffer(password)
+            byte[] reversedTextData = new StringBuffer(password)
-                    .reverse()
+                    .reverse()
-                    .toString()
+                    .toString()
-                    .getBytes(StandardCharsets.UTF_8);
+                    .getBytes(StandardCharsets.UTF_8);
-
+
-            // 完成加密
+            // 完成加密
-            return Hex.encodeHexString(cipher.doFinal(reversedTextData));
+            return Hex.encodeHexString(cipher.doFinal(reversedTextData));
-        } catch (IllegalBlockSizeException | BadPaddingException e) {
+        } catch (IllegalBlockSizeException | BadPaddingException e) {
-            // 会报错的地方都是因为算法不正确，这里都是固定的值，出错了就是程序写错了，在测试的时候就应该发现的问题
+            // 会报错的地方都是因为算法不正确，这里都是固定的值，出错了就是程序写错了，在测试的时候就应该发现的问题
-            // 对于调用者不必处理这种异常，但是开发测试的时候应该要打日志来发现问题
+            // 对于调用者不必处理这种异常，但是开发测试的时候应该要打日志来发现问题
-            System.err.println("加密出错");
+            System.err.println("加密出错");
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        return "";
+        return "";
-    }
+    }
-
+
-    /**
+    /**
-     * 使用modulus模数和exponent指数生成rsa公钥
+     * 使用modulus模数和exponent指数生成rsa公钥
-     *
+     *
-     * @return 公钥
+     * @return 公钥
-     */
+     */
-    private static RSAPublicKey generatePublicKey() {
+    private static RSAPublicKey generatePublicKey() {
-        try {
+        try {
-            BigInteger mod = new BigInteger(PasswordEncoder.MODULUS, 16);
+            BigInteger mod = new BigInteger(PasswordEncoder.MODULUS, 16);
-            BigInteger exp = new BigInteger(PasswordEncoder.EXPONENT, 16);
+            BigInteger exp = new BigInteger(PasswordEncoder.EXPONENT, 16);
-
+
-            RSAPublicKeySpec keySpec = new RSAPublicKeySpec(mod, exp);
+            RSAPublicKeySpec keySpec = new RSAPublicKeySpec(mod, exp);
-
+
-            return (RSAPublicKey) KeyFactory.getInstance("RSA").generatePublic(keySpec);
+            return (RSAPublicKey) KeyFactory.getInstance("RSA").generatePublic(keySpec);
-        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
+        } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
-            // 会报错的地方都是因为算法不正确，这里都是固定的值，出错了就是程序写错了，在测试的时候就应该发现的问题
+            // 会报错的地方都是因为算法不正确，这里都是固定的值，出错了就是程序写错了，在测试的时候就应该发现的问题
-            // 对于调用者不必处理这种异常，但是开发测试的时候应该要打日志来发现问题
+            // 对于调用者不必处理这种异常，但是开发测试的时候应该要打日志来发现问题
-            System.err.println("生成公钥出错");
+            System.err.println("生成公钥出错");
-            e.printStackTrace();
+            e.printStackTrace();
-        }
+        }
-
+
-        return null;
+        return null;
-    }
+    }
-
+
-    /**
+    /**
-     * <p>使用旧版登录页的方法加密密码（bkjx系统直接登录）</p>
+     * <p>使用旧版登录页的方法加密密码（bkjx系统直接登录）</p>
-     * <p>是直接照搬官网js代码的，只是经过了一点小修改，没有具体研究是什么加密方式（大概率可能是自创的），性能可能会有点差</p>
+     * <p>是直接照搬官网js代码的，只是经过了一点小修改，没有具体研究是什么加密方式（大概率可能是自创的），性能可能会有点差</p>
-     *
+     *
-     * @param dataString 加密前置字符串
+     * @param dataString 加密前置字符串
-     * @param password   密码明文
+     * @param password   密码明文
-     * @return 加密后的密文
+     * @return 加密后的密文
-     */
+     */
-    public static String legacyPassword(String username, String password, String dataString) {
+    public static String legacyPassword(String username, String password, String dataString) {
-        String[] parts = dataString.split("#");
+        String[] parts = dataString.split("#");
-        StringBuilder scode = new StringBuilder(parts[0]);
+        StringBuilder scode = new StringBuilder(parts[0]);
-        String sxh = parts[1];
+        String sxh = parts[1];
-
+
-        String code = username + "%%%" + password;
+        String code = username + "%%%" + password;
-
+
-        StringBuilder encoded = new StringBuilder();
+        StringBuilder encoded = new StringBuilder();
-        for (int i = 0, codeLength = code.length(); i < codeLength; i++) {
+        for (int i = 0, codeLength = code.length(); i < codeLength; i++) {
-            if (i < 20) {
+            if (i < 20) {
-                int index = sxh.charAt(i) - 48;
+                int index = sxh.charAt(i) - 48;
-                encoded.append(code.charAt(i)).append(scode, 0, index);
+                encoded.append(code.charAt(i)).append(scode, 0, index);
-                scode.delete(0, index);
+                scode.delete(0, index);
-            } else {
+            } else {
-                encoded.append(code, i, codeLength);
+                encoded.append(code, i, codeLength);
-                i = codeLength;
+                i = codeLength;
-            }
+            }
-        }
+        }
-
+
-        return encoded.toString();
+        return encoded.toString();
-    }
+    }
-}
+}

mywust-util/src/main/java/cn/wustlinghang/mywust/util/RepeatableComparator.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.util;
+package cn.wustlinghang.mywust.util;
 
 import java.util.Comparator;