Merge remote-tracking branch 'origin/master'

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/controller/ExamController.java

@@ -805,7 +805,7 @@ public class ExamController extends ControllerSupport {
 		GetOrgResp getOrgResp = orgCloudService.getOrg(getOrgReq);
 		validateRootOrgIsolation(getOrgResp.getOrg().getRootId());
 
-		return examService.getOrgProperty(examId, orgId, key);
+		return examService.getExamOrgProperty(examId, orgId, key);
 	}
 
 	@ApiOperation(value = "启用考试", notes = "启用考试")

examcloud-core-examwork-api-provider/src/main/java/cn/com/qmth/examcloud/core/examwork/api/provider/ExamCloudServiceProvider.java

@@ -273,7 +273,7 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 		Long orgId = req.getOrgId();
 		String key = req.getKey();
 
-		String value = examService.getOrgProperty(examId, orgId, key);
+		String value = examService.getExamOrgProperty(examId, orgId, key);
 
 		GetExamPropertyResp resp = new GetExamPropertyResp();
 		resp.setValue(value);
@@ -290,7 +290,7 @@ public class ExamCloudServiceProvider extends ControllerSupport implements ExamC
 		List<String> keys = req.getKeys();
 		Map<String, String> properties = Maps.newHashMap();
 		for (String key : keys) {
-			String value = examService.getOrgProperty(examId, orgId, key);
+			String value = examService.getExamOrgProperty(examId, orgId, key);
 			properties.put(key, value);
 		}
 

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/ExamService.java

@@ -46,7 +46,7 @@ public interface ExamService {
 	 * @param key
 	 * @return
 	 */
-	String getOrgProperty(Long examId, Long orgId, String key);
+	String getExamOrgProperty(Long examId, Long orgId, String key);
 
 	/**
 	 * 导入学习中心设置

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/cache/ExamOrgPropertyCache.java

@@ -19,7 +19,7 @@ public class ExamOrgPropertyCache extends RandomObjectRedisCache<ExamOrgProperty
 		Long orgId = (Long) keys[1];
 		String key = (String) keys[2];
 
-		String value = examService.getOrgProperty(examId, orgId, key);
+		String value = examService.getExamOrgProperty(examId, orgId, key);
 
 		ExamOrgPropertyCacheBean b = new ExamOrgPropertyCacheBean();
 		b.setExamId(examId);

examcloud-core-examwork-service/src/main/java/cn/com/qmth/examcloud/core/examwork/service/impl/ExamServiceImpl.java

@@ -454,7 +454,7 @@ public class ExamServiceImpl implements ExamService {
 	}
 
 	@Override
-	public String getOrgProperty(Long examId, Long orgId, String key) {
+	public String getExamOrgProperty(Long examId, Long orgId, String key) {
 		DynamicEnumManager manager = ExamProperty.getDynamicEnumManager();
 		DynamicEnum de = manager.getByName(key);