...

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

@@ -32,9 +32,9 @@ import com.google.common.collect.Lists;
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.core.basic.base.constants.BasicConsts;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
-import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
 import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 import cn.com.qmth.examcloud.core.basic.service.bean.StudentInfo;
 import cn.com.qmth.examcloud.core.basic.service.impl.StudentServiceImpl;
@@ -201,7 +201,7 @@ public class StudentController extends ControllerSupport {
 					&& identityNumber.matches("[0-9a-zA-Z]{6,}")) {
 				s.setPassword(StringUtils.substring(identityNumber, -6, identityNumber.length()));
 			} else {
-				s.setPassword(Consts.DEFAULT_PASSWORD);
+				s.setPassword(BasicConsts.DEFAULT_PASSWORD);
 			}
 			studentRepo.save(s);
 		}

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

@@ -43,12 +43,12 @@ import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.UserDomain;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.UserFormDomain;
+import cn.com.qmth.examcloud.core.basic.base.constants.BasicConsts;
 import cn.com.qmth.examcloud.core.basic.base.enums.AccountType;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.RoleRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRoleRelationRepo;
-import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
@@ -389,7 +389,7 @@ public class UserController extends ControllerSupport {
 				throw new StatusException("B-150410", "超级管理员账号不允许修改");
 			}
 			UserEntity user = userRepo.findOne(userId);
-			user.setPassword(Consts.DEFAULT_PASSWORD);
+			user.setPassword(BasicConsts.DEFAULT_PASSWORD);
 			userRepo.save(user);
 		}
 	}

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

@@ -23,11 +23,11 @@ import cn.com.qmth.examcloud.core.basic.api.request.AddUserReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserReq;
 import cn.com.qmth.examcloud.core.basic.api.response.AddUserResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserResp;
+import cn.com.qmth.examcloud.core.basic.base.constants.BasicConsts;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.RoleRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRoleRelationRepo;
-import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
@@ -81,7 +81,7 @@ public class UserCloudServiceProvider extends ControllerSupport implements UserC
 		userEntity.setRootOrgId(rootOrgId);
 		userEntity.setName(name);
 		if (StringUtils.isBlank(req.getPassword())) {
-			userEntity.setPassword(Consts.DEFAULT_PASSWORD);
+			userEntity.setPassword(BasicConsts.DEFAULT_PASSWORD);
 		} else {
 			userEntity.setPassword(req.getPassword());
 		}

examcloud-core-basic-base/src/main/java/cn/com/qmth/examcloud/core/basic/base/constants/BasicConsts.java

@@ -7,11 +7,16 @@ package cn.com.qmth.examcloud.core.basic.base.constants;
  * @date 2018年6月20日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class BasicConsts {
+public interface BasicConsts {
 
 	/**
 	 * 根虚拟权限ID
 	 */
-	public static final Long ROOT_PRIVILEGE_ID = -1L;
+	Long ROOT_PRIVILEGE_ID = -1L;
+
+	/**
+	 * 默认密码
+	 */
+	String DEFAULT_PASSWORD = "123456";
 
 }

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/constants/Consts.java

@@ -1,9 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao.constants;
-
-/**
- * 用户相关常量
- * Created by songyue on 17/2/22.
- */
-public final class Consts {
-    public static final String DEFAULT_PASSWORD = "123456";
-}

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

@@ -25,12 +25,12 @@ import cn.com.qmth.examcloud.commons.base.util.excel.ExcelError;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReader;
 import cn.com.qmth.examcloud.commons.base.util.excel.ExcelReaderHandle;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
+import cn.com.qmth.examcloud.core.basic.base.constants.BasicConsts;
 import cn.com.qmth.examcloud.core.basic.dao.ExamSiteRepo;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.RoleRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRoleRelationRepo;
-import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
 import cn.com.qmth.examcloud.core.basic.dao.entity.ExamSite;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity;
@@ -124,7 +124,7 @@ public class OrgService {
 		user.setName(org.getContacts());
 		user.setPhoneNumber(org.getTelphone());
 		user.setEnable(true);
-		user.setPassword(Consts.DEFAULT_PASSWORD);
+		user.setPassword(BasicConsts.DEFAULT_PASSWORD);
 		UserEntity saved = userRepo.save(user);
 		List<UserRoleRelationEntity> userRoles = Lists.newArrayList();
 		RoleEntity role = roleRepo.findByCode(RoleMeta.LC_USER.name());

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

@@ -16,11 +16,11 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;
+import cn.com.qmth.examcloud.core.basic.base.constants.BasicConsts;
 import cn.com.qmth.examcloud.core.basic.base.constants.PropKeys;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
-import cn.com.qmth.examcloud.core.basic.dao.constants.Consts;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Org;
 import cn.com.qmth.examcloud.core.basic.dao.entity.StudentEntity;
 import cn.com.qmth.examcloud.core.basic.dao.enums.OrgType;
@@ -181,7 +181,7 @@ public class StudentServiceImpl implements StudentService {
 				student.setPassword(
 						StringUtils.substring(identityNumber, -6, identityNumber.length()));
 			} else {
-				student.setPassword(Consts.DEFAULT_PASSWORD);
+				student.setPassword(BasicConsts.DEFAULT_PASSWORD);
 			}
 		}