ref: 移动RequestFactory至network通用包

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;
 

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;

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;

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;

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;

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;

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 {

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;

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;

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;

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;

mywust-network/pom.xml

@@ -15,6 +15,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <slf4j.version>2.0.3</slf4j.version>
     </properties>
 
     <dependencies>
@@ -24,5 +26,11 @@
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
     </dependencies>
 </project>

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;