...

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

@@ -472,7 +472,7 @@ public class UserController extends ControllerSupport {
 		}
 
 		LoginInfo loginInfo = new LoginInfo();
-		loginInfo.setAccountType(AccountType.COMMON_LOGIN_NAME.getCode());
+		loginInfo.setAccountType(AccountType.COMMON_LOGIN_NAME.name());
 		loginInfo.setAccountValue(user.getLoginName());
 		loginInfo.setPassword(user.getPassword());
 		loginInfo.setRootOrgId(String.valueOf(user.getRootOrgId()));
@@ -496,7 +496,7 @@ public class UserController extends ControllerSupport {
 		}
 
 		LoginInfo loginInfo = new LoginInfo();
-		loginInfo.setAccountType(AccountType.COMMON_LOGIN_NAME.getCode());
+		loginInfo.setAccountType(AccountType.COMMON_LOGIN_NAME.name());
 		loginInfo.setAccountValue(user.getLoginName());
 		loginInfo.setPassword(user.getPassword());
 		loginInfo.setRootOrgId(String.valueOf(user.getRootOrgId()));

examcloud-core-basic-base/src/main/java/cn/com/qmth/examcloud/core/basic/base/enums/AccountType.java

@@ -12,35 +12,30 @@ public enum AccountType {
 	/**
 	 * 学生学号
 	 */
-	STUDENT_CODE("STUDENT_CODE", "学生学号"),
+	STUDENT_CODE("学生学号"),
 
 	/**
 	 * 学生手机号
 	 */
-	STUDENT_PHONE_NUMBER("STUDENT_PHONE_NUMBER", "学生手机号"),
+	STUDENT_PHONE_NUMBER("学生手机号"),
 
 	/**
 	 * 学生身份证号
 	 */
-	STUDENT_IDENTITY_NUMBER("STUDENT_IDENTITY_NUMBER", "学生身份证号"),
+	STUDENT_IDENTITY_NUMBER("学生身份证号"),
 
 	/**
 	 * 学生手机号登录
 	 */
-	STUDENT_PHONE("STUDENT_PHONE", "学生手机号"),
+	STUDENT_PHONE("学生手机号"),
 
 	/**
 	 * 常规登录名（非学生登录）
 	 */
-	COMMON_LOGIN_NAME("COMMON_LOGIN_NAME", "常规登录名");
+	COMMON_LOGIN_NAME("常规登录名");
 
 	// ===========================================================================
 
-	/**
-	 * 码
-	 */
-	private String code;
-
 	/**
 	 * 描述
 	 */
@@ -49,21 +44,12 @@ public enum AccountType {
 	/**
 	 * 构造函数
 	 *
-	 * @param code
 	 * @param desc
 	 */
-	private AccountType(String code, String desc) {
-		this.code = code;
+	private AccountType(String desc) {
 		this.desc = desc;
 	}
 
-	/**
-	 * @return the code
-	 */
-	public String getCode() {
-		return code;
-	}
-
 	/**
 	 * @return the desc
 	 */

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

@@ -79,7 +79,7 @@ public class AuthServiceImpl implements AuthService {
 	public User login(LoginInfo loginInfo) {
 
 		String accountType = loginInfo.getAccountType();
-		if (AccountType.COMMON_LOGIN_NAME.getCode().equals(accountType)) {
+		if (AccountType.STUDENT_PHONE.name().equals(accountType)) {
 
 		}
 
@@ -110,7 +110,7 @@ public class AuthServiceImpl implements AuthService {
 		User user = new User();
 
 		// 常规账户登录
-		if (AccountType.COMMON_LOGIN_NAME.getCode().equals(accountType)) {
+		if (AccountType.COMMON_LOGIN_NAME.name().equals(accountType)) {
 			UserEntity userEntity = userRepo.findByRootOrgIdAndLoginName(Long.parseLong(rootOrgId),
 					accountValue);
 			if (null == userEntity) {
@@ -135,11 +135,11 @@ public class AuthServiceImpl implements AuthService {
 		} else {
 			Student student = null;
 			// 学生学号登录
-			if (AccountType.STUDENT_CODE.getCode().equals(accountType)) {
+			if (AccountType.STUDENT_CODE.name().equals(accountType)) {
 				student = studentRepo.findByStudentCodeAndRootOrgId(accountValue, rootOrg.getId());
 			}
 			// 学生身份证号登录
-			else if (AccountType.STUDENT_IDENTITY_NUMBER.getCode().equals(accountType)) {
+			else if (AccountType.STUDENT_IDENTITY_NUMBER.name().equals(accountType)) {
 				student = studentRepo.findByIdentityNumberAndRootOrgId(accountValue,
 						rootOrg.getId());
 			}