Merge remote-tracking branch 'origin/master'

examcloud-exchange-inner-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/provider/UpyunCloudServiceProvider.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.examcloud.exchange.inner.api.provider;
 
 import java.io.IOException;
-import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +54,6 @@ public class UpyunCloudServiceProvider extends ControllerSupport implements Upyu
 		if (StringUtils.isNotBlank(relativePath)) {
 			relativePath = PathUtil.startsWithoutSeparator(relativePath);
 		}
-		Map<String, String> properties = req.getProperties();
 		Long rootOrgId = req.getRootOrgId();
 		Long userId = req.getUserId();
 		String siteId = req.getSiteId();
@@ -66,7 +64,12 @@ public class UpyunCloudServiceProvider extends ControllerSupport implements Upyu
 		env.setUserId(String.valueOf(userId));
 		env.setFileSuffix(fileSuffix);
 		env.setRelativePath(relativePath);
-		env.setProperties(properties);
+
+		env.setExt1(req.getExt1());
+		env.setExt2(req.getExt2());
+		env.setExt3(req.getExt3());
+		env.setExt4(req.getExt4());
+		env.setExt5(req.getExt5());
 
 		UpYunPathInfo path = null;
 		try {

examcloud-exchange-inner-service/src/main/java/cn/com/qmth/examcloud/exchange/inner/service/bean/UpyunPathEnvironmentInfo.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.exchange.inner.service.bean;
 
-import java.util.Map;
-
 import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 
 /**
@@ -41,9 +39,29 @@ public class UpyunPathEnvironmentInfo implements JsonSerializable {
 	private String relativePath;
 
 	/**
-	 * 其他属性
+	 * 扩展属性
+	 */
+	private String ext1;
+
+	/**
+	 * 扩展属性
 	 */
-	private Map<String, String> properties;
+	private String ext2;
+
+	/**
+	 * 扩展属性
+	 */
+	private String ext3;
+
+	/**
+	 * 扩展属性
+	 */
+	private String ext4;
+
+	/**
+	 * 扩展属性
+	 */
+	private String ext5;
 
 	public String getRootOrgId() {
 		return rootOrgId;
@@ -85,12 +103,44 @@ public class UpyunPathEnvironmentInfo implements JsonSerializable {
 		this.relativePath = relativePath;
 	}
 
-	public Map<String, String> getProperties() {
-		return properties;
+	public String getExt1() {
+		return ext1;
+	}
+
+	public void setExt1(String ext1) {
+		this.ext1 = ext1;
+	}
+
+	public String getExt2() {
+		return ext2;
+	}
+
+	public void setExt2(String ext2) {
+		this.ext2 = ext2;
+	}
+
+	public String getExt3() {
+		return ext3;
+	}
+
+	public void setExt3(String ext3) {
+		this.ext3 = ext3;
+	}
+
+	public String getExt4() {
+		return ext4;
+	}
+
+	public void setExt4(String ext4) {
+		this.ext4 = ext4;
+	}
+
+	public String getExt5() {
+		return ext5;
 	}
 
-	public void setProperties(Map<String, String> properties) {
-		this.properties = properties;
+	public void setExt5(String ext5) {
+		this.ext5 = ext5;
 	}
 
 }

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

@@ -49,7 +49,8 @@ public class SwufeStudentInfoController extends ControllerSupport {
 	ExamStudentCloudService examStudentCloudService;
 
 	@PostMapping
-	public Map<String, Object> saveStudentInfo(@RequestBody List<SwufeSaveExamStudentDomain> studentInfoReqs) {
+	public Map<String, Object> saveStudentInfo(
+			@RequestBody List<SwufeSaveExamStudentDomain> studentInfoReqs) {
 		User accessUser = getAccessUser();
 		Long rootOrgId = accessUser.getRootOrgId();
 
@@ -72,7 +73,9 @@ public class SwufeStudentInfoController extends ControllerSupport {
 			saveStudentReq.setOrgId(cur.getOrgId());
 			saveStudentReq.setOrgName(cur.getOrgName());
 			saveStudentReq.setRootOrgId(rootOrgId);
-			saveStudentReq.setStudentCode(cur.getStudentCode());
+			List<String> studentCodeList = Lists.newArrayList();
+			studentCodeList.add(cur.getStudentCode());
+			saveStudentReq.setStudentCodeList(studentCodeList);
 
 			SaveStudentResp insertOrUpdateStudentResp = studentCloudService
 					.saveStudent(saveStudentReq);

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/SydxStudentExamInfoController.java

@@ -109,7 +109,9 @@ public class SydxStudentExamInfoController extends ControllerSupport {
 			saveStudentReq.setOrgId(cur.getOrgId());
 			saveStudentReq.setOrgName(cur.getOrgName());
 			saveStudentReq.setRootOrgId(rootOrgId);
-			saveStudentReq.setStudentCode(cur.getStudentCode());
+			List<String> studentCodeList = Lists.newArrayList();
+			studentCodeList.add(cur.getStudentCode());
+			saveStudentReq.setStudentCodeList(studentCodeList);
 
 			SaveStudentResp saveStudentResp = null;
 			try {

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

@@ -81,7 +81,9 @@ public class StudentOuterServiceProvider extends ControllerSupport implements St
 		request.setPhoneNumber(req.getPhoneNumber());
 		request.setRemark(req.getRemark());
 		request.setRootOrgId(req.getRootOrgId());
-		request.setStudentCode(req.getStudentCode());
+		List<String> studentCodeList = Lists.newArrayList();
+		studentCodeList.add(req.getStudentCode());
+		request.setStudentCodeList(studentCodeList);
 
 		return processOuterSaveStudentReq(request, req.getPhotoUrl(), req.getOperator());
 	}
@@ -115,8 +117,7 @@ public class StudentOuterServiceProvider extends ControllerSupport implements St
 
 			int lastIndexOf = photoUrl.lastIndexOf(".");
 			if (0 > lastIndexOf) {
-				throw new StatusException("100002",
-						"photoPath is not end with photo file suffix.");
+				throw new StatusException("100002", "photoPath is not end with photo file suffix.");
 			}
 			String fileSuffix = photoUrl.substring(lastIndexOf);
 
@@ -173,7 +174,9 @@ public class StudentOuterServiceProvider extends ControllerSupport implements St
 			request.setPhoneNumber(req.getPhoneNumber());
 			request.setRemark(req.getRemark());
 			request.setRootOrgId(req.getRootOrgId());
-			request.setStudentCode(req.getStudentCode());
+			List<String> studentCodeList = Lists.newArrayList();
+			studentCodeList.add(req.getStudentCode());
+			request.setStudentCodeList(studentCodeList);
 
 			try {
 				OuterSaveStudentResp outerSaveStudentResp = processOuterSaveStudentReq(request,

examcloud-exchange-starter/src/main/java/cn/com/qmth/examcloud/exchange/config/EnterpriseAccessInterceptor.java

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.ThreadContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -180,6 +181,8 @@ public final class EnterpriseAccessInterceptor implements HandlerInterceptor {
 			return false;
 		}
 
+		ThreadContext.put("CALLER", "ACCESS:" + rootOrgIdLong);
+
 		return true;
 	}
 

examcloud-exchange-starter/src/main/resources/sms.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assemblies>
-
-	<assembly>
-		<code>YZM</code>
-		<name>验证码</name>
-		<template>短信模板</template>
-		<ext1>1M</ext1>
-		<ext2>1M</ext2>
-		<ext3>1M</ext3>
-		<ext4>1M</ext4>
-		<ext5>1M</ext5>
-	</assembly>
-
-</assemblies>