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

examcloud-core-basic-starter/src/main/java/cn/com/qmth/examcloud/core/basic/starter/CoreBasicApp.java

@@ -12,6 +12,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import cn.com.qmth.examcloud.core.basic.dao.enums.OrgProperty;
 import cn.com.qmth.examcloud.core.basic.service.cache.AppCache;
 import cn.com.qmth.examcloud.web.bootstrap.AppBootstrap;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
@@ -23,9 +24,9 @@ import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 @EnableTransactionManagement
 @EnableEurekaClient
 @EnableDiscoveryClient
-@ComponentScan(basePackages = {"cn.com.qmth"})
-@EntityScan(basePackages = {"cn.com.qmth"})
-@EnableJpaRepositories(basePackages = {"cn.com.qmth"})
+@ComponentScan(basePackages = { "cn.com.qmth" })
+@EntityScan(basePackages = { "cn.com.qmth" })
+@EnableJpaRepositories(basePackages = { "cn.com.qmth" })
 public class CoreBasicApp {
 
 	static {
@@ -34,6 +35,8 @@ public class CoreBasicApp {
 			System.setProperty("log.commonLevel", "DEBUG");
 		}
 		System.setProperty("hibernate.dialect.storage_engine", "innodb");
+
+		OrgProperty.init();
 	}
 
 	/**

examcloud-core-basic-starter/src/main/resources/security.properties

@@ -1,10 +1,11 @@
-[${$rmp.ctr.basic}/org][rootOrgPage/{curPage}/{pageSize}][GET]=;XXOO
-[${$rmp.ctr.basic}/user][all/{curPage}/{pageSize}][GET]=user,index_user;XXOO
- 
-[s][${$rmp.ctr.basic}/student][getStudentInfoBySession][GET]=true
-[s][${$rmp.ctr.basic}/student][password][PUT]=true
-[s][${$rmp.ctr.basic}/auth][/sendVerificationCode][POST]=true
-[s][${$rmp.ctr.basic}/auth][/bindSecurityPhone][POST]=true
-[s][${$rmp.ctr.basic}/log][studentClient/{level}/{code}][POST]=true
-[s][${$rmp.ctr.basic}/student][password/direct][PUT]=true
-[s][${$rmp.ctr.basic}/auth][/sendVerificationCode][POST]=true
+[${$rmp.ctr.basic}/org][rootOrgPage/{curPage}/{pageSize}][GET]=;XXOO
+[${$rmp.ctr.basic}/user][all/{curPage}/{pageSize}][GET]=user,index_user;XXOO
+ 
+[s][${$rmp.ctr.basic}/student][getStudentInfoBySession][GET]=true
+[s][${$rmp.ctr.basic}/student][password][PUT]=true
+[s][${$rmp.ctr.basic}/auth][/sendVerificationCode][POST]=true
+[s][${$rmp.ctr.basic}/auth][/bindSecurityPhone][POST]=true
+[s][${$rmp.ctr.basic}/log][studentClient/{level}/{code}][POST]=true
+[s][${$rmp.ctr.basic}/student][password/direct][PUT]=true
+[s][${$rmp.ctr.basic}/auth][/sendVerificationCode][POST]=true
+[s][${$rmp.ctr.basic}/org][propertyNoSession/{key}][GET]=true