feat: 添加maven中央仓库相关设置

fix: 升级部分高危漏洞依赖版本

README.md

@@ -6,7 +6,7 @@
 
 核心代码来自武科大助手后端爬虫模块，在此基础上进行部分修改以适用于各种平台，因此不会使用重量级的框架，尽量保证仅使用原生java或jvm兼容的语言即可使用，是一个比较~~轻量~~的库
 
-由于处在早期阶段，因此项目结构以及外部接口随时可能发生巨大变化，在正式版出来前请勿重度依赖
+由于处在早期阶段，因此项目结构以及外部接口随时可能发生巨大变化，在正式版出来前请勿重度依赖，当前仅作为算法以及处理过程参考使用
 
 后续可能会根据需要新增其他语言的实现以提供给其他语言和平台的使用
 
@@ -35,6 +35,11 @@
   - 成绩查询
 - 图书馆
   - 登录
+  - 图书详情查询
+  - 图书封面Url查询
+  - 图书馆藏信息查询
+  - 当前借阅、历史借阅、即将逾期借阅信息查询
+  - 图书搜索
 
 ...and more...
 </details>
@@ -53,23 +58,18 @@ JDK版本：1.8及以上，推荐JDK 11及以上
 
 ## 使用说明
 
-### 在项目中引用mywust-core
+> 文档？什么文档？不知道不知道
-
+> 以后再说
-目前该项目发布在Github Package上，如遇网络问题请自备工具解决
-
-关于如何在自己的项目中引用：
 
-- Maven项目请参阅：[使用 Apache Maven 注册表](https://docs.github.com/zh/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry)
+### 在项目中引用mywust-core
-
-- Gradle项目请参阅：[使用 Gradle 注册表](https://docs.github.com/zh/packages/working-with-a-github-packages-registry/working-with-the-gradle-registry)
 
-配置好后，直接在`pom.xml`中引用即可：
+在`pom.xml`中引用核心即可：
 
 ```xml
 <dependency>
   <groupId>cn.wustlinghang.mywust</groupId>
   <artifactId>mywust-core</artifactId>
-  <version>0.0.1-fixed</version>
+  <version>0.0.2-beta</version>
 </dependency>
 ```
 

mywust-common/pom.xml

@@ -11,6 +11,36 @@
 
     <artifactId>mywust-common</artifactId>
 
+    <name>${project.artifactId}</name>
+    <description>The API encapsulations of WUST's official web service. Module `${project.artifactId}`</description>
+    <url>https://github.com/LingHangStudio/mywust</url>
+
+    <scm>
+        <url>https://github.com/LingHangStudio/mywust</url>
+        <connection>scm:git:https://github.com/LingHangStudio/mywust.git</connection>
+        <developerConnection>scm:git:https://github.com/LingHangStudio/mywust.git</developerConnection>
+        <tag>${project.parent.version}</tag>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>lensfrex</id>
+            <name>lensfrex</name>
+            <email>lensferno@outlook.com</email>
+            <url>https://github.com/lensferno</url>
+            <organization>wustlinghang</organization>
+            <organizationUrl>https://github.com/LingHangStudio</organizationUrl>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://mit-license.org/</url>
+        </license>
+    </licenses>
+
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

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

@@ -104,6 +104,11 @@ public class ApiException extends BasicException {
          */
         UNDERGRAD_BANNED_IN_EXCLUSIVE_TIME(100108, "本科生登录：专属选课时间段账号被禁用"),
 
+        /**
+         * 用户名信息不存在（新生信息未录入或者老生删档）
+         */
+        UNDERGRAD_USERINFO_NOT_EXISTS(100109, "本科生登录：用户名信息（新生信息未录入或者老生删档）"),
+
         // --------------------------------
         // 共有异常码：cookie无效
 

mywust-core/pom.xml

@@ -10,6 +10,37 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>mywust-core</artifactId>
+
+    <name>${project.artifactId}</name>
+    <description>The API encapsulations of WUST's official web service. Module `${project.artifactId}`</description>
+    <url>https://github.com/LingHangStudio/mywust</url>
+
+    <scm>
+        <url>https://github.com/LingHangStudio/mywust</url>
+        <connection>scm:git:https://github.com/LingHangStudio/mywust.git</connection>
+        <developerConnection>scm:git:https://github.com/LingHangStudio/mywust.git</developerConnection>
+        <tag>${project.parent.version}</tag>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>lensfrex</id>
+            <name>lensfrex</name>
+            <email>lensferno@outlook.com</email>
+            <url>https://github.com/lensferno</url>
+            <organization>wustlinghang</organization>
+            <organizationUrl>https://github.com/LingHangStudio</organizationUrl>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://mit-license.org/</url>
+        </license>
+    </licenses>
+
     <dependencies>
         <dependency>
             <groupId>cn.wustlinghang.mywust</groupId>
@@ -69,7 +100,7 @@
 
         <slf4j.version>2.0.3</slf4j.version>
         <jsoup.version>1.15.3</jsoup.version>
-        <hutool.version>5.8.12</hutool.version>
+        <hutool.version>5.8.22</hutool.version>
         <jackson.version>2.15.2</jackson.version>
     </properties>
 </project>

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

@@ -115,6 +115,9 @@ public class UndergraduateLogin {
         } else if (test.contains("禁用")) {
             // 选课时间段
             throw new ApiException(ApiException.Code.UNDERGRAD_BANNED_IN_EXCLUSIVE_TIME);
+        } else if (test.contains("不存在")) {
+            // 新生信息未录入/老生被删号
+            throw new ApiException(ApiException.Code.UNDERGRAD_USERINFO_NOT_EXISTS);
         }
 
         return true;

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

@@ -1,13 +1,13 @@
 package cn.wustlinghang.mywust.core.request.service.undergraduate;
 
 import cn.wustlinghang.mywust.core.api.UndergradUrls;
-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;
 import cn.wustlinghang.mywust.network.Requester;
 import cn.wustlinghang.mywust.network.entitys.HttpRequest;
 import cn.wustlinghang.mywust.network.entitys.HttpResponse;
+import cn.wustlinghang.mywust.network.request.RequestFactory;
 
 import java.io.IOException;
 import java.util.Map;
@@ -21,12 +21,13 @@ public abstract class UndergradApiServiceBase {
 
     public void checkResponse(HttpResponse response) throws ApiException {
         // 检查响应是否正确
-        if (response.getBody() == null ||
+        boolean cookieInvalid = response.getBody() == null ||
                 response.getStatusCode() != HttpResponse.HTTP_OK ||
-                BkjxUtil.needLogin(response.getBody()) ||
+                BkjxUtil.needLogin(response.getBody());
-                BkjxUtil.isBannedResponse(response)) {
+        if (cookieInvalid) {
-
             throw new ApiException(ApiException.Code.COOKIE_INVALID);
+        } else if (BkjxUtil.isBannedResponse(response)) {
+            throw new ApiException(ApiException.Code.UNDERGRAD_BANNED_IN_EXCLUSIVE_TIME);
         }
     }
 

mywust-network-httpclient/pom.xml

@@ -10,17 +10,40 @@
     </parent>
     <artifactId>mywust-network-httpclient</artifactId>
 
+    <name>${project.artifactId}</name>
+    <description>The API encapsulations of WUST's official web service. Module `${project.artifactId}`</description>
+    <url>https://github.com/LingHangStudio/mywust</url>
+
+    <scm>
+        <url>https://github.com/LingHangStudio/mywust</url>
+        <connection>scm:git:https://github.com/LingHangStudio/mywust.git</connection>
+        <developerConnection>scm:git:https://github.com/LingHangStudio/mywust.git</developerConnection>
+        <tag>${project.parent.version}</tag>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>lensfrex</id>
+            <name>lensfrex</name>
+            <email>lensferno@outlook.com</email>
+            <url>https://github.com/lensferno</url>
+            <organization>wustlinghang</organization>
+            <organizationUrl>https://github.com/LingHangStudio</organizationUrl>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://mit-license.org/</url>
+        </license>
+    </licenses>
+
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
-    <distributionManagement>
-        <repository>
-            <id>github</id>
-            <name>GitHub LingHangStudio Apache Maven Packages</name>
-            <url>https://maven.pkg.github.com/LingHangStudio/mywust</url>
-        </repository>
-    </distributionManagement>
 </project>

mywust-network-okhttp/pom.xml

@@ -11,12 +11,42 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mywust-network-okhttp</artifactId>
 
+    <name>${project.artifactId}</name>
+    <description>The API encapsulations of WUST's official web service. Module `${project.artifactId}`</description>
+    <url>https://github.com/LingHangStudio/mywust</url>
+
+    <scm>
+        <url>https://github.com/LingHangStudio/mywust</url>
+        <connection>scm:git:https://github.com/LingHangStudio/mywust.git</connection>
+        <developerConnection>scm:git:https://github.com/LingHangStudio/mywust.git</developerConnection>
+        <tag>${project.parent.version}</tag>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>lensfrex</id>
+            <name>lensfrex</name>
+            <email>lensferno@outlook.com</email>
+            <url>https://github.com/lensferno</url>
+            <organization>wustlinghang</organization>
+            <organizationUrl>https://github.com/LingHangStudio</organizationUrl>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://mit-license.org/</url>
+        </license>
+    </licenses>
+
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <okhttp.version>3.14.9</okhttp.version>
+        <okhttp.version>4.11.0</okhttp.version>
         <slf4j.version>1.7.36</slf4j.version>
     </properties>
 
@@ -46,11 +76,4 @@
         </dependency>
     </dependencies>
 
-    <distributionManagement>
-        <repository>
-            <id>github</id>
-            <name>GitHub LingHangStudio Apache Maven Packages</name>
-            <url>https://maven.pkg.github.com/LingHangStudio/mywust</url>
-        </repository>
-    </distributionManagement>
 </project>

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

@@ -252,14 +252,14 @@ public class SimpleOkhttpRequester implements Requester {
             requestBuilder.get();
 
         } else if (requestMethod == RequestMethod.POST) {
-            requestBuilder.post(RequestBody.create(this.getMediaType(httpRequest), data));
+            requestBuilder.post(RequestBody.create(data, this.getMediaType(httpRequest)));
 
         } else if (requestMethod == RequestMethod.PUT) {
-            requestBuilder.put(RequestBody.create(this.getMediaType(httpRequest), data));
+            requestBuilder.put(RequestBody.create(data, this.getMediaType(httpRequest)));
 
         } else if (requestMethod == RequestMethod.DELETE) {
             if (httpRequest.getData() != null) {
-                requestBuilder.delete(RequestBody.create(this.getMediaType(httpRequest), data));
+                requestBuilder.delete(RequestBody.create(data, this.getMediaType(httpRequest)));
             } else {
                 requestBuilder.delete();
             }

mywust-network/pom.xml

@@ -11,6 +11,36 @@
 
     <artifactId>mywust-network</artifactId>
 
+    <name>${project.artifactId}</name>
+    <description>The API encapsulations of WUST's official web service. Module `${project.artifactId}`</description>
+    <url>https://github.com/LingHangStudio/mywust</url>
+
+    <scm>
+        <url>https://github.com/LingHangStudio/mywust</url>
+        <connection>scm:git:https://github.com/LingHangStudio/mywust.git</connection>
+        <developerConnection>scm:git:https://github.com/LingHangStudio/mywust.git</developerConnection>
+        <tag>${project.parent.version}</tag>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>lensfrex</id>
+            <name>lensfrex</name>
+            <email>lensferno@outlook.com</email>
+            <url>https://github.com/lensferno</url>
+            <organization>wustlinghang</organization>
+            <organizationUrl>https://github.com/LingHangStudio</organizationUrl>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://mit-license.org/</url>
+        </license>
+    </licenses>
+
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

mywust-test/pom.xml

@@ -12,6 +12,36 @@
 
     <artifactId>mywust-test</artifactId>
 
+    <name>${project.artifactId}</name>
+    <description>The API encapsulations of WUST's official web service. Module `${project.artifactId}`</description>
+    <url>https://github.com/LingHangStudio/mywust</url>
+
+    <scm>
+        <url>https://github.com/LingHangStudio/mywust</url>
+        <connection>scm:git:https://github.com/LingHangStudio/mywust.git</connection>
+        <developerConnection>scm:git:https://github.com/LingHangStudio/mywust.git</developerConnection>
+        <tag>${project.parent.version}</tag>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>lensfrex</id>
+            <name>lensfrex</name>
+            <email>lensferno@outlook.com</email>
+            <url>https://github.com/lensferno</url>
+            <organization>wustlinghang</organization>
+            <organizationUrl>https://github.com/LingHangStudio</organizationUrl>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://mit-license.org/</url>
+        </license>
+    </licenses>
+
     <dependencies>
         <dependency>
             <groupId>cn.wustlinghang.mywust</groupId>
@@ -58,7 +88,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>RELEASE</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

mywust-util/pom.xml

@@ -11,12 +11,43 @@
 
     <artifactId>mywust-util</artifactId>
 
+    <name>${project.artifactId}</name>
+    <description>The API encapsulations of WUST's official web service. Module `${project.artifactId}`</description>
+    <url>https://github.com/LingHangStudio/mywust</url>
+
+    <scm>
+        <url>https://github.com/LingHangStudio/mywust</url>
+        <connection>scm:git:https://github.com/LingHangStudio/mywust.git</connection>
+        <developerConnection>scm:git:https://github.com/LingHangStudio/mywust.git</developerConnection>
+        <tag>${project.parent.version}</tag>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>lensfrex</id>
+            <name>lensfrex</name>
+            <email>lensferno@outlook.com</email>
+            <url>https://github.com/lensferno</url>
+            <organization>wustlinghang</organization>
+            <organizationUrl>https://github.com/LingHangStudio</organizationUrl>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://mit-license.org/</url>
+        </license>
+    </licenses>
+
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <hutool.version>5.8.12</hutool.version>
+        <hutool.version>5.8.22</hutool.version>
+        <guava.version></guava.version>
     </properties>
 
     <dependencies>
@@ -30,7 +61,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>32.1.2-jre</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -9,6 +9,36 @@
     <packaging>pom</packaging>
     <version>${revision}</version>
 
+    <name>mywust</name>
+    <description>The API encapsulations of WUST's official web service.</description>
+    <url>https://github.com/LingHangStudio/mywust</url>
+
+    <scm>
+        <url>https://github.com/LingHangStudio/mywust</url>
+        <connection>scm:git:https://github.com/LingHangStudio/mywust.git</connection>
+        <developerConnection>scm:git:https://github.com/LingHangStudio/mywust.git</developerConnection>
+        <tag>${revision}</tag>
+    </scm>
+
+    <developers>
+        <developer>
+            <id>lensfrex</id>
+            <name>lensfrex</name>
+            <email>lensferno@outlook.com</email>
+            <url>https://github.com/lensferno</url>
+            <organization>wustlinghang</organization>
+            <organizationUrl>https://github.com/LingHangStudio</organizationUrl>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+
+    <licenses>
+        <license>
+            <name>MIT License</name>
+            <url>https://mit-license.org/</url>
+        </license>
+    </licenses>
+
     <modules>
         <module>mywust-core</module>
         <module>mywust-common</module>
@@ -36,44 +66,34 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+        <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
+        <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
+        <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
+        <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
+
     </properties>
 
     <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
         <repository>
-            <id>github</id>
+            <id>ossrh</id>
-            <name>GitHub LingHangStudio Apache Maven Packages</name>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-            <url>https://maven.pkg.github.com/LingHangStudio/mywust</url>
         </repository>
     </distributionManagement>
 
     <build>
         <plugins>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>3.1.0</version>
-            </plugin>
-
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.3.0</version>
+                <version>${flatten-maven-plugin.version}</version>
                 <configuration>
+                    <flattenMode>ossrh</flattenMode>
                 </configuration>
                 <executions>
                     <!-- enable flattening -->
@@ -96,4 +116,69 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>${maven-source-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>${maven-javadoc-plugin.version}</version>
+                        <configuration>
+                            <doclint>none</doclint>
+                            <charset>UTF-8</charset>
+                            <encoding>UTF-8</encoding>
+                            <docencoding>UTF-8</docencoding>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>${maven-gpg-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-deploy-plugin</artifactId>
+                        <version>${maven-deploy-plugin.version}</version>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>