Merge remote-tracking branch 'origin/release_v5.0.2'

examcloud-exchange-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/SwufeExamController.java

@@ -11,6 +11,8 @@ import cn.com.qmth.examcloud.exchange.outer.api.controller.swufe.bean.SwufeCreat
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -31,6 +33,8 @@ import java.util.Map;
 @RequestMapping("/api/ecs_outlet/exam")
 public class SwufeExamController extends ControllerSupport {
 
+    private static final Logger log = LoggerFactory.getLogger(SwufeExamController.class);
+
     @Autowired
     ExamCloudService examCloudService;
 
@@ -44,6 +48,9 @@ public class SwufeExamController extends ControllerSupport {
         User accessUser = getAccessUser();
         Long rootOrgId = accessUser.getRootOrgId();
 
+        log.warn("-->考试信息 creating... rootOrgId:{}  examCode:{} examName:{} examType:{}",
+                rootOrgId, examReq.getCode(), examReq.getName(), examReq.getExamType());
+
         SaveExamReq saveExamReq = new SaveExamReq();
         saveExamReq
                 .setBeginTime(DateUtil.parse(examReq.getBeginTime(), DatePatterns.CHINA_DEFAULT));

examcloud-exchange-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExamOuterServiceProvider.java

@@ -19,6 +19,8 @@ import cn.com.qmth.examcloud.web.support.StatusResponse;
 import io.swagger.annotations.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -41,6 +43,8 @@ import java.util.Map;
 @RequestMapping("${$rmp.cloud.exchange.outer}/exam")
 public class ExamOuterServiceProvider extends ControllerSupport implements ExamOuterService {
 
+    private static final Logger log = LoggerFactory.getLogger(ExamOuterServiceProvider.class);
+
     private static final long serialVersionUID = 4007321110021402052L;
 
     @Autowired
@@ -58,6 +62,10 @@ public class ExamOuterServiceProvider extends ControllerSupport implements ExamO
             throw new StatusException("1000001", "rootOrgId is wrong");
         }
 
+        Long rootOrgId = req.getRootOrgId();
+        log.warn("==>考试信息 creating... rootOrgId:{}  examCode:{} examName:{} examType:{}",
+                rootOrgId, req.getCode(), req.getName(), req.getExamType());
+
         Date beginTime = req.getBeginTime();
         Integer duration = req.getDuration();
         Date endTime = req.getEndTime();
@@ -65,7 +73,6 @@ public class ExamOuterServiceProvider extends ControllerSupport implements ExamO
         String code = req.getCode();
         String name = req.getName();
         String remark = req.getRemark();
-        Long rootOrgId = req.getRootOrgId();
         Long examTimes = req.getExamTimes();
         Map<String, String> properties = req.getProperties();
         if(properties == null){
@@ -88,7 +95,6 @@ public class ExamOuterServiceProvider extends ControllerSupport implements ExamO
         saveExamReq.setRootOrgId(rootOrgId);
         saveExamReq.setExamTimes(examTimes);
         saveExamReq.setEnableExamStage(req.getEnableExamStage());
-        saveExamReq.setCallType(req.getCallType());
         saveExamReq.setEnableTimingEnd(req.getEnableTimingEnd());
 
         if(CollectionUtils.isNotEmpty(req.getIpWhitelist())){

examcloud-exchange-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/ExtractConfigOuterServiceProvider.java

@@ -1,6 +1,8 @@
 package cn.com.qmth.examcloud.exchange.outer.api.provider;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,9 +29,8 @@ import io.swagger.annotations.ApiResponses;
 @RequestMapping("${$rmp.cloud.exchange.outer}/extract_config")
 public class ExtractConfigOuterServiceProvider extends ControllerSupport implements ExtractConfigOuterService {
 
-    /**
-	 * 
-	 */
+	private static final Logger log = LoggerFactory.getLogger(ExtractConfigOuterServiceProvider.class);
+
 	private static final long serialVersionUID = 1949134276130329162L;
 	
 	@Autowired
@@ -42,12 +43,16 @@ public class ExtractConfigOuterServiceProvider extends ControllerSupport impleme
     @Override
     public OuterSaveExtractConfigResp saveRandomPaperExtractConfig(
             @RequestBody @ApiParam(required = true) OuterSaveExtractConfigReq req) {
-
-    	SaveRandomPaperExtractConfigReq savereq = new SaveRandomPaperExtractConfigReq();
     	if (StringUtils.isBlank(req.getExamCode())&&StringUtils.isBlank(req.getExamName())) {
-            throw new StatusException("examCode、examCode不能都为空");
-        }
-    	savereq.setRootOrgId(getEnterpriseRootOrgId());
+			throw new StatusException("examCode、examCode不能都为空");
+		}
+
+		Long rootOrgId = getEnterpriseRootOrgId();
+		log.warn("==>随机抽卷调卷规则 creating... rootOrgId:{}  examCode:{} examName:{} courseCode:{}",
+				rootOrgId, req.getExamCode(), req.getExamName(), req.getCourseCode());
+
+		SaveRandomPaperExtractConfigReq savereq = new SaveRandomPaperExtractConfigReq();
+		savereq.setRootOrgId(rootOrgId);
     	savereq.setExamName(req.getExamName());
     	savereq.setExamCode(req.getExamCode());
     	savereq.setCourseCode(req.getCourseCode());

examcloud-exchange-starter/assembly.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
 	<id>distribution</id>
 	<formats>
 		<format>zip</format>
 	</formats>
+
 	<fileSets>
 		<fileSet>
 			<directory>${project.basedir}/src/main/resources</directory>
@@ -20,6 +22,7 @@
 			<fileMode>0777</fileMode>
 		</fileSet>
 	</fileSets>
+
 	<dependencySets>
 		<dependencySet>
 			<useProjectArtifact>true</useProjectArtifact>

examcloud-exchange-starter/pom.xml

@@ -54,6 +54,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>${maven-assembly-version}</version>
                 <configuration>
                     <finalName>examcloud-exchange</finalName>
                     <skipAssembly>${skipAssembly}</skipAssembly>
@@ -66,7 +67,7 @@
                         <id>make-assembly</id>
                         <phase>install</phase>
                         <goals>
-                            <goal>assembly</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>