Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-core-basic.git

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/OrgController.java

@@ -620,7 +620,7 @@ public class OrgController extends ControllerSupport {
 		validateRootOrgIsolation(orgEntity.getRootId());
 
 		String key = "propertyGroup." + propertyGroupId;
-		String redisKey = "PROPERTIES_BY_GROUP:" + key;
+		String redisKey = "PROPERTIES_BY_GROUP:" + orgId + ":" + key;
 		@SuppressWarnings("unchecked")
 		Map<String, String> properties = redisClient.get(redisKey, Map.class);
 		if (null != properties) {

examcloud-core-basic-starter/src/main/resources/org-properties.xml

@@ -24,5 +24,28 @@
 		<desc>机构图标URL</desc>
 		<valueType>STRING</valueType>
 	</enum>
-
+	<enum>
+		<id>5</id>
+		<name>LOGIN_TYPE</name>
+		<desc>登录方式</desc>
+		<valueType>STRING</valueType>
+	</enum>
+	<enum>
+		<id>6</id>
+		<name>PREVENT_CHEATING_CONFIG</name>
+		<desc>防作弊配置</desc>
+		<valueType>STRING</valueType>
+	</enum>
+	<enum>
+		<id>7</id>
+		<name>STUDENT_CLIENT_DEFAULT_SIZE</name>
+		<desc>考生端默认大小(长*宽)</desc>
+		<valueType>STRING</valueType>
+	</enum>
+	<enum>
+		<id>8</id>
+		<name>STUDENT_CLIENT_CONSOLE_CONFIG</name>
+		<desc><控制台配置></控制台配置></desc>
+		<valueType>STRING</valueType>
+	</enum>
 </enums>