...

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

@@ -48,7 +48,6 @@ import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.helpers.DynamicEnum;
 import cn.com.qmth.examcloud.commons.helpers.DynamicEnumManager;
 import cn.com.qmth.examcloud.commons.util.PathUtil;
-import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
 import cn.com.qmth.examcloud.commons.util.RegExpUtil;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.OrgDomain;
 import cn.com.qmth.examcloud.core.basic.base.constants.PropKeys;
@@ -59,6 +58,7 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.OrgPropertyEntity;
 import cn.com.qmth.examcloud.core.basic.dao.enums.OrgProperty;
 import cn.com.qmth.examcloud.core.basic.service.bean.OrgInfo;
 import cn.com.qmth.examcloud.core.basic.service.impl.OrgServiceImpl;
+import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
@@ -882,7 +882,7 @@ public class OrgController extends ControllerSupport {
 
 		validateRootOrgIsolation(orgEntity.getRootId());
 
-		String schoolLogoPath = PropertiesUtil.getString(PropKeys.SCHOOL_LOGO_PATH);
+		String schoolLogoPath = PropertyHolder.getString(PropKeys.SCHOOL_LOGO_PATH);
 		if (StringUtils.isBlank(schoolLogoPath)) {
 			FileUtils.forceMkdir(new File(schoolLogoPath));
 		}

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

@@ -33,7 +33,6 @@ import cn.com.qmth.examcloud.api.commons.exchange.PageInfo;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.helpers.poi.ExcelWriter;
-import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.StudentDomain;
 import cn.com.qmth.examcloud.core.basic.base.constants.BasicConsts;
 import cn.com.qmth.examcloud.core.basic.base.constants.PropKeys;
@@ -46,6 +45,7 @@ import cn.com.qmth.examcloud.core.basic.service.StudentService;
 import cn.com.qmth.examcloud.core.basic.service.bean.StudentInfo;
 import cn.com.qmth.examcloud.task.api.DataSyncCloudService;
 import cn.com.qmth.examcloud.task.api.request.SyncStudentReq;
+import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.config.SystemConfig;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
@@ -144,7 +144,7 @@ public class StudentController extends ControllerSupport {
 
 		List<StudentDomain> studentDomainList = Lists.newArrayList();
 
-		String urlPrefix = PropertiesUtil.getString(PropKeys.STUDENT_PHOTO_URL_PREFIX);
+		String urlPrefix = PropertyHolder.getString(PropKeys.STUDENT_PHOTO_URL_PREFIX);
 		if (StringUtils.isBlank(urlPrefix)) {
 			throw new StatusException("B-560111",
 					"property[$studentPhoto.url.prefix] is not configured");

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

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
 import cn.com.qmth.examcloud.core.basic.api.bean.StudentBean;
 import cn.com.qmth.examcloud.core.basic.api.request.GetStudentReq;
@@ -28,6 +27,7 @@ import cn.com.qmth.examcloud.core.basic.dao.entity.OrgEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 import cn.com.qmth.examcloud.core.basic.service.StudentService;
 import cn.com.qmth.examcloud.core.basic.service.bean.StudentInfo;
+import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
@@ -143,7 +143,7 @@ public class StudentCloudServiceProvider extends ControllerSupport implements St
 		}
 		studentBean.setPhoneNumber(student.getPhoneNumber());
 		if (null != student.getPhotoPath()) {
-			String urlPrefix = PropertiesUtil.getString(PropKeys.STUDENT_PHOTO_URL_PREFIX);
+			String urlPrefix = PropertyHolder.getString(PropKeys.STUDENT_PHOTO_URL_PREFIX);
 			if (StringUtils.isBlank(urlPrefix)) {
 				throw new StatusException("B-560111",
 						"property[$studentPhoto.url.prefix] is not configured");

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/AuthServiceImpl.java

@@ -47,6 +47,7 @@ import cn.com.qmth.examcloud.core.basic.service.SmsCodeService;
 import cn.com.qmth.examcloud.core.basic.service.SysConfigService;
 import cn.com.qmth.examcloud.core.basic.service.UserService;
 import cn.com.qmth.examcloud.core.basic.service.bean.LoginInfo;
+import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 
@@ -274,7 +275,7 @@ public class AuthServiceImpl implements AuthService {
 			user.setRoleList(roleList);
 		}
 
-		Boolean smsCodeEnable = PropertiesUtil.getBoolean("$login.admin.smsCode.enable", true);
+		Boolean smsCodeEnable = PropertyHolder.getBoolean("$login.admin.smsCode.enable", true);
 		if (smsCodeEnable) {
 			// 超级管理员短信验证
 			if (isSuperAdmin(user)) {
@@ -502,7 +503,7 @@ public class AuthServiceImpl implements AuthService {
 
 	@Override
 	public User getLoginUser(String key, String token) {
-		int sessionTimeout = PropertiesUtil.getInt(PropKeys.SESSION_TIMEOUT, 3600);
+		int sessionTimeout = PropertyHolder.getInt(PropKeys.SESSION_TIMEOUT, 3600);
 		User user = redisClient.get(key, User.class, sessionTimeout);
 		if (null == user) {
 			throw new StatusException("B-001012", "未登录");
@@ -590,7 +591,7 @@ public class AuthServiceImpl implements AuthService {
 		String key = buildUserKey(user);
 		user.setKey(key);
 
-		int sessionTimeout = PropertiesUtil.getInt(PropKeys.SESSION_TIMEOUT, 3600);
+		int sessionTimeout = PropertyHolder.getInt(PropKeys.SESSION_TIMEOUT, 3600);
 		Integer sessionTimeoutCache = redisClient.get("$_SESSION_TIMEOUT", Integer.class);
 		if (null == sessionTimeoutCache || (int) sessionTimeoutCache != sessionTimeout) {
 			redisClient.set("$_SESSION_TIMEOUT", sessionTimeout);

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/SmsCodeServiceImpl.java

@@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
 import cn.com.qmth.examcloud.core.basic.base.constants.PropKeys;
 import cn.com.qmth.examcloud.core.basic.service.SmsCodeService;
 import cn.com.qmth.examcloud.exchange.inner.api.SendSmsCloudService;
 import cn.com.qmth.examcloud.exchange.inner.api.request.CheckSmsCodeReq;
 import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
 import cn.com.qmth.examcloud.exchange.inner.api.response.CheckIdentifyingCodeResp;
+import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 
 @Service
 public class SmsCodeServiceImpl implements SmsCodeService {
@@ -27,13 +27,13 @@ public class SmsCodeServiceImpl implements SmsCodeService {
 		int code = 1000 + RandomUtils.nextInt(1, 8999);
 		req.setCode(String.valueOf(code));
 
-		int smsEffectivetime = PropertiesUtil.getInt(PropKeys.SEND_VERIFICATION_CODE_EFFECTIVE_TIME,
+		int smsEffectivetime = PropertyHolder.getInt(PropKeys.SEND_VERIFICATION_CODE_EFFECTIVE_TIME,
 				120);
-		int smsIntervalSeconds = PropertiesUtil
+		int smsIntervalSeconds = PropertyHolder
 				.getInt(PropKeys.SEND_VERIFICATION_CODE_INTERVAL_SECONDS, 60);
 
-		String smsSign = PropertiesUtil.getString(PropKeys.SEND_VERIFICATION_CODE_SIGN);
-		String smsTemplatecode = PropertiesUtil
+		String smsSign = PropertyHolder.getString(PropKeys.SEND_VERIFICATION_CODE_SIGN);
+		String smsTemplatecode = PropertyHolder
 				.getString(PropKeys.SEND_VERIFICATION_CODE_TEMPLATE_CODE);
 
 		if (StringUtils.isBlank(smsSign)) {

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/StudentServiceImpl.java

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 import com.google.common.collect.Lists;
 
 import cn.com.qmth.examcloud.commons.exception.StatusException;
-import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
 import cn.com.qmth.examcloud.commons.util.UrlUtil;
 import cn.com.qmth.examcloud.core.basic.base.constants.BasicConsts;
 import cn.com.qmth.examcloud.core.basic.base.constants.PropKeys;
@@ -25,6 +24,7 @@ import cn.com.qmth.examcloud.core.basic.service.UserService;
 import cn.com.qmth.examcloud.core.basic.service.bean.StudentInfo;
 import cn.com.qmth.examcloud.task.api.DataSyncCloudService;
 import cn.com.qmth.examcloud.task.api.request.SyncStudentReq;
+import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 
 /**
@@ -256,7 +256,7 @@ public class StudentServiceImpl implements StudentService {
 		info.setPhoneNumber(s.getPhoneNumber());
 
 		if (StringUtils.isNotBlank(s.getPhotoPath())) {
-			String basePath = PropertiesUtil.getString(PropKeys.STUDENT_PHOTO_URL_PREFIX);
+			String basePath = PropertyHolder.getString(PropKeys.STUDENT_PHOTO_URL_PREFIX);
 			if (StringUtils.isBlank(basePath)) {
 				throw new StatusException("B-160212", "照片根路径未配置");
 			}