Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-rpc.git

examcloud-core-basic-api-client/pom.xml

@@ -15,6 +15,11 @@
 			<artifactId>examcloud-core-basic-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
 	</dependencies>
 
 </project>

examcloud-core-basic-api/pom.xml

@@ -11,7 +11,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

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

@@ -15,6 +15,11 @@
 			<artifactId>examcloud-core-examwork-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
 	</dependencies>
 
 </project>

examcloud-core-examwork-api/pom.xml

@@ -11,7 +11,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-core-marking-api-client/pom.xml

@@ -1,24 +1,27 @@
 <?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">
-    <parent>
-        <artifactId>examcloud-rpc</artifactId>
-        <groupId>cn.com.qmth.examcloud.rpc</groupId>
-        <version>2019-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<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">
+	<parent>
+		<artifactId>examcloud-rpc</artifactId>
+		<groupId>cn.com.qmth.examcloud.rpc</groupId>
+		<version>2019-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
 
-    <artifactId>examcloud-core-marking-api-client</artifactId>
-    <packaging>jar</packaging>
+	<artifactId>examcloud-core-marking-api-client</artifactId>
+	<packaging>jar</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>cn.com.qmth.examcloud.rpc</groupId>
-            <artifactId>examcloud-core-marking-api</artifactId>
-            <version>${examcloud.version}</version>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.rpc</groupId>
+			<artifactId>examcloud-core-marking-api</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+	</dependencies>
 
 
 </project>

examcloud-core-marking-api/pom.xml

@@ -13,7 +13,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-core-oe-admin-api-client/pom.xml

@@ -1,22 +1,26 @@
 <?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>
-    <artifactId>examcloud-core-oe-admin-api-client</artifactId>
-    <packaging>jar</packaging>
+<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-oe-admin-api-client</artifactId>
+	<packaging>jar</packaging>
 
-    <parent>
-        <groupId>cn.com.qmth.examcloud.rpc</groupId>
-        <artifactId>examcloud-rpc</artifactId>
-        <version>2019-SNAPSHOT</version>
-    </parent>
+	<parent>
+		<groupId>cn.com.qmth.examcloud.rpc</groupId>
+		<artifactId>examcloud-rpc</artifactId>
+		<version>2019-SNAPSHOT</version>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>cn.com.qmth.examcloud.rpc</groupId>
-            <artifactId>examcloud-core-oe-admin-api</artifactId>
-            <version>${examcloud.version}</version>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.rpc</groupId>
+			<artifactId>examcloud-core-oe-admin-api</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+	</dependencies>
 
 </project>

examcloud-core-oe-admin-api/pom.xml

@@ -13,7 +13,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-core-oe-student-api-client/pom.xml

@@ -1,17 +1,21 @@
-<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>
+<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.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
 		<version>2019-SNAPSHOT</version>
 	</parent>
-    <artifactId>examcloud-core-oe-student-api-client</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>cn.com.qmth.examcloud.rpc</groupId>
-            <artifactId>examcloud-core-oe-student-api</artifactId>
-            <version>${examcloud.version}</version>
-        </dependency>
-    </dependencies>
+	<artifactId>examcloud-core-oe-student-api-client</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.rpc</groupId>
+			<artifactId>examcloud-core-oe-student-api</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+	</dependencies>
 </project>

examcloud-core-oe-student-api/pom.xml

@@ -10,7 +10,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-core-oe-student-face-api-client/pom.xml

@@ -1,21 +1,24 @@
 <?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>
+<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.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
 		<version>2019-SNAPSHOT</version>
 	</parent>
 
-    <artifactId>examcloud-core-oe-student-face-api-client</artifactId>
+	<artifactId>examcloud-core-oe-student-face-api-client</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>cn.com.qmth.examcloud.rpc</groupId>
-            <artifactId>examcloud-core-oe-student-face-api</artifactId>
-            <version>${examcloud.version}</version>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.rpc</groupId>
+			<artifactId>examcloud-core-oe-student-face-api</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+	</dependencies>
 </project>

examcloud-core-oe-student-face-api/pom.xml

@@ -13,7 +13,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-core-oe-websocket-api-client/pom.xml

@@ -1,19 +1,24 @@
 <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.rpc</groupId>
-	<artifactId>examcloud-rpc</artifactId>
-	<version>2019-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>examcloud-core-oe-websocket-api-client</artifactId>
-  
-  <dependencies>
-        <dependency>
-            <groupId>cn.com.qmth.examcloud.rpc</groupId>
-            <artifactId>examcloud-core-oe-websocket-api</artifactId>
-            <version>${examcloud.version}</version>
-        </dependency>
-    </dependencies>
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>cn.com.qmth.examcloud.rpc</groupId>
+		<artifactId>examcloud-rpc</artifactId>
+		<version>2019-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>examcloud-core-oe-websocket-api-client</artifactId>
+
+	<dependencies>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.rpc</groupId>
+			<artifactId>examcloud-core-oe-websocket-api</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+	</dependencies>
 </project>

examcloud-core-oe-websocket-api/pom.xml

@@ -12,7 +12,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-core-print-api-client/pom.xml

@@ -1,22 +1,26 @@
 <?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>
-    <artifactId>examcloud-core-print-api-client</artifactId>
-    <packaging>jar</packaging>
+<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-print-api-client</artifactId>
+	<packaging>jar</packaging>
 
-    <parent>
-        <groupId>cn.com.qmth.examcloud.rpc</groupId>
-        <artifactId>examcloud-rpc</artifactId>
-        <version>2019-SNAPSHOT</version>
-    </parent>
+	<parent>
+		<groupId>cn.com.qmth.examcloud.rpc</groupId>
+		<artifactId>examcloud-rpc</artifactId>
+		<version>2019-SNAPSHOT</version>
+	</parent>
 
-    <dependencies>
-        <dependency>
-            <groupId>cn.com.qmth.examcloud.rpc</groupId>
-            <artifactId>examcloud-core-print-api</artifactId>
-            <version>${examcloud.version}</version>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.rpc</groupId>
+			<artifactId>examcloud-core-print-api</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
+	</dependencies>
 
 </project>

examcloud-core-print-api/pom.xml

@@ -13,7 +13,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-core-questions-api-client/pom.xml

@@ -1,21 +1,26 @@
 <?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>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
 		<groupId>cn.com.qmth.examcloud.rpc</groupId>
 		<artifactId>examcloud-rpc</artifactId>
 		<version>2019-SNAPSHOT</version>
 	</parent>
 
-  <groupId>cn.com.qmth.examcloud.rpc</groupId>
-  <artifactId>examcloud-core-questions-api-client</artifactId>
-  <packaging>jar</packaging>
+	<groupId>cn.com.qmth.examcloud.rpc</groupId>
+	<artifactId>examcloud-core-questions-api-client</artifactId>
+	<packaging>jar</packaging>
 
- 	<dependencies>
+	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud.rpc</groupId>
 			<artifactId>examcloud-core-questions-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
 	</dependencies>
 </project>

examcloud-core-questions-api/pom.xml

@@ -11,7 +11,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 		<dependency>

examcloud-exchange-inner-api-client/pom.xml

@@ -14,5 +14,10 @@
 			<artifactId>examcloud-exchange-inner-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
 	</dependencies>
 </project>

examcloud-exchange-inner-api/pom.xml

@@ -11,7 +11,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-global-api-client/pom.xml

@@ -15,5 +15,10 @@
 			<artifactId>examcloud-global-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
 	</dependencies>
 </project>

examcloud-global-api/pom.xml

@@ -11,7 +11,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>

examcloud-task-api-client/pom.xml

@@ -14,5 +14,10 @@
 			<artifactId>examcloud-task-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud</groupId>
+			<artifactId>examcloud-web</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
 	</dependencies>
 </project>

examcloud-task-api/pom.xml

@@ -10,7 +10,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud</groupId>
-			<artifactId>examcloud-web</artifactId>
+			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 	</dependencies>