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-basic-api-provider/pom.xml

@@ -6,21 +6,21 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>cn.com.qmth.examcloud.core.basic</groupId>
+        <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-basic</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-core-basic-api</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.core.basic</groupId>
+            <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-core-basic-service</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/AppController.java

@@ -27,7 +27,7 @@ public class AppController extends ControllerSupport {
     @ApiOperation(value = "查询所有应用")
     @GetMapping("getAllApp")
     public List<AppEntity> getAllApp() {
-        Sort sort = new Sort(Sort.Direction.ASC, "id");
+        Sort sort = Sort.by(Sort.Direction.ASC, "id");
         return appRepo.findAll(sort);
     }
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/CourseController.java

@@ -105,7 +105,7 @@ public class CourseController extends ControllerSupport {
                                             @RequestParam(required = false) Long specialtyId) {
         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.COURSE);
         if (userDataRule.assertEmptyQueryResult()) {
@@ -215,7 +215,7 @@ public class CourseController 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<CourseEntity> page = courseRepo.findAll(specification, pageRequest);
 
         Iterator<CourseEntity> iterator = page.iterator();

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/OrgController.java

@@ -524,7 +524,7 @@ public class OrgController 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<OrgEntity> page = orgRepo.findAll(specification, pageRequest);
         Iterator<OrgEntity> iterator = page.iterator();
         List<OrgEntity> list = Lists.newArrayList();
@@ -567,7 +567,7 @@ public class OrgController extends ControllerSupport {
             throw new StatusException("001251", "total is larger than 1000");
         }
 
-        Sort sort = new Sort(Direction.ASC, "id");
+        Sort sort = Sort.by(Direction.ASC, "id");
         List<OrgEntity> orgEntityList = orgRepo.findAll(specification, sort);
 
         List<OrgDomain> ret = Lists.newArrayList();

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/ResourceController.java

@@ -83,7 +83,7 @@ public class ResourceController extends ControllerSupport {
             return cb.and(predicates.toArray(new Predicate[predicates.size()]));
         };
         PageRequest pageRequest = PageRequest.of(pageNo, pageSize,
-                new Sort(Direction.ASC, "isFile").and(new Sort(Direction.DESC, "creationTime")));
+                Sort.by(Direction.ASC, "isFile").and(Sort.by(Direction.DESC, "creationTime")));
 
         Page<ResourceEntity> page = resourceRepo.findAll(specification, pageRequest);
         Iterator<ResourceEntity> iterator = page.iterator();

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/SpecialtyController.java

@@ -124,7 +124,7 @@ public class SpecialtyController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Direction.DESC, "updateTime", "id"));
+                Sort.by(Direction.DESC, "updateTime", "id"));
 
         Page<SpecialtyEntity> page = specialtyRepo.findAll(specification, pageRequest);
         return page;
@@ -178,7 +178,7 @@ public class SpecialtyController extends ControllerSupport {
         }
 
         List<SpecialtyEntity> list = specialtyRepo.findAll(specification,
-                new Sort(Direction.DESC, "updateTime"));
+                Sort.by(Direction.DESC, "updateTime"));
         return list;
     }
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/StudentController.java

@@ -129,7 +129,7 @@ public class StudentController extends ControllerSupport {
         final Long finalRootOrgId = rootOrgId;
 
         PageRequest pageable = PageRequest.of(curPage, pageSize,
-                new Sort(Direction.DESC, "updateTime", "id"));
+                Sort.by(Direction.DESC, "updateTime", "id"));
 
         UserDataRule userDataRule = super.getUserDataRule(DataRuleType.ORG);
         if (userDataRule.assertEmptyQueryResult()) {
@@ -386,7 +386,7 @@ public class StudentController extends ControllerSupport {
         }
 
         List<StudentEntity> studentList = studentRepo.findAll(specification,
-                new Sort(Direction.DESC, "updateTime"));
+                Sort.by(Direction.DESC, "updateTime"));
         this.doExport(studentList);
     }
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/SystemPropertyController.java

@@ -82,7 +82,7 @@ public class SystemPropertyController extends ControllerSupport {
         };
 
         PageRequest pageRequest = PageRequest.of(curPage, pageSize,
-                new Sort(Direction.DESC, "updateTime", "propKey"));
+                Sort.by(Direction.DESC, "updateTime", "propKey"));
 
         Page<SystemPropertyEntity> page = systemPropertyRepo.findAll(specification, pageRequest);
 

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/UserController.java

@@ -338,7 +338,7 @@ public class UserController 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<UserEntity> userList = userRepo.findAll(specification, pageRequest);
 

examcloud-core-basic-base/pom.xml

@@ -6,31 +6,31 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>cn.com.qmth.examcloud.core.basic</groupId>
+        <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-basic</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <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>
         <dependency>
             <groupId>cn.com.qmth.examcloud.starters</groupId>
             <artifactId>examcloud-geetest-starter</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.github.penggle</groupId>

examcloud-core-basic-dao/pom.xml

@@ -1,19 +1,22 @@
 <?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.basic</groupId>
-		<artifactId>examcloud-core-basic</artifactId>
-		<version>v4.1.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>examcloud-core-basic-dao</artifactId>
+<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-basic-dao</artifactId>
+    <packaging>jar</packaging>
 
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
-			<artifactId>examcloud-core-basic-base</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-	</dependencies>
+    <parent>
+        <groupId>cn.com.qmth.examcloud</groupId>
+        <artifactId>examcloud-core-basic</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud</groupId>
+            <artifactId>examcloud-core-basic-base</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
 </project>

examcloud-core-basic-service/pom.xml

@@ -2,37 +2,38 @@
 <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-basic-service</artifactId>
+    <packaging>jar</packaging>
+
     <parent>
-        <groupId>cn.com.qmth.examcloud.core.basic</groupId>
+        <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-core-basic</artifactId>
-        <version>v4.1.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
-    <artifactId>examcloud-core-basic-service</artifactId>
-    <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>cn.com.qmth.examcloud.core.basic</groupId>
+            <groupId>cn.com.qmth.examcloud</groupId>
             <artifactId>examcloud-core-basic-dao</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-exchange-inner-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>
 
         <dependency>
             <groupId>cn.com.qmth.examcloud.rpc</groupId>
             <artifactId>examcloud-core-examwork-api-client</artifactId>
-            <version>${examcloud.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
     </dependencies>

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/FaceServiceImpl.java

@@ -150,7 +150,7 @@ public class FaceServiceImpl implements FaceService {
 			return cb.and(predicates.toArray(new Predicate[predicates.size()]));
 		};
 
-		PageRequest pageRequest = PageRequest.of(0, 10, new Sort(Direction.DESC, "updateTime"));
+		PageRequest pageRequest = PageRequest.of(0, 10, Sort.by(Direction.DESC, "updateTime"));
 
 		Page<FacesetEntity> studentList = facesetRepo.findAll(specification, pageRequest);
 

examcloud-core-basic-starter/pom.xml

@@ -1,67 +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.basic</groupId>
-		<artifactId>examcloud-core-basic</artifactId>
-		<version>v4.1.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>examcloud-core-basic-starter</artifactId>
-	<packaging>jar</packaging>
+         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-basic-starter</artifactId>
+    <packaging>jar</packaging>
 
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
-			<artifactId>examcloud-core-basic-api-provider</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-	</dependencies>
+    <parent>
+        <groupId>cn.com.qmth.examcloud</groupId>
+        <artifactId>examcloud-core-basic</artifactId>
+        <version>${revision}</version>
+    </parent>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<mainClass>cn.com.qmth.examcloud.core.basic.starter.CoreBasicApp</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-basic</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>
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud</groupId>
+            <artifactId>examcloud-core-basic-api-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <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.basic.starter.CoreBasicApp</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-basic</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.basic</groupId>
     <artifactId>examcloud-core-basic</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>