update to v4.1.0-RELEASE

pom.xml

@@ -3,18 +3,18 @@
          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-oe-tool</artifactId>
-    <version>v4.0.2-RELEASE</version>
+    <version>v4.1.0-RELEASE</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-parent</artifactId>
-        <version>v4.0.2-RELEASE</version>
+        <version>v4.1.0-RELEASE</version>
     </parent>
 
     <properties>
         <!-- 云平台版本 -->
-        <examcloud.version>v4.0.2-RELEASE</examcloud.version>
+        <examcloud.version>v4.1.0-RELEASE</examcloud.version>
     </properties>
 
     <dependencies>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.16</version>
+            <version>1.18.20</version>
         </dependency>
 
         <dependency>
@@ -60,7 +60,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>cn.com.qmth.dp.examcloud.oe.Tianji2App</mainClass>
+                            <mainClass>cn.com.qmth.dp.examcloud.oe.OeToolApplication</mainClass>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>./</classpathPrefix>
                         </manifest>

src/main/java/cn/com/qmth/dp/examcloud/oe/Tianji2App.java → src/main/java/cn/com/qmth/dp/examcloud/oe/OeToolApplication.java

@@ -1,15 +1,13 @@
 package cn.com.qmth.dp.examcloud.oe;
 
+import cn.com.qmth.dp.examcloud.oe.util.PropertiesUtil;
+import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
-import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
-import cn.com.qmth.examcloud.web.support.SpringContextHolder;
-
 /**
  * 启动类
  *
@@ -21,22 +19,15 @@ import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 @Configuration
 @EnableAsync
 @ComponentScan(basePackages = {"cn.com.qmth"})
-public class Tianji2App {
+public class OeToolApplication {
 
     static {
         System.setProperty("hibernate.dialect.storage_engine", "innodb");
         PropertiesUtil.loadFromResource("application.properties");
-        PropertyHolder.loadFromResource("application.properties");
     }
 
-    /**
-     * main
-     *
-     * @param args
-     * @author WANGWEI
-     */
     public static void main(String[] args) {
-        SpringApplication.run(Tianji2App.class, args);
+        SpringApplication.run(OeToolApplication.class, args);
 
         // UpyunSiteManager.initSite();
         // UpyunSiteManager.initClient();

src/test/java/cn/com/qmth/dp/examcloud/oe/test/ExportTest.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.dp.examcloud.oe.test;
 
-import cn.com.qmth.dp.examcloud.oe.Tianji2App;
+import cn.com.qmth.dp.examcloud.oe.OeToolApplication;
 import cn.com.qmth.dp.examcloud.oe.modules.export_exam_student_score.ExportExamStudentScore;
 import cn.com.qmth.dp.examcloud.oe.modules.fixExamStudentId.FixExamStudentId;
 import cn.com.qmth.dp.examcloud.oe.modules.get_student_answer_detail.GetStduentAnswerDetailService;
@@ -12,7 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = Tianji2App.class)
+@SpringBootTest(classes = OeToolApplication.class)
 public class ExportTest {
 
     @Autowired