修改模块名，改包名

mywust-common/README.md

@@ -0,0 +1,3 @@
+# Mywust common
+
+存放各种数据实体类等公共依赖

mywust-common/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>mywust-model</artifactId>
+    <artifactId>mywust-common</artifactId>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

mywust-common/src/main/java/cn/linghang/mywust/data/global/Building.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import java.util.StringJoiner;
 

mywust-common/src/main/java/cn/linghang/mywust/data/global/Campus.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import java.util.StringJoiner;
 

mywust-common/src/main/java/cn/linghang/mywust/data/global/Classroom.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

mywust-common/src/main/java/cn/linghang/mywust/data/global/College.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import java.util.StringJoiner;
 

mywust-common/src/main/java/cn/linghang/mywust/data/global/Course.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

mywust-common/src/main/java/cn/linghang/mywust/data/global/Score.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

mywust-common/src/main/java/cn/linghang/mywust/data/global/StudentInfo.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.global;
+package cn.linghang.mywust.data.global;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

mywust-common/src/main/java/cn/linghang/mywust/data/physics/PhysicsCourse.java

@@ -1,6 +1,6 @@
-package cn.linghang.mywust.model.physics;
+package cn.linghang.mywust.data.physics;
 
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Course;
 import lombok.Getter;
 import lombok.Setter;
 

mywust-common/src/main/java/cn/linghang/mywust/data/undergrad/ExamDelayApplication.java

@@ -1,4 +1,4 @@
-package cn.linghang.mywust.model.undergrad;
+package cn.linghang.mywust.data.undergrad;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

mywust-core/pom.xml

@@ -38,7 +38,7 @@
 
         <dependency>
             <groupId>cn.linghang</groupId>
-            <artifactId>mywust-model</artifactId>
+            <artifactId>mywust-common</artifactId>
             <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>

mywust-core/src/main/java/cn/linghang/mywust/core/parser/HuangjiahuClassroomNameParser.java

@@ -1,7 +1,7 @@
 package cn.linghang.mywust.core.parser;
 
 import cn.linghang.mywust.core.exception.ParseException;
-import cn.linghang.mywust.model.global.Classroom;
+import cn.linghang.mywust.data.global.Classroom;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateCourseTableParser.java

@@ -2,8 +2,8 @@ package cn.linghang.mywust.core.parser.graduate;
 
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Classroom;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Classroom;
+import cn.linghang.mywust.data.global.Course;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateScoreParser.java

@@ -2,7 +2,7 @@ package cn.linghang.mywust.core.parser.graduate;
 
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Score;
+import cn.linghang.mywust.data.global.Score;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/linghang/mywust/core/parser/graduate/GraduateStudentInfoPageParser.java

@@ -3,7 +3,7 @@ package cn.linghang.mywust.core.parser.graduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.global.StudentInfo;
+import cn.linghang.mywust.data.global.StudentInfo;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 

mywust-core/src/main/java/cn/linghang/mywust/core/parser/physics/PhysicsCoursePageParser.java

@@ -3,8 +3,8 @@ package cn.linghang.mywust.core.parser.physics;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.HuangjiahuClassroomNameParser;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Classroom;
-import cn.linghang.mywust.model.physics.PhysicsCourse;
+import cn.linghang.mywust.data.global.Classroom;
+import cn.linghang.mywust.data.physics.PhysicsCourse;
 import org.jsoup.Jsoup;
 import org.jsoup.select.Elements;
 

mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradCourseTableParser.java

@@ -3,8 +3,8 @@ package cn.linghang.mywust.core.parser.undergraduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.global.Classroom;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Classroom;
+import cn.linghang.mywust.data.global.Course;
 import cn.linghang.mywust.util.StringUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradExamDelayParser.java

@@ -3,7 +3,7 @@ package cn.linghang.mywust.core.parser.undergraduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.undergrad.ExamDelayApplication;
+import cn.linghang.mywust.data.undergrad.ExamDelayApplication;
 import lombok.extern.slf4j.Slf4j;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradScoreParser.java

@@ -3,7 +3,7 @@ package cn.linghang.mywust.core.parser.undergraduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.global.Score;
+import cn.linghang.mywust.data.global.Score;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;

mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/UndergradStudentInfoPageParser.java

@@ -3,7 +3,7 @@ package cn.linghang.mywust.core.parser.undergraduate;
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
 import cn.linghang.mywust.core.util.JsoupUtil;
-import cn.linghang.mywust.model.global.StudentInfo;
+import cn.linghang.mywust.data.global.StudentInfo;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/GlobalCourseTableParser.java

@@ -1,8 +1,8 @@
 package cn.linghang.mywust.core.parser.undergraduate.global;
 
 import cn.linghang.mywust.core.exception.ParseException;
-import cn.linghang.mywust.model.global.Classroom;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Classroom;
+import cn.linghang.mywust.data.global.Course;
 import cn.linghang.mywust.util.StringUtil;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;

mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradAllCourseScheduleParser.java

@@ -2,7 +2,7 @@ package cn.linghang.mywust.core.parser.undergraduate.global;
 
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Course;
 
 import java.util.List;
 import java.util.regex.Pattern;

mywust-core/src/main/java/cn/linghang/mywust/core/parser/undergraduate/global/UndergradTeacherCourseParser.java

@@ -2,7 +2,7 @@ package cn.linghang.mywust.core.parser.undergraduate.global;
 
 import cn.linghang.mywust.core.exception.ParseException;
 import cn.linghang.mywust.core.parser.Parser;
-import cn.linghang.mywust.model.global.Course;
+import cn.linghang.mywust.data.global.Course;
 
 import java.util.List;
 import java.util.regex.Pattern;

mywust-core/src/main/java/cn/linghang/mywust/core/request/undergrade/BkjxRequestFactory.java

@@ -2,7 +2,7 @@ package cn.linghang.mywust.core.request.undergrade;
 
 import cn.linghang.mywust.core.api.UndergradUrls;
 import cn.linghang.mywust.core.request.RequestFactory;
-import cn.linghang.mywust.model.global.Campus;
+import cn.linghang.mywust.data.global.Campus;
 import cn.linghang.mywust.network.entitys.FormBodyBuilder;
 import cn.linghang.mywust.network.entitys.HttpRequest;
 import cn.linghang.mywust.util.StringUtil;

mywust-core/src/main/java/cn/linghang/mywust/core/service/undergraduate/global/UndergradBuildingIdApiService.java

@@ -1,12 +1,11 @@
 package cn.linghang.mywust.core.service.undergraduate.global;
 
 import cn.linghang.mywust.core.api.ConstantParams;
-import cn.linghang.mywust.core.api.UndergradUrls;
 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.model.global.Building;
-import cn.linghang.mywust.model.global.Campus;
+import cn.linghang.mywust.data.global.Building;
+import cn.linghang.mywust.data.global.Campus;
 import cn.linghang.mywust.network.RequestClientOption;
 import cn.linghang.mywust.network.Requester;
 import cn.linghang.mywust.network.entitys.HttpRequest;

mywust-model/README.md

@@ -1,3 +0,0 @@
-# Mywust model
-
-存放各种数据实体类

pom.xml

@@ -11,7 +11,7 @@
 
     <modules>
         <module>mywust-core</module>
-        <module>mywust-model</module>
+        <module>mywust-common</module>
         <module>mywust-network</module>
         <module>mywust-util</module>
         <module>mywust-test</module>
@@ -24,7 +24,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>${lombok.version}</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>