diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/auth/UnionAuthRequestFactory.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/auth/UnionAuthRequestFactory.java index ea54f9a..a862d73 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/auth/UnionAuthRequestFactory.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/auth/UnionAuthRequestFactory.java @@ -1,7 +1,7 @@ package cn.wustlinghang.mywust.core.request.factory.auth; import cn.wustlinghang.mywust.core.api.UnionAuthUrls; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.util.StringUtil; diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/graduate/GraduateRequestFactory.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/graduate/GraduateRequestFactory.java index a8d1b1b..20eb5e8 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/graduate/GraduateRequestFactory.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/graduate/GraduateRequestFactory.java @@ -2,7 +2,7 @@ package cn.wustlinghang.mywust.core.request.factory.graduate; import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha; import cn.wustlinghang.mywust.core.api.GraduateUrls; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.core.util.PageFormExtractor; import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.util.StringUtil; diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/library/LibraryRequestFactory.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/library/LibraryRequestFactory.java index 6b7e93f..e86c550 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/library/LibraryRequestFactory.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/library/LibraryRequestFactory.java @@ -1,7 +1,7 @@ package cn.wustlinghang.mywust.core.request.factory.library; import cn.wustlinghang.mywust.core.api.LibraryUrls; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.data.library.origin.BookSearchRequest; import cn.wustlinghang.mywust.network.entitys.HttpRequest; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/physics/PhysicsSystemRequestFactory.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/physics/PhysicsSystemRequestFactory.java index 48bdf45..28e3c1d 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/physics/PhysicsSystemRequestFactory.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/physics/PhysicsSystemRequestFactory.java @@ -1,7 +1,7 @@ package cn.wustlinghang.mywust.core.request.factory.physics; import cn.wustlinghang.mywust.core.api.PhysicsSystemUrls; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.core.util.PageFormExtractor; import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.util.StringUtil; diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/BkjxRequestFactory.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/BkjxRequestFactory.java index c5531bc..7e79c35 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/BkjxRequestFactory.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/BkjxRequestFactory.java @@ -1,7 +1,7 @@ package cn.wustlinghang.mywust.core.request.factory.undergrade; import cn.wustlinghang.mywust.core.api.UndergradUrls; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.data.global.Campus; import cn.wustlinghang.mywust.network.entitys.FormBodyBuilder; import cn.wustlinghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/global/BkjxAllCourseRequestFactory.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/global/BkjxAllCourseRequestFactory.java index fc8127f..d58c535 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/global/BkjxAllCourseRequestFactory.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/global/BkjxAllCourseRequestFactory.java @@ -2,7 +2,7 @@ package cn.wustlinghang.mywust.core.request.factory.undergrade.global; import cn.wustlinghang.mywust.core.api.ConstantParams; import cn.wustlinghang.mywust.core.api.UndergradUrls; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.core.request.factory.undergrade.BkjxRequestFactory; import cn.wustlinghang.mywust.network.entitys.FormBodyBuilder; import cn.wustlinghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/GraduateLogin.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/GraduateLogin.java index 707ed0a..94a7a92 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/GraduateLogin.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/GraduateLogin.java @@ -4,7 +4,7 @@ import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha; import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha; import cn.wustlinghang.mywust.core.api.GraduateUrls; import cn.wustlinghang.mywust.exception.ApiException; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.core.request.factory.graduate.GraduateRequestFactory; import cn.wustlinghang.mywust.core.request.service.captcha.solver.CaptchaSolver; import cn.wustlinghang.mywust.network.RequestClientOption; @@ -19,7 +19,6 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.nio.charset.StandardCharsets; @Slf4j public class GraduateLogin { diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/DdddOcrCaptchaSolver.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/DdddOcrCaptchaSolver.java index 28d4711..e1e27fd 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/DdddOcrCaptchaSolver.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/DdddOcrCaptchaSolver.java @@ -3,7 +3,7 @@ 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; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.network.Requester; import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.network.entitys.HttpResponse; diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java index aed10cf..07cacd8 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java @@ -3,7 +3,7 @@ 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; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.network.RequestClientOption; import cn.wustlinghang.mywust.network.Requester; import cn.wustlinghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateApiServiceBase.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateApiServiceBase.java index 95fc26b..8f64eaa 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateApiServiceBase.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateApiServiceBase.java @@ -2,7 +2,7 @@ package cn.wustlinghang.mywust.core.request.service.graduate; import cn.wustlinghang.mywust.core.api.GraduateUrls; import cn.wustlinghang.mywust.exception.ApiException; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.network.RequestClientOption; import cn.wustlinghang.mywust.network.Requester; import cn.wustlinghang.mywust.network.entitys.HttpRequest; diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradApiServiceBase.java b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradApiServiceBase.java index e1db95d..bbed51e 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradApiServiceBase.java +++ b/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradApiServiceBase.java @@ -1,7 +1,7 @@ package cn.wustlinghang.mywust.core.request.service.undergraduate; import cn.wustlinghang.mywust.core.api.UndergradUrls; -import cn.wustlinghang.mywust.core.request.factory.RequestFactory; +import cn.wustlinghang.mywust.network.request.RequestFactory; import cn.wustlinghang.mywust.core.util.BkjxUtil; import cn.wustlinghang.mywust.exception.ApiException; import cn.wustlinghang.mywust.network.RequestClientOption; diff --git a/mywust-network/pom.xml b/mywust-network/pom.xml index 6e92f3a..252f3ba 100644 --- a/mywust-network/pom.xml +++ b/mywust-network/pom.xml @@ -15,6 +15,8 @@ 1.8 1.8 UTF-8 + + 2.0.3 @@ -24,5 +26,11 @@ ${project.parent.version} compile + + + org.slf4j + slf4j-api + ${slf4j.version} + \ No newline at end of file diff --git a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/RequestFactory.java b/mywust-network/src/main/java/cn/wustlinghang/mywust/network/request/RequestFactory.java similarity index 97% rename from mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/RequestFactory.java rename to mywust-network/src/main/java/cn/wustlinghang/mywust/network/request/RequestFactory.java index 41426e6..e405744 100644 --- a/mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/RequestFactory.java +++ b/mywust-network/src/main/java/cn/wustlinghang/mywust/network/request/RequestFactory.java @@ -1,4 +1,4 @@ -package cn.wustlinghang.mywust.core.request.factory; +package cn.wustlinghang.mywust.network.request; import cn.wustlinghang.mywust.network.entitys.HttpRequest; import lombok.extern.slf4j.Slf4j;