diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/RequestFactory.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/RequestFactory.java similarity index 97% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/RequestFactory.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/RequestFactory.java index 32ac558..1175ef4 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/RequestFactory.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/RequestFactory.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.request; +package cn.linghang.mywust.core.request.factory; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/auth/UnionAuthRequestFactory.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/auth/UnionAuthRequestFactory.java similarity index 91% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/auth/UnionAuthRequestFactory.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/auth/UnionAuthRequestFactory.java index 659a25b..fea70db 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/auth/UnionAuthRequestFactory.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/auth/UnionAuthRequestFactory.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.request.auth; +package cn.linghang.mywust.core.request.factory.auth; import cn.linghang.mywust.core.api.UnionAuthUrls; -import cn.linghang.mywust.core.request.RequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; import cn.linghang.mywust.network.entitys.HttpRequest; import cn.linghang.mywust.util.StringUtil; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/graduate/GraduateRequestFactory.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/graduate/GraduateRequestFactory.java similarity index 95% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/graduate/GraduateRequestFactory.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/graduate/GraduateRequestFactory.java index 9106d4b..e294397 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/graduate/GraduateRequestFactory.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/graduate/GraduateRequestFactory.java @@ -1,8 +1,8 @@ -package cn.linghang.mywust.core.request.graduate; +package cn.linghang.mywust.core.request.factory.graduate; import cn.linghang.mywust.captcha.SolvedImageCaptcha; import cn.linghang.mywust.core.api.GraduateUrls; -import cn.linghang.mywust.core.request.RequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; import cn.linghang.mywust.network.entitys.HttpRequest; import cn.linghang.mywust.util.StringUtil; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/LibraryRequestFactory.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/LibraryRequestFactory.java similarity index 90% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/library/LibraryRequestFactory.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/LibraryRequestFactory.java index 8b9928c..f9658a9 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/LibraryRequestFactory.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/LibraryRequestFactory.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.request.library; +package cn.linghang.mywust.core.request.factory.library; import cn.linghang.mywust.core.api.LibraryUrls; -import cn.linghang.mywust.core.request.RequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; import cn.linghang.mywust.network.entitys.HttpRequest; public class LibraryRequestFactory extends RequestFactory { diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/BaseInfo.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/BaseInfo.java similarity index 87% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/BaseInfo.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/BaseInfo.java index 9005f03..3584fe4 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/BaseInfo.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/BaseInfo.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.request.library.response; +package cn.linghang.mywust.core.request.factory.library.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/DetailInfo.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/DetailInfo.java similarity index 87% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/DetailInfo.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/DetailInfo.java index 8b1c6c8..a1716e2 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/DetailInfo.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/DetailInfo.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.request.library.response; +package cn.linghang.mywust.core.request.factory.library.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/ExtraInfo.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/ExtraInfo.java similarity index 87% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/ExtraInfo.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/ExtraInfo.java index 59f4779..db6feb5 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/ExtraInfo.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/ExtraInfo.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.request.library.response; +package cn.linghang.mywust.core.request.factory.library.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/LoanResultItem.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/LoanResultItem.java similarity index 93% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/LoanResultItem.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/LoanResultItem.java index c5aceec..b644c8b 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/LoanResultItem.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/LoanResultItem.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.request.library.response; +package cn.linghang.mywust.core.request.factory.library.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/Map.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/Map.java similarity index 95% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/Map.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/Map.java index c4094fc..f84dc65 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/Map.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/Map.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.request.library.response; +package cn.linghang.mywust.core.request.factory.library.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/Response.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/Response.java similarity index 75% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/Response.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/Response.java index bcbd5a0..c19f5ac 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/Response.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/Response.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.request.library.response; +package cn.linghang.mywust.core.request.factory.library.response; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/SearchResultItem.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/SearchResultItem.java similarity index 97% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/SearchResultItem.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/SearchResultItem.java index 2e2c5b9..9c84c99 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/library/response/SearchResultItem.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/library/response/SearchResultItem.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.request.library.response; +package cn.linghang.mywust.core.request.factory.library.response; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/physics/PhysicsSystemRequestFactory.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/physics/PhysicsSystemRequestFactory.java similarity index 96% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/physics/PhysicsSystemRequestFactory.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/physics/PhysicsSystemRequestFactory.java index 2f6aecd..5c95982 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/physics/PhysicsSystemRequestFactory.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/physics/PhysicsSystemRequestFactory.java @@ -1,12 +1,11 @@ -package cn.linghang.mywust.core.request.physics; +package cn.linghang.mywust.core.request.factory.physics; import cn.linghang.mywust.core.api.PhysicsSystemUrls; -import cn.linghang.mywust.core.request.RequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; import cn.linghang.mywust.core.util.PageFormExtractor; import cn.linghang.mywust.network.entitys.HttpRequest; import cn.linghang.mywust.util.StringUtil; -import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/BkjxRequestFactory.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/undergrade/BkjxRequestFactory.java similarity index 97% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/BkjxRequestFactory.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/undergrade/BkjxRequestFactory.java index fc7ddaf..c86b24a 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/BkjxRequestFactory.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/undergrade/BkjxRequestFactory.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.request.undergrade; +package cn.linghang.mywust.core.request.factory.undergrade; import cn.linghang.mywust.core.api.UndergradUrls; -import cn.linghang.mywust.core.request.RequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; import cn.linghang.mywust.data.global.Campus; import cn.linghang.mywust.network.entitys.FormBodyBuilder; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/CourseTableRequestParamFactory.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/undergrade/CourseTableRequestParamFactory.java similarity index 97% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/CourseTableRequestParamFactory.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/undergrade/CourseTableRequestParamFactory.java index 61549af..1209f0f 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/CourseTableRequestParamFactory.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/undergrade/CourseTableRequestParamFactory.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.request.undergrade; +package cn.linghang.mywust.core.request.factory.undergrade; import cn.linghang.mywust.network.entitys.FormBodyBuilder; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/global/BkjxAllCourseRequestFactory.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/undergrade/global/BkjxAllCourseRequestFactory.java similarity index 83% rename from mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/global/BkjxAllCourseRequestFactory.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/undergrade/global/BkjxAllCourseRequestFactory.java index f2770f0..585b497 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/global/BkjxAllCourseRequestFactory.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/factory/undergrade/global/BkjxAllCourseRequestFactory.java @@ -1,8 +1,9 @@ -package cn.linghang.mywust.core.request.undergrade.global; +package cn.linghang.mywust.core.request.factory.undergrade.global; import cn.linghang.mywust.core.api.ConstantParams; import cn.linghang.mywust.core.api.UndergradUrls; -import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; +import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; import cn.linghang.mywust.network.entitys.FormBodyBuilder; import cn.linghang.mywust.network.entitys.HttpRequest; @@ -25,7 +26,7 @@ public class BkjxAllCourseRequestFactory extends BkjxRequestFactory { .add("jc1", "") .add("jc2", ""); - return makeStringDataHttpRequest(UndergradUrls.BKJX_CLASSROOM_COURSE_API, formBodyBuilder.buildAndToString(), cookies); + return RequestFactory.makeStringDataHttpRequest(UndergradUrls.BKJX_CLASSROOM_COURSE_API, formBodyBuilder.buildAndToString(), cookies); } public static HttpRequest teacherCoursePageRequest(String cookies, String term, String timeMode, String collegeId, String teacherName) { @@ -43,7 +44,7 @@ public class BkjxAllCourseRequestFactory extends BkjxRequestFactory { .add("jc1", "") .add("jc2", ""); - return makeStringDataHttpRequest(UndergradUrls.BKJX_TEACHER_COURSE_API, formBodyBuilder.buildAndToString(), cookies); + return RequestFactory.makeStringDataHttpRequest(UndergradUrls.BKJX_TEACHER_COURSE_API, formBodyBuilder.buildAndToString(), cookies); } public static HttpRequest allCourseSchedulePageRequest(String cookies, String term, String timeMode, String subCollegeId, String courseName) { @@ -67,6 +68,6 @@ public class BkjxAllCourseRequestFactory extends BkjxRequestFactory { .add("jc1", "") .add("jc2", ""); - return makeStringDataHttpRequest(UndergradUrls.BKJX_ALL_COURSE_SCHEDULE_API, formBodyBuilder.buildAndToString(), cookies); + return RequestFactory.makeStringDataHttpRequest(UndergradUrls.BKJX_ALL_COURSE_SCHEDULE_API, formBodyBuilder.buildAndToString(), cookies); } } diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/GraduateLogin.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/GraduateLogin.java similarity index 94% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/GraduateLogin.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/GraduateLogin.java index 3641c4e..f94e234 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/GraduateLogin.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/GraduateLogin.java @@ -1,12 +1,12 @@ -package cn.linghang.mywust.core.service.auth; +package cn.linghang.mywust.core.request.service.auth; import cn.linghang.mywust.captcha.SolvedImageCaptcha; import cn.linghang.mywust.captcha.UnsolvedImageCaptcha; import cn.linghang.mywust.core.api.GraduateUrls; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.RequestFactory; -import cn.linghang.mywust.core.request.graduate.GraduateRequestFactory; -import cn.linghang.mywust.core.service.captcha.solver.CaptchaSolver; +import cn.linghang.mywust.core.request.factory.RequestFactory; +import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory; +import cn.linghang.mywust.core.request.service.captcha.solver.CaptchaSolver; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/LibraryLogin.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/LibraryLogin.java similarity index 94% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/LibraryLogin.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/LibraryLogin.java index 8597cca..d104ed4 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/LibraryLogin.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/LibraryLogin.java @@ -1,9 +1,9 @@ -package cn.linghang.mywust.core.service.auth; +package cn.linghang.mywust.core.request.service.auth; import cn.linghang.mywust.core.api.LibraryUrls; import cn.linghang.mywust.core.api.UnionAuthUrls; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.library.LibraryRequestFactory; +import cn.linghang.mywust.core.request.factory.library.LibraryRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/PhysicsLogin.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/PhysicsLogin.java similarity index 94% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/PhysicsLogin.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/PhysicsLogin.java index 2af12fe..d906a23 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/PhysicsLogin.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/PhysicsLogin.java @@ -1,10 +1,9 @@ -package cn.linghang.mywust.core.service.auth; +package cn.linghang.mywust.core.request.service.auth; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.exception.BasicException; import cn.linghang.mywust.core.exception.ParseException; import cn.linghang.mywust.core.parser.physics.PhysicsIndexPageParser; -import cn.linghang.mywust.core.request.physics.PhysicsSystemRequestFactory; +import cn.linghang.mywust.core.request.factory.physics.PhysicsSystemRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/UndergraduateLogin.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/UndergraduateLogin.java similarity index 97% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/UndergraduateLogin.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/UndergraduateLogin.java index 295eaa2..3652c77 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/UndergraduateLogin.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/UndergraduateLogin.java @@ -1,9 +1,9 @@ -package cn.linghang.mywust.core.service.auth; +package cn.linghang.mywust.core.request.service.auth; import cn.linghang.mywust.core.api.UndergradUrls; import cn.linghang.mywust.core.api.UnionAuthUrls; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory; +import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/UnionLogin.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/UnionLogin.java similarity index 96% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/UnionLogin.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/UnionLogin.java index 4a8ec0e..713912e 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/auth/UnionLogin.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/auth/UnionLogin.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.auth; +package cn.linghang.mywust.core.request.service.auth; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.auth.UnionAuthRequestFactory; +import cn.linghang.mywust.core.request.factory.auth.UnionAuthRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/captcha/solver/CaptchaSolver.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/CaptchaSolver.java similarity index 82% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/captcha/solver/CaptchaSolver.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/CaptchaSolver.java index 735d58e..57dba48 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/captcha/solver/CaptchaSolver.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/CaptchaSolver.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.service.captcha.solver; +package cn.linghang.mywust.core.request.service.captcha.solver; import cn.linghang.mywust.captcha.SolvedImageCaptcha; import cn.linghang.mywust.captcha.UnsolvedImageCaptcha; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/captcha/solver/DdddOcrCaptchaSolver.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/DdddOcrCaptchaSolver.java similarity index 91% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/captcha/solver/DdddOcrCaptchaSolver.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/DdddOcrCaptchaSolver.java index be91034..c244270 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/captcha/solver/DdddOcrCaptchaSolver.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/DdddOcrCaptchaSolver.java @@ -1,9 +1,9 @@ -package cn.linghang.mywust.core.service.captcha.solver; +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.core.exception.ApiException; -import cn.linghang.mywust.core.request.RequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; import cn.linghang.mywust.network.entitys.HttpResponse; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java similarity index 95% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java index 0d0b99b..90eabc9 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java @@ -1,9 +1,9 @@ -package cn.linghang.mywust.core.service.captcha.solver; +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.core.exception.ApiException; -import cn.linghang.mywust.core.request.RequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateApiServiceBase.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateApiServiceBase.java similarity index 91% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateApiServiceBase.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateApiServiceBase.java index 46ef5f5..b21cba3 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateApiServiceBase.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateApiServiceBase.java @@ -1,8 +1,8 @@ -package cn.linghang.mywust.core.service.graduate; +package cn.linghang.mywust.core.request.service.graduate; import cn.linghang.mywust.core.api.GraduateUrls; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.RequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateCourseTableApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateCourseTableApiService.java similarity index 87% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateCourseTableApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateCourseTableApiService.java index 1fc3e67..4e96f83 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateCourseTableApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateCourseTableApiService.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.graduate; +package cn.linghang.mywust.core.request.service.graduate; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.graduate.GraduateRequestFactory; +import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateScoreApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateScoreApiService.java similarity index 86% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateScoreApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateScoreApiService.java index 911f724..7e1cd11 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateScoreApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateScoreApiService.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.graduate; +package cn.linghang.mywust.core.request.service.graduate; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.graduate.GraduateRequestFactory; +import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateStudentInfoApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateStudentInfoApiService.java similarity index 86% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateStudentInfoApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateStudentInfoApiService.java index df0878f..448c35e 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateStudentInfoApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateStudentInfoApiService.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.graduate; +package cn.linghang.mywust.core.request.service.graduate; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.graduate.GraduateRequestFactory; +import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateTrainingPlanApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateTrainingPlanApiService.java similarity index 86% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateTrainingPlanApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateTrainingPlanApiService.java index 9d892e4..4a1f4e0 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/graduate/GraduateTrainingPlanApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/graduate/GraduateTrainingPlanApiService.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.graduate; +package cn.linghang.mywust.core.request.service.graduate; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.graduate.GraduateRequestFactory; +import cn.linghang.mywust.core.request.factory.graduate.GraduateRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/physics/PhysicsApiServiceBase.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/physics/PhysicsApiServiceBase.java similarity index 90% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/physics/PhysicsApiServiceBase.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/physics/PhysicsApiServiceBase.java index fb104dd..cd75ff4 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/physics/PhysicsApiServiceBase.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/physics/PhysicsApiServiceBase.java @@ -1,4 +1,4 @@ -package cn.linghang.mywust.core.service.physics; +package cn.linghang.mywust.core.request.service.physics; import cn.linghang.mywust.core.exception.ApiException; import cn.linghang.mywust.network.Requester; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/physics/PhysicsCourseApiServiceBase.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/physics/PhysicsCourseApiServiceBase.java similarity index 87% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/physics/PhysicsCourseApiServiceBase.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/physics/PhysicsCourseApiServiceBase.java index 599a5ca..9ff2782 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/physics/PhysicsCourseApiServiceBase.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/physics/PhysicsCourseApiServiceBase.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.physics; +package cn.linghang.mywust.core.request.service.physics; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.physics.PhysicsSystemRequestFactory; +import cn.linghang.mywust.core.request.factory.physics.PhysicsSystemRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/physics/PhysicsScoreApiServiceBase.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/physics/PhysicsScoreApiServiceBase.java similarity index 94% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/physics/PhysicsScoreApiServiceBase.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/physics/PhysicsScoreApiServiceBase.java index 70abbfe..5609c0c 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/physics/PhysicsScoreApiServiceBase.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/physics/PhysicsScoreApiServiceBase.java @@ -1,9 +1,9 @@ -package cn.linghang.mywust.core.service.physics; +package cn.linghang.mywust.core.request.service.physics; import cn.linghang.mywust.core.exception.ApiException; import cn.linghang.mywust.core.exception.ParseException; import cn.linghang.mywust.core.parser.physics.PhysicsScoreListPageParser; -import cn.linghang.mywust.core.request.physics.PhysicsSystemRequestFactory; +import cn.linghang.mywust.core.request.factory.physics.PhysicsSystemRequestFactory; import cn.linghang.mywust.core.util.PageFormExtractor; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradApiServiceBase.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradApiServiceBase.java similarity index 93% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradApiServiceBase.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradApiServiceBase.java index 8d2774d..a4c9d95 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradApiServiceBase.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradApiServiceBase.java @@ -1,8 +1,8 @@ -package cn.linghang.mywust.core.service.undergraduate; +package cn.linghang.mywust.core.request.service.undergraduate; import cn.linghang.mywust.core.api.UndergradUrls; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.RequestFactory; +import cn.linghang.mywust.core.request.factory.RequestFactory; import cn.linghang.mywust.core.util.BkjxUtil; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradCourseTableApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradCourseTableApiService.java similarity index 92% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradCourseTableApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradCourseTableApiService.java index 3c4a28b..029c2e4 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradCourseTableApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradCourseTableApiService.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.undergraduate; +package cn.linghang.mywust.core.request.service.undergraduate; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory; +import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradCreditStatusApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradCreditStatusApiService.java similarity index 93% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradCreditStatusApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradCreditStatusApiService.java index 3085883..4553047 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradCreditStatusApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradCreditStatusApiService.java @@ -1,9 +1,9 @@ -package cn.linghang.mywust.core.service.undergraduate; +package cn.linghang.mywust.core.request.service.undergraduate; import cn.linghang.mywust.core.exception.ApiException; import cn.linghang.mywust.core.exception.ParseException; import cn.linghang.mywust.core.parser.undergraduate.UndergradCreditStatusIndexParser; -import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory; +import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradExamDelayApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradExamDelayApiService.java similarity index 95% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradExamDelayApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradExamDelayApiService.java index 952681d..96a6d67 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradExamDelayApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradExamDelayApiService.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.undergraduate; +package cn.linghang.mywust.core.request.service.undergraduate; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory; +import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradScoreApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradScoreApiService.java similarity index 90% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradScoreApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradScoreApiService.java index 66bb029..014e049 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradScoreApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradScoreApiService.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.undergraduate; +package cn.linghang.mywust.core.request.service.undergraduate; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory; +import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradStudentInfoApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradStudentInfoApiService.java similarity index 90% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradStudentInfoApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradStudentInfoApiService.java index 6f38b92..c5abaff 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradStudentInfoApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradStudentInfoApiService.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.undergraduate; +package cn.linghang.mywust.core.request.service.undergraduate; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory; +import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradTrainingPlanApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradTrainingPlanApiService.java similarity index 90% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradTrainingPlanApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradTrainingPlanApiService.java index 3ff66dc..5b17ef4 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/UndergradTrainingPlanApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/UndergradTrainingPlanApiService.java @@ -1,7 +1,7 @@ -package cn.linghang.mywust.core.service.undergraduate; +package cn.linghang.mywust.core.request.service.undergraduate; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory; +import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradAllCourseScheduleApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradAllCourseScheduleApiService.java similarity index 87% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradAllCourseScheduleApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradAllCourseScheduleApiService.java index cbbfe37..631cbd1 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradAllCourseScheduleApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradAllCourseScheduleApiService.java @@ -1,8 +1,8 @@ -package cn.linghang.mywust.core.service.undergraduate.global; +package cn.linghang.mywust.core.request.service.undergraduate.global; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.global.BkjxAllCourseRequestFactory; -import cn.linghang.mywust.core.service.undergraduate.UndergradApiServiceBase; +import cn.linghang.mywust.core.request.factory.undergrade.global.BkjxAllCourseRequestFactory; +import cn.linghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradBuildingIdApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradBuildingIdApiService.java similarity index 92% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradBuildingIdApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradBuildingIdApiService.java index 58aefaf..1075040 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradBuildingIdApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradBuildingIdApiService.java @@ -1,9 +1,9 @@ -package cn.linghang.mywust.core.service.undergraduate.global; +package cn.linghang.mywust.core.request.service.undergraduate.global; import cn.linghang.mywust.core.api.ConstantParams; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.BkjxRequestFactory; -import cn.linghang.mywust.core.service.undergraduate.UndergradApiServiceBase; +import cn.linghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; +import cn.linghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase; import cn.linghang.mywust.data.global.Building; import cn.linghang.mywust.data.global.Campus; import cn.linghang.mywust.network.RequestClientOption; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradClassroomCourseApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradClassroomCourseApiService.java similarity index 88% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradClassroomCourseApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradClassroomCourseApiService.java index d0d66ce..4cc3793 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradClassroomCourseApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradClassroomCourseApiService.java @@ -1,8 +1,8 @@ -package cn.linghang.mywust.core.service.undergraduate.global; +package cn.linghang.mywust.core.request.service.undergraduate.global; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.global.BkjxAllCourseRequestFactory; -import cn.linghang.mywust.core.service.undergraduate.UndergradApiServiceBase; +import cn.linghang.mywust.core.request.factory.undergrade.global.BkjxAllCourseRequestFactory; +import cn.linghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradTeacherCourseApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradTeacherCourseApiService.java similarity index 87% rename from mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradTeacherCourseApiService.java rename to mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradTeacherCourseApiService.java index 9e82954..a51405b 100644 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradTeacherCourseApiService.java +++ b/mywust-core/src/main/java/cn/linghang/mywust/core/request/service/undergraduate/global/UndergradTeacherCourseApiService.java @@ -1,8 +1,8 @@ -package cn.linghang.mywust.core.service.undergraduate.global; +package cn.linghang.mywust.core.request.service.undergraduate.global; import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.request.undergrade.global.BkjxAllCourseRequestFactory; -import cn.linghang.mywust.core.service.undergraduate.UndergradApiServiceBase; +import cn.linghang.mywust.core.request.factory.undergrade.global.BkjxAllCourseRequestFactory; +import cn.linghang.mywust.core.request.service.undergraduate.UndergradApiServiceBase; import cn.linghang.mywust.network.RequestClientOption; import cn.linghang.mywust.network.Requester; import cn.linghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/linghang/mywust/core/service/library/LibraryApiService.java b/mywust-core/src/main/java/cn/linghang/mywust/core/service/library/LibraryApiService.java deleted file mode 100644 index c9156b7..0000000 --- a/mywust-core/src/main/java/cn/linghang/mywust/core/service/library/LibraryApiService.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.linghang.mywust.core.service.library; - -public class LibraryApiService { -} diff --git a/mywust-test/pom.xml b/mywust-test/pom.xml index 63a376f..1bbc000 100644 --- a/mywust-test/pom.xml +++ b/mywust-test/pom.xml @@ -61,13 +61,6 @@ RELEASE test - - cn.linghang - mywust-core - 0.0.2-SNAPSHOT - compile - - @@ -76,4 +69,16 @@ UTF-8 + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.0 + + true + + + + \ No newline at end of file diff --git a/mywust-test/src/test/java/ParseTest.java b/mywust-test/src/test/java/ParseTest.java deleted file mode 100644 index 6770d5a..0000000 --- a/mywust-test/src/test/java/ParseTest.java +++ /dev/null @@ -1,51 +0,0 @@ -import cn.linghang.mywust.core.exception.ApiException; -import cn.linghang.mywust.core.exception.ParseException; -import cn.linghang.mywust.core.parser.Parser; -import cn.linghang.mywust.core.parser.physics.PhysicsCoursePageParser; -import cn.linghang.mywust.core.parser.undergraduate.UndergradCreditStatusParser; -import cn.linghang.mywust.core.parser.undergraduate.UndergradExamDelayParser; -import cn.linghang.mywust.core.service.auth.PhysicsLogin; -import cn.linghang.mywust.core.service.auth.UndergraduateLogin; -import cn.linghang.mywust.core.service.physics.PhysicsApiService; -import cn.linghang.mywust.core.service.undergraduate.UndergradCreditStatusApiService; -import cn.linghang.mywust.core.service.undergraduate.UndergradExamDelayApiService; -import cn.linghang.mywust.model.global.Course; -import cn.linghang.mywust.model.physics.PhysicsCourse; -import cn.linghang.mywust.model.undergrad.ExamDelayApplication; -import cn.linghang.mywust.network.RequestClientOption; -import cn.linghang.mywust.network.Requester; -import cn.linghang.mywust.network.okhttp.SimpleOkhttpRequester; -import org.jsoup.Jsoup; - -import java.io.IOException; -import java.util.List; -import java.util.Scanner; - -public class ParseTest { - public static void main(String[] args) throws IOException, ParseException, ApiException { -// Scanner scanner = new Scanner(System.in); -// -// String cookie = scanner.nextLine(); -// -// System.out.println("Cookie:" + cookie); -// -// Requester requester = new SimpleOkhttpRequester(); -// UndergradExamDelayApiService service = new UndergradExamDelayApiService(requester); -// -// RequestClientOption option = new RequestClientOption(); -// RequestClientOption.Proxy proxy = RequestClientOption.Proxy.builder().build(); -// proxy.setAddress("127.0.0.1"); -// proxy.setPort(8080); -// option.setProxy(proxy); -// -// String data = service.getPage("2022-2023-1", "9FF84C58B1CA4BDBB656E4C224B617A9", cookie, option); -// System.out.println(data); - - String html = Jsoup.connect("http://localhost/xf.html").get().toString(); - - UndergradCreditStatusParser parser = new UndergradCreditStatusParser(); - String result = parser.parse(html); - - System.out.println(result); - } -} diff --git a/pom.xml b/pom.xml index bbe9e9e..6672e78 100644 --- a/pom.xml +++ b/pom.xml @@ -48,6 +48,7 @@ + org.apache.maven.plugins maven-source-plugin @@ -61,6 +62,13 @@ + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.0 + + org.codehaus.mojo flatten-maven-plugin