merge from release_v4.0.2

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

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>examcloud-core-questions</artifactId>
         <groupId>cn.com.qmth.examcloud.core.questions</groupId>
-        <version>v4.0.1-RELEASE</version>
+        <version>v4.0.2-RELEASE</version>
     </parent>
 
     <dependencies>

examcloud-core-questions-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>examcloud-core-questions</artifactId>
         <groupId>cn.com.qmth.examcloud.core.questions</groupId>
-        <version>v4.0.1-RELEASE</version>
+        <version>v4.0.2-RELEASE</version>
     </parent>
     <artifactId>examcloud-core-questions-base</artifactId>
     <packaging>jar</packaging>
@@ -62,7 +62,11 @@
             <artifactId>examcloud-core-questions-api-client</artifactId>
             <version>${examcloud.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.reports</groupId>
+            <artifactId>examcloud-reports-commons</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.upyun</groupId>
             <artifactId>java-sdk</artifactId>

examcloud-core-questions-dao/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>examcloud-core-questions</artifactId>
 		<groupId>cn.com.qmth.examcloud.core.questions</groupId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-questions-dao</artifactId>
 	<packaging>jar</packaging>

examcloud-core-questions-service/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>examcloud-core-questions</artifactId>
 		<groupId>cn.com.qmth.examcloud.core.questions</groupId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<artifactId>examcloud-core-questions-service</artifactId>
 	<packaging>jar</packaging>

examcloud-core-questions-starter/pom.xml

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

examcloud-core-questions-starter/shell/start.sh

@@ -2,7 +2,7 @@
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 
-APP_MAIN_JAR="examcloud-core-questions-starter-v4.0.1-RELEASE.jar"
+APP_MAIN_JAR="examcloud-core-questions-starter-v4.0.2-RELEASE.jar"
 
 JAVA_OPTS=`cat $FILE_PATH/start.vmoptions`
 APP_ARGS=`cat $FILE_PATH/start.args`
@@ -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-questions-starter/shell/stop.sh

@@ -2,7 +2,7 @@
 
 FILE_PATH=$(cd `dirname $0`; pwd)
 
-APP_MAIN_JAR="examcloud-core-questions-starter-v4.0.1-RELEASE.jar"
+APP_MAIN_JAR="examcloud-core-questions-starter-v4.0.2-RELEASE.jar"
 
 PID_LIST=`ps -ef|grep $APP_MAIN_JAR|grep java|awk '{print $2}'`
 

pom.xml

@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
 		<artifactId>examcloud-parent</artifactId>
-		<version>v4.0.1-RELEASE</version>
+		<version>v4.0.2-RELEASE</version>
 	</parent>
 	<groupId>cn.com.qmth.examcloud.core.questions</groupId>
 	<artifactId>examcloud-core-questions</artifactId>
-	<version>v4.0.1-RELEASE</version>
+	<version>v4.0.2-RELEASE</version>
 	<packaging>pom</packaging>
 
 	<modules>