deason 5 gadi atpakaļ
vecāks
revīzija
d7c86553ca

+ 2 - 2
pom.xml

@@ -2,7 +2,7 @@
 <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>data-processing-examcloud-oe</artifactId>
+    <artifactId>examcloud-oe-tool</artifactId>
     <version>v3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
@@ -70,7 +70,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <finalName>data-processing-examcloud-oe</finalName>
+                    <finalName>examcloud-oe-tool</finalName>
                     <descriptors>
                         <descriptor>assembly.xml</descriptor>
                     </descriptors>

+ 0 - 1
shell/start.args

@@ -1 +0,0 @@
---spring.profiles.active=test

+ 0 - 29
shell/start.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-FILE_PATH=$(cd `dirname $0`; pwd)
-APP_VERSION=`cat $FILE_PATH/version`
-APP_MAIN_JAR="data-processing-examcloud-oe-"$APP_VERSION"-SNAPSHOT.jar"
-
-JAVA_OPTS=`cat $FILE_PATH/start.vmoptions`
-APP_ARGS=`cat $FILE_PATH/start.args`
-
-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
-fi
-
-echo "java options:"
-echo "$JAVA_OPTS"
-echo "args:"
-echo "$APP_ARGS"
-    
-nohup java $JAVA_OPTS -jar $FILE_PATH/lib/$APP_MAIN_JAR $APP_ARGS >/dev/null 2>&1 &
-
-echo "starting......"
-
-exit 0
-
-
-

+ 0 - 1
shell/start.vmoptions

@@ -1 +0,0 @@
--server -Xms2g -Xmx2g

+ 0 - 18
shell/stop.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-FILE_PATH=$(cd `dirname $0`; pwd)
-APP_VERSION=`cat $FILE_PATH/version`
-APP_MAIN_JAR="data-processing-examcloud-oe-"$APP_VERSION"-SNAPSHOT.jar"
-
-PID_LIST=`ps -ef|grep $APP_MAIN_JAR|grep java|awk '{print $2}'`
-
-if [ ! -z "$PID_LIST" ]; then
-    echo "Runnable jar is $APP_MAIN_JAR."
-    for PID in $PID_LIST 
-    do
-        kill -9 $PID
-    done
-    echo "stopped !"
-fi
-
-exit 0

+ 0 - 1
shell/version

@@ -1 +0,0 @@
-2019

+ 3 - 1
src/main/java/cn/com/qmth/dp/examcloud/oe/Tianji2App.java

@@ -3,6 +3,7 @@ package cn.com.qmth.dp.examcloud.oe;
 import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
+import cn.com.qmth.examcloud.web.upyun.UpyunSiteManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -40,7 +41,8 @@ public class Tianji2App {
     public static void main(String[] args) {
         SpringApplication.run(Tianji2App.class, args);
 
-        // UpyunSiteManager.init();
+        // UpyunSiteManager.initSite();
+        // UpyunSiteManager.initClient();
 
         Task task = SpringContextHolder.getBean(Task.class);
         task.start();

+ 4 - 4
src/main/java/cn/com/qmth/dp/examcloud/oe/modules/get_student_answer_detail/GetStduentAnswerDetailService.java

@@ -61,10 +61,10 @@ public class GetStduentAnswerDetailService {
 	public void start(Long examId, String courseCode) throws Exception {
 		String packageName = this.getClass().getPackage().getName();
 		String packagePath = packageName.replaceAll("\\.", "/");
-		//E:\qmthPro\dataProcess\data-processing-examcloud-oe\src\main\java\cn\com\qmth\dp\examcloud\oe\modules\get_student_answer_detail
-		//cn/com/qmth/dp/examcloud/oe/modules/get_student_answer_detail/query_exam_record_data_1.sql
-//		String sql = ResourceLoader
-//				.getResource(packagePath + "/query_exam_record_data_" + sqlIndex + ".sql");
+
+		// cn/com/qmth/dp/examcloud/oe/modules/get_student_answer_detail/query_exam_record_data_1.sql
+		// String sql = ResourceLoader.getResource(packagePath + "/query_exam_record_data_" + sqlIndex + ".sql");
+
 		String sql="SELECT " +
 				"t1.identity_number, " +
 				" t1.id AS exam_record_data_id, " +

+ 1 - 1
src/main/resources/application.properties

@@ -1,6 +1,6 @@
 #mvc
 server.port=2008
-spring.application.name=DATA-PROCESSING-OE
+spring.application.name=EXAMCLOUD-OE-TOOL
 spring.main.allow-bean-definition-overriding=true
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8