ref: 移动RequestFactory至network通用包

main
lensfrex 1 year ago
parent 965562b69e
commit 736dc78d1b
Signed by: lensfrex
GPG Key ID: 0F69A0A2FBEE98A0
  1. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/auth/UnionAuthRequestFactory.java
  2. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/graduate/GraduateRequestFactory.java
  3. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/library/LibraryRequestFactory.java
  4. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/physics/PhysicsSystemRequestFactory.java
  5. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/BkjxRequestFactory.java
  6. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/factory/undergrade/global/BkjxAllCourseRequestFactory.java
  7. 3
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/auth/GraduateLogin.java
  8. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/DdddOcrCaptchaSolver.java
  9. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/captcha/solver/LinghangOcrServiceCaptchaSolver.java
  10. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/graduate/GraduateApiServiceBase.java
  11. 2
      mywust-core/src/main/java/cn/wustlinghang/mywust/core/request/service/undergraduate/UndergradApiServiceBase.java
  12. 8
      mywust-network/pom.xml
  13. 2
      mywust-network/src/main/java/cn/wustlinghang/mywust/network/request/RequestFactory.java

@ -1,7 +1,7 @@
package cn.wustlinghang.mywust.core.request.factory.auth; package cn.wustlinghang.mywust.core.request.factory.auth;
import cn.wustlinghang.mywust.core.api.UnionAuthUrls; 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.network.entitys.HttpRequest;
import cn.wustlinghang.mywust.util.StringUtil; import cn.wustlinghang.mywust.util.StringUtil;

@ -2,7 +2,7 @@ package cn.wustlinghang.mywust.core.request.factory.graduate;
import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha; import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha;
import cn.wustlinghang.mywust.core.api.GraduateUrls; 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.core.util.PageFormExtractor;
import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.network.entitys.HttpRequest;
import cn.wustlinghang.mywust.util.StringUtil; import cn.wustlinghang.mywust.util.StringUtil;

@ -1,7 +1,7 @@
package cn.wustlinghang.mywust.core.request.factory.library; package cn.wustlinghang.mywust.core.request.factory.library;
import cn.wustlinghang.mywust.core.api.LibraryUrls; 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.data.library.origin.BookSearchRequest;
import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.network.entitys.HttpRequest;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;

@ -1,7 +1,7 @@
package cn.wustlinghang.mywust.core.request.factory.physics; package cn.wustlinghang.mywust.core.request.factory.physics;
import cn.wustlinghang.mywust.core.api.PhysicsSystemUrls; 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.core.util.PageFormExtractor;
import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.network.entitys.HttpRequest;
import cn.wustlinghang.mywust.util.StringUtil; import cn.wustlinghang.mywust.util.StringUtil;

@ -1,7 +1,7 @@
package cn.wustlinghang.mywust.core.request.factory.undergrade; package cn.wustlinghang.mywust.core.request.factory.undergrade;
import cn.wustlinghang.mywust.core.api.UndergradUrls; 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.data.global.Campus;
import cn.wustlinghang.mywust.network.entitys.FormBodyBuilder; import cn.wustlinghang.mywust.network.entitys.FormBodyBuilder;
import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.network.entitys.HttpRequest;

@ -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.ConstantParams;
import cn.wustlinghang.mywust.core.api.UndergradUrls; 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.core.request.factory.undergrade.BkjxRequestFactory;
import cn.wustlinghang.mywust.network.entitys.FormBodyBuilder; import cn.wustlinghang.mywust.network.entitys.FormBodyBuilder;
import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.network.entitys.HttpRequest;

@ -4,7 +4,7 @@ import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha;
import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha; import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha;
import cn.wustlinghang.mywust.core.api.GraduateUrls; import cn.wustlinghang.mywust.core.api.GraduateUrls;
import cn.wustlinghang.mywust.exception.ApiException; 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.factory.graduate.GraduateRequestFactory;
import cn.wustlinghang.mywust.core.request.service.captcha.solver.CaptchaSolver; import cn.wustlinghang.mywust.core.request.service.captcha.solver.CaptchaSolver;
import cn.wustlinghang.mywust.network.RequestClientOption; import cn.wustlinghang.mywust.network.RequestClientOption;
@ -19,7 +19,6 @@ import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
@Slf4j @Slf4j
public class GraduateLogin { public class GraduateLogin {

@ -3,7 +3,7 @@ package cn.wustlinghang.mywust.core.request.service.captcha.solver;
import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha; import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha;
import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha; import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha;
import cn.wustlinghang.mywust.exception.ApiException; 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.Requester;
import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.network.entitys.HttpRequest;
import cn.wustlinghang.mywust.network.entitys.HttpResponse; import cn.wustlinghang.mywust.network.entitys.HttpResponse;

@ -3,7 +3,7 @@ package cn.wustlinghang.mywust.core.request.service.captcha.solver;
import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha; import cn.wustlinghang.mywust.captcha.SolvedImageCaptcha;
import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha; import cn.wustlinghang.mywust.captcha.UnsolvedImageCaptcha;
import cn.wustlinghang.mywust.exception.ApiException; 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.RequestClientOption;
import cn.wustlinghang.mywust.network.Requester; import cn.wustlinghang.mywust.network.Requester;
import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.network.entitys.HttpRequest;

@ -2,7 +2,7 @@ package cn.wustlinghang.mywust.core.request.service.graduate;
import cn.wustlinghang.mywust.core.api.GraduateUrls; import cn.wustlinghang.mywust.core.api.GraduateUrls;
import cn.wustlinghang.mywust.exception.ApiException; 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.RequestClientOption;
import cn.wustlinghang.mywust.network.Requester; import cn.wustlinghang.mywust.network.Requester;
import cn.wustlinghang.mywust.network.entitys.HttpRequest; import cn.wustlinghang.mywust.network.entitys.HttpRequest;

@ -1,7 +1,7 @@
package cn.wustlinghang.mywust.core.request.service.undergraduate; package cn.wustlinghang.mywust.core.request.service.undergraduate;
import cn.wustlinghang.mywust.core.api.UndergradUrls; 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.core.util.BkjxUtil;
import cn.wustlinghang.mywust.exception.ApiException; import cn.wustlinghang.mywust.exception.ApiException;
import cn.wustlinghang.mywust.network.RequestClientOption; import cn.wustlinghang.mywust.network.RequestClientOption;

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

@ -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 cn.wustlinghang.mywust.network.entitys.HttpRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
Loading…
Cancel
Save