Merge remote-tracking branch 'origin/dev_v4.1.0' into dev_v4.1.0

.gitignore

@@ -1,20 +1,50 @@
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
 *.class
+*.log
 
-# Proguard folder generated by ide
-.project
+
+### Eclipse & STS ###
+.apt_generated
 .classpath
-*.springBeans
+.factorypath
+.project
 .settings
-target/
-.idea/
-*.iml
+.springBeans
+.sts4-cache
+
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
 
-# Log Files
-*.log
-*.class
 
+### VS Code ###
+.vscode
+node_modules
+package-lock.json
+yarn.lock
 
-# Package Files #
-*.jar
+
+### Package Files ###
+*.zip
 *.war
 *.ear
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+target/
+
+.flattened-pom.xml
+.DS_Store
+

examcloud-core-examwork-api-provider/pom.xml

@@ -1,30 +1,32 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud.core.examwork</groupId>
-		<artifactId>examcloud-core-examwork</artifactId>
-		<version>v4.1.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>examcloud-core-examwork-api-provider</artifactId>
-	<packaging>jar</packaging>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>examcloud-core-examwork-api-provider</artifactId>
+    <packaging>jar</packaging>
 
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.rpc</groupId>
-			<artifactId>examcloud-core-examwork-api</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.rpc</groupId>
-			<artifactId>examcloud-global-api</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.examwork</groupId>
-			<artifactId>examcloud-core-examwork-service</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
+    <parent>
+        <groupId>cn.com.qmth.examcloud</groupId>
+        <artifactId>examcloud-core-examwork</artifactId>
+        <version>${revision}</version>
+    </parent>
 
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
+            <artifactId>examcloud-core-examwork-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.rpc</groupId>
+            <artifactId>examcloud-global-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud</groupId>
+            <artifactId>examcloud-core-examwork-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
 </project>

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -216,7 +216,7 @@ public class ExamController extends ControllerSupport {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
 
-        PageRequest pageRequest = PageRequest.of(0, 50, new Sort(Direction.DESC, "updateTime"));
+        PageRequest pageRequest = PageRequest.of(0, 50, Sort.by(Direction.DESC, "updateTime"));
 
         Page<ExamCourseRelationEntity> page = examCourseRelationRepo.findAll(specification,
                 pageRequest);
@@ -255,7 +255,7 @@ public class ExamController extends ControllerSupport {
                                           @RequestParam(required = false) String propertyKeys) {
         User accessUser = getAccessUser();
 
-        PageRequest pageable = PageRequest.of(curPage, pageSize, new Sort(Direction.DESC, "updateTime", "id"));
+        PageRequest pageable = PageRequest.of(curPage, pageSize, Sort.by(Direction.DESC, "updateTime", "id"));
 
         UserDataRule userDataRule = super.getUserDataRule(DataRuleType.EXAM);
         if (userDataRule.assertEmptyQueryResult()) {
@@ -403,7 +403,7 @@ public class ExamController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(0, 100,
-                new Sort(Direction.DESC, "updateTime", "id"));
+                Sort.by(Direction.DESC, "updateTime", "id"));
         Page<ExamEntity> page = examRepo.findAll(specification, pageRequest);
 
         Iterator<ExamEntity> iterator = page.iterator();

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStageController.java

@@ -131,7 +131,7 @@ public class ExamStageController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Sort.Direction.DESC, "stageOrder"));
+                Sort.by(Sort.Direction.DESC, "stageOrder"));
 
         Page<ExamStageEntity> page = examStageRepo.findAll(specification, pageRequest);
 
@@ -204,7 +204,7 @@ public class ExamStageController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(0, 100,
-                new Sort(Sort.Direction.ASC, "stageOrder"));
+                Sort.by(Sort.Direction.ASC, "stageOrder"));
         Page<ExamStageEntity> page = examStageRepo.findAll(specification, pageRequest);
 
         Iterator<ExamStageEntity> iterator = page.iterator();

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamStudentController.java

@@ -179,7 +179,7 @@ public class ExamStudentController extends ControllerSupport {
             @RequestParam(required = false, defaultValue = "false") Boolean skipRule) {
 
         User accessUser = getAccessUser();
-        PageRequest pageable = PageRequest.of(curPage, pageSize, new Sort(Direction.DESC, "updateTime", "id"));
+        PageRequest pageable = PageRequest.of(curPage, pageSize, Sort.by(Direction.DESC, "updateTime", "id"));
 
         UserDataRule orgDataRule = super.getUserDataRule(DataRuleType.ORG);
         UserDataRule courseDataRule = super.getUserDataRule(DataRuleType.COURSE);

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamStudentCloudServiceProvider.java

@@ -391,7 +391,7 @@ public class ExamStudentCloudServiceProvider extends ControllerSupport
         };
 
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Direction.DESC, "updateTime", "id"));
+                Sort.by(Direction.DESC, "updateTime", "id"));
 
         Page<ExamStudentEntity> examStudents = examStudentRepo.findAll(specification, pageRequest);
 

examcloud-core-examwork-base/pom.xml

@@ -2,28 +2,30 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>examcloud-core-examwork-base</artifactId>
+    <packaging>jar</packaging>
+
     <parent>
-        <groupId>cn.com.qmth.examcloud.core.examwork</groupId>
+        <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-examwork</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
-    <artifactId>examcloud-core-examwork-base</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-web</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-support</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.reports</groupId>
+            <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-reports-commons</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

examcloud-core-examwork-dao/pom.xml

@@ -2,19 +2,20 @@
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>examcloud-core-examwork-dao</artifactId>
+    <packaging>jar</packaging>
+
     <parent>
-        <groupId>cn.com.qmth.examcloud.core.examwork</groupId>
+        <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-examwork</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
-    <artifactId>examcloud-core-examwork-dao</artifactId>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.core.examwork</groupId>
+            <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-core-examwork-base</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>

examcloud-core-examwork-service/pom.xml

@@ -2,42 +2,44 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>examcloud-core-examwork-service</artifactId>
+    <packaging>jar</packaging>
+
     <parent>
-        <groupId>cn.com.qmth.examcloud.core.examwork</groupId>
+        <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-examwork</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
-    <artifactId>examcloud-core-examwork-service</artifactId>
 
     <dependencies>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.core.examwork</groupId>
+            <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-core-examwork-dao</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-core-basic-api-client</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-core-oe-admin-api-client</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-core-marking-api-client</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-task-api-client</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamServiceImpl.java

@@ -842,7 +842,7 @@ public class ExamServiceImpl implements ExamService {
             }
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
-        PageRequest pageRequest = PageRequest.of(curPage, pageSize, new Sort(Sort.Direction.DESC, "creationTime"));
+        PageRequest pageRequest = PageRequest.of(curPage, pageSize, Sort.by(Sort.Direction.DESC, "creationTime"));
         return new PageInfo<>(examIpLimitRepo.findAll(spec, pageRequest));
     }
 

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/NoticeServiceImpl.java

@@ -138,7 +138,7 @@ public class NoticeServiceImpl implements NoticeService {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Sort.Direction.DESC, "creationTime"));
+                Sort.by(Sort.Direction.DESC, "creationTime"));
         Page<NoticeEntity> pagedNoticeEntityList = noticeRepo.findAll(specification, pageRequest);
         List<Long> noticeIdList = pagedNoticeEntityList.stream().map(p -> p.getId())
                 .collect(Collectors.toList());

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/OnGoingExamServiceImpl.java

@@ -126,7 +126,7 @@ public class OnGoingExamServiceImpl implements OnGoingExamService {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
 
-        PageRequest pageRequest = PageRequest.of(0, 100, new Sort(Direction.ASC, "beginTime"));
+        PageRequest pageRequest = PageRequest.of(0, 100, Sort.by(Direction.ASC, "beginTime"));
 
         List<ExamSpecialSettingsEntity> entityList = examSpecialSettingsRepo
                 .findAll(specification, pageRequest).getContent();
@@ -160,7 +160,7 @@ public class OnGoingExamServiceImpl implements OnGoingExamService {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
 
-        PageRequest pageRequest = PageRequest.of(0, 100, new Sort(Direction.ASC, "beginTime"));
+        PageRequest pageRequest = PageRequest.of(0, 100, Sort.by(Direction.ASC, "beginTime"));
 
         List<ExamSpecialSettingsEntity> entityList = examSpecialSettingsRepo
                 .findAll(specification, pageRequest).getContent();
@@ -195,7 +195,7 @@ public class OnGoingExamServiceImpl implements OnGoingExamService {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
 
-        PageRequest pageRequest = PageRequest.of(0, 100, new Sort(Direction.ASC, "beginTime"));
+        PageRequest pageRequest = PageRequest.of(0, 100, Sort.by(Direction.ASC, "beginTime"));
 
         List<ExamSpecialSettingsEntity> entityList = examSpecialSettingsRepo
                 .findAll(specification, pageRequest).getContent();

examcloud-core-examwork-starter/pom.xml

@@ -1,68 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud.core.examwork</groupId>
-		<artifactId>examcloud-core-examwork</artifactId>
-		<version>v4.1.0-SNAPSHOT</version>
-	</parent>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>examcloud-core-examwork-starter</artifactId>
+    <packaging>jar</packaging>
 
-	<artifactId>examcloud-core-examwork-starter</artifactId>
-	<packaging>jar</packaging>
+    <parent>
+        <groupId>cn.com.qmth.examcloud</groupId>
+        <artifactId>examcloud-core-examwork</artifactId>
+        <version>${revision}</version>
+    </parent>
 
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.examwork</groupId>
-			<artifactId>examcloud-core-examwork-api-provider</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud</groupId>
+            <artifactId>examcloud-core-examwork-api-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<mainClass>cn.com.qmth.examcloud.core.examwork.starter.CoreExamWorkApp</mainClass>
-							<addClasspath>true</addClasspath>
-							<classpathPrefix>./</classpathPrefix>
-						</manifest>
-						<manifestEntries>
-							<Class-Path>../config/</Class-Path>
-						</manifestEntries>
-					</archive>
-					<excludes>
-						<exclude>templates/*</exclude>
-						<exclude>*.properties</exclude>
-						<exclude>*.xml </exclude>
-						<exclude>classpath.location</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<finalName>examcloud-core-examwork</finalName>
-					<descriptors>
-						<descriptor>assembly.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>install</phase>
-						<goals>
-							<goal>assembly</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>cn.com.qmth.examcloud.core.examwork.starter.CoreExamWorkApp</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>./</classpathPrefix>
+                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>../config/</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                    <excludes>
+                        <exclude>templates/*</exclude>
+                        <exclude>*.properties</exclude>
+                        <exclude>*.xml</exclude>
+                        <exclude>classpath.location</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <finalName>examcloud-core-examwork</finalName>
+                    <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>assembly</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

pom.xml

@@ -2,15 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>cn.com.qmth.examcloud.core.examwork</groupId>
     <artifactId>examcloud-core-examwork</artifactId>
-    <version>v4.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-parent</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <version>${revision}</version>
+        <relativePath>../examcloud-parent/pom.xml</relativePath>
     </parent>
 
     <modules>