merge from release_v4.0.2

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-core-oe-admin</artifactId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-admin-api-provider</artifactId>
 

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

@@ -1,11 +1,13 @@
 <?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">
+<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</groupId>
 		<artifactId>examcloud-core-oe-admin</artifactId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-admin-base</artifactId>
 
@@ -124,6 +126,11 @@
 			<groupId>com.esotericsoftware</groupId>
 			<artifactId>reflectasm</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>cn.com.qmth.examcloud.reports</groupId>
+			<artifactId>examcloud-reports-commons</artifactId>
+			<version>${examcloud.version}</version>
+		</dependency>
 	</dependencies>
 
 </project>

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

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-core-oe-admin</artifactId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-admin-dao</artifactId>
 	

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

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-core-oe-admin</artifactId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-admin-service</artifactId>
 

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

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-core-oe-admin</artifactId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-admin-starter</artifactId>
 

examcloud-core-oe-admin-starter/shell/start.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APP_MAIN_JAR="examcloud-core-oe-admin-starter-v4.0.1-RELEASE.jar"
+APP_MAIN_JAR="examcloud-core-oe-admin-starter-v4.0.2-RELEASE.jar"
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 
@@ -11,7 +11,7 @@ PID_LIST=`ps -ef|grep $APP_MAIN_JAR|grep java|awk '{print $2}'`
 
 if [ ! -z "$PID_LIST" ]; then
     echo "[ERROR] : APP is already running!"
-    exit -1
+#    exit -1
 fi
 
 if [ "$1" ];then

examcloud-core-oe-admin-starter/shell/stop.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APP_MAIN_JAR="examcloud-core-oe-admin-starter-v4.0.1-RELEASE.jar"
+APP_MAIN_JAR="examcloud-core-oe-admin-starter-v4.0.2-RELEASE.jar"
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 PID_LIST=`ps -ef|grep $APP_MAIN_JAR|grep java|awk '{print $2}'`

pom.xml

@@ -5,10 +5,10 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-parent</artifactId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-oe-admin</artifactId>
-	<version>v4.0.1-RELEASE</version>
+	<version>v4.0.2-RELEASE</version>
 	<packaging>pom</packaging>