...

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

@@ -8,7 +8,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.transaction.Transactional;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -20,6 +19,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -43,15 +43,15 @@ import cn.com.qmth.examcloud.commons.web.security.enums.UacPolicy;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.FullUserInfo;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.UserForm;
-import cn.com.qmth.examcloud.core.basic.base.enums.UserType;
 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;
-import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRoleRelationEntity;
 import cn.com.qmth.examcloud.core.basic.service.bean.UserInfo;
 import cn.com.qmth.examcloud.core.basic.service.impl.UserServiceImpl;
 import io.swagger.annotations.ApiOperation;
@@ -76,6 +76,9 @@ public class UserController extends ControllerSupport {
 	@Autowired
 	RoleRepo roleRepo;
 
+	@Autowired
+	UserRoleRelationRepo userRoleRelationRepo;
+
 	/**
 	 * 重新定义
 	 *
@@ -154,11 +157,12 @@ public class UserController extends ControllerSupport {
 			bean.setRootOrgName(rootOrg.getName());
 			bean.setEnable(next.getEnable());
 
-			List<UserRole> userRoles = next.getUserRoles();
+			List<UserRoleRelationEntity> relationList = userRoleRelationRepo
+					.findAllByUserId(next.getId());
 			List<String> roleNameList = Lists.newArrayList();
 			List<Long> roleIdList = Lists.newArrayList();
 			List<String> roleCodeList = Lists.newArrayList();
-			for (UserRole cur : userRoles) {
+			for (UserRoleRelationEntity cur : relationList) {
 				RoleEntity curRoleEntity = roleRepo.findByCode(cur.getRoleCode());
 				if (null == curRoleEntity) {
 					throw new StatusException("B-150002", "角色错误");
@@ -275,8 +279,7 @@ public class UserController extends ControllerSupport {
 		userEntity.setPassword(userForm.getPassword());
 		userEntity.setUpdateTime(new Date());
 
-		List<UserRole> userRoles = Lists.newArrayList();
-
+		List<UserRoleRelationEntity> userRoles = Lists.newArrayList();
 		List<Long> roleIds = userForm.getRoleIds();
 		for (Long cur : roleIds) {
 			RoleEntity curRoleEntity = roleRepo.findOne(cur);
@@ -286,11 +289,13 @@ public class UserController extends ControllerSupport {
 			if (curRoleEntity.getCode().equals(RoleMeta.SUPER_ADMIN.getCode())) {
 				throw new StatusException("B-150007", "不允许新增或修改超级管理员");
 			}
-			UserRole userRole = new UserRole(curRoleEntity.getCode());
-			userRoles.add(userRole);
+			UserRoleRelationEntity relation = new UserRoleRelationEntity(userEntity.getId(),
+					curRoleEntity.getId(), curRoleEntity.getCode());
+			userRoles.add(relation);
 		}
-		userEntity.setUserRoles(userRoles);
 
+		userRoleRelationRepo.deleteByUserId(userEntity.getId());
+		userRoleRelationRepo.save(userRoles);
 		UserEntity saved = userService.save(userEntity);
 
 		return saved.getId();
@@ -348,7 +353,6 @@ public class UserController extends ControllerSupport {
 
 	@ApiOperation(value = "修改用户密码", notes = "修改密码")
 	@PutMapping("/stu-password")
-	@Uac(roles = {RoleMeta.STUDENT}, policy = UacPolicy.IN)
 	public ResponseEntity stuPassword(@RequestParam("oldPassword") String oldPassword,
 			@RequestParam("newPassword") String newPassword, HttpServletRequest request) {
 		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
@@ -436,15 +440,6 @@ public class UserController extends ControllerSupport {
 		return new ResponseEntity(userService.getMarker(accessUser.getRootOrgId()), HttpStatus.OK);
 	}
 
-	@ApiOperation(value = "新增评卷员", notes = "新增")
-	@PostMapping("/marker")
-	public ResponseEntity saveMarker(@RequestParam String loginName, @RequestParam String name,
-			HttpServletRequest request) {
-		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
-		return new ResponseEntity(
-				userService.saveMarker(accessUser.getRootOrgId(), loginName, name), HttpStatus.OK);
-	}
-
 	@ApiOperation(value = "查询评卷员带分页", notes = "查询评卷员带分页")
 	@GetMapping("/all/marker/{curPage}/{pageSize}")
 	public ResponseEntity getAllMark(@ModelAttribute UserEntity user, @PathVariable Integer curPage,

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

@@ -0,0 +1,29 @@
+package cn.com.qmth.examcloud.core.basic.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.query.QueryByExampleExecutor;
+
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRoleRelationEntity;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRoleRelationPK;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年7月11日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface UserRoleRelationRepo
+		extends
+			JpaRepository<UserRoleRelationEntity, UserRoleRelationPK>,
+			QueryByExampleExecutor<UserRoleRelationEntity>,
+			JpaSpecificationExecutor<UserRoleRelationEntity> {
+
+	List<UserRoleRelationEntity> findAllByUserId(Long userId);
+
+	void deleteByUserId(Long userId);
+
+}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserEntity.java

@@ -1,15 +1,10 @@
 package cn.com.qmth.examcloud.core.basic.dao.entity;
 
-import java.util.List;
-
-import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
@@ -52,10 +47,6 @@ public class UserEntity extends JpaEntity {
 	@NotNull
 	private Boolean enable;
 
-	@OneToMany(cascade = {CascadeType.ALL})
-	@JoinColumn(name = "user_id")
-	private List<UserRole> userRoles;
-
 	public Long getId() {
 		return id;
 	}
@@ -136,20 +127,4 @@ public class UserEntity extends JpaEntity {
 		this.enable = enable;
 	}
 
-	public List<UserRole> getUserRoles() {
-		return userRoles;
-	}
-
-	public void setUserRoles(List<UserRole> userRoles) {
-		this.userRoles = userRoles;
-	}
-
-	public UserEntity() {
-	}
-
-	public UserEntity(String name, Long rootOrgId, Long orgId) {
-		this.name = name;
-		this.rootOrgId = rootOrgId;
-		this.orgId = orgId;
-	}
 }

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserRoleRelationEntity.java

@@ -21,21 +21,34 @@ public class UserRoleRelationEntity extends JpaEntity {
 
 	private static final long serialVersionUID = 5623631699393069659L;
 
-	@Id
-	private String userType;
-
 	@Id
 	private Long userId;
 
 	@Id
 	private Long roleId;
 
-	public String getUserType() {
-		return userType;
+	private String roleCode;
+
+	/**
+	 * 构造函数
+	 *
+	 */
+	public UserRoleRelationEntity() {
+		super();
 	}
 
-	public void setUserType(String userType) {
-		this.userType = userType;
+	/**
+	 * 构造函数
+	 *
+	 * @param userId
+	 * @param roleId
+	 * @param roleCode
+	 */
+	public UserRoleRelationEntity(Long userId, Long roleId, String roleCode) {
+		super();
+		this.userId = userId;
+		this.roleId = roleId;
+		this.roleCode = roleCode;
 	}
 
 	public Long getUserId() {
@@ -54,4 +67,12 @@ public class UserRoleRelationEntity extends JpaEntity {
 		this.roleId = roleId;
 	}
 
+	public String getRoleCode() {
+		return roleCode;
+	}
+
+	public void setRoleCode(String roleCode) {
+		this.roleCode = roleCode;
+	}
+
 }

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserRoleRelationPK.java

@@ -13,20 +13,10 @@ public class UserRoleRelationPK implements Serializable {
 
 	private static final long serialVersionUID = -4635275019235356564L;
 
-	private String userType;
-
 	private Long userId;
 
 	private Long roleId;
 
-	public String getUserType() {
-		return userType;
-	}
-
-	public void setUserType(String userType) {
-		this.userType = userType;
-	}
-
 	public Long getUserId() {
 		return userId;
 	}

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

@@ -21,7 +21,6 @@ import cn.com.qmth.examcloud.commons.base.util.UUID;
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.commons.web.security.bean.Role;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
 import cn.com.qmth.examcloud.core.basic.base.constants.PropKeys;
 import cn.com.qmth.examcloud.core.basic.base.enums.AccountType;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
@@ -29,12 +28,14 @@ import cn.com.qmth.examcloud.core.basic.dao.RoleRepo;
 import cn.com.qmth.examcloud.core.basic.dao.StudentRepo;
 import cn.com.qmth.examcloud.core.basic.dao.ThirdPartyAccessRepo;
 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.entity.Org;
+import cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Student;
 import cn.com.qmth.examcloud.core.basic.dao.entity.ThirdPartyAccessEntity;
 import cn.com.qmth.examcloud.core.basic.dao.entity.ThirdPartyAccessPK;
 import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
-import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
+import cn.com.qmth.examcloud.core.basic.dao.entity.UserRoleRelationEntity;
 import cn.com.qmth.examcloud.core.basic.service.AuthService;
 import cn.com.qmth.examcloud.core.basic.service.UserService;
 import cn.com.qmth.examcloud.core.basic.service.bean.LoginInfo;
@@ -70,6 +71,9 @@ public class AuthServiceImpl implements AuthService {
 	@Autowired
 	ThirdPartyAccessRepo thirdPartyAccessRepo;
 
+	@Autowired
+	UserRoleRelationRepo userRoleRelationRepo;
+
 	@Override
 	public User login(LoginInfo loginInfo) {
 
@@ -119,8 +123,7 @@ public class AuthServiceImpl implements AuthService {
 			user.setRootOrgName(rootOrg.getName());
 			user.setOrgId(userEntity.getOrgId());
 
-			List<UserRole> userRoles = userEntity.getUserRoles();
-			List<Role> roleList = getRoles(userRoles);
+			List<Role> roleList = getUserRoles(userEntity.getId());
 			user.setRoleList(roleList);
 		} else {
 			Student student = null;
@@ -154,13 +157,10 @@ public class AuthServiceImpl implements AuthService {
 			user.setOrgId(student.getOrgId());
 			user.setDisplayName(student.getName());
 
-			List<UserRole> roleList = Lists.newArrayList();
-			UserRole userRole = new UserRole();
-			userRole.setRoleCode(RoleMeta.STUDENT.name());
-			roleList.add(userRole);
-
-			List<Role> roles = getRoles(roleList);
-			user.setRoleList(roles);
+			List<Role> roleList = Lists.newArrayList();
+			Role role = new Role(8L, "STUDENT", "学生");
+			roleList.add(role);
+			user.setRoleList(roleList);
 		}
 
 		if (null != user.getOrgId()) {
@@ -267,8 +267,7 @@ public class AuthServiceImpl implements AuthService {
 			user.setOrgName(org.getName());
 		}
 
-		List<UserRole> userRoles = userEntity.getUserRoles();
-		List<Role> roleList = getRoles(userRoles);
+		List<Role> roleList = getUserRoles(userEntity.getId());
 		user.setRoleList(roleList);
 
 		setSession(user);
@@ -303,16 +302,16 @@ public class AuthServiceImpl implements AuthService {
 	 * 获取角色集合
 	 *
 	 * @author WANGWEI
-	 * @param userRoles
+	 * @param userId
 	 * @return
 	 */
-	private List<Role> getRoles(List<UserRole> userRoles) {
+	private List<Role> getUserRoles(Long userId) {
+		List<UserRoleRelationEntity> relationList = userRoleRelationRepo.findAllByUserId(userId);
 		List<Role> roleList = Lists.newArrayList();
-		if (CollectionUtils.isNotEmpty(userRoles)) {
-			for (UserRole cur : userRoles) {
+		if (CollectionUtils.isNotEmpty(relationList)) {
+			for (UserRoleRelationEntity cur : relationList) {
 				String roleCode = cur.getRoleCode();
-				cn.com.qmth.examcloud.core.basic.dao.entity.RoleEntity roleEntity = roleRepo
-						.findByCode(roleCode);
+				RoleEntity roleEntity = roleRepo.findByCode(roleCode);
 				if (null == roleEntity) {
 					throw new StatusException("B-002002",
 							"role code is wrong. roleCode=" + roleCode);

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

@@ -13,81 +13,75 @@ import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
 import cn.com.qmth.examcloud.core.basic.dao.UserRoleRepo;
 
 /**
- * 用户角色服务类
- * Created by songyue on 17/2/22.
+ * 用户角色服务类 Created by songyue on 17/2/22.
  */
 @Service
-public class UserRoleService{
+public class UserRoleService {
 
-    @Autowired
-    UserRoleRepo userRoleRepo;
+	@Autowired
+	UserRoleRepo userRoleRepo;
 
+	/**
+	 * 获取全部角色
+	 * 
+	 * @return
+	 */
+	public List<Role> findAllRoles() {
+		return RolesService.ROLE_LIST;
+	}
 
-    /**
-     * 获取全部角色
-     * @return
-     */
-    public List<Role> findAllRoles(){
-        return RolesService.ROLE_LIST;
-    }
+	public List<Role> findMarkerRoles() {
+		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
+		tempRoles = tempRoles.stream().filter(role -> role.getCode().equals(RoleMeta.MARKER.name()))
+				.collect(Collectors.toList());
+		return tempRoles;
+	}
 
-    public List<Role> findMarkerRoles(){
-        List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-        tempRoles = tempRoles.stream()
-                .filter(role -> role.getCode().equals(RoleMeta.MARKER.name()))
-                .collect(Collectors.toList());
-        return tempRoles;
-    }
-    
-    public List<Role> findNonMarkerRoles(){
-        List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-        tempRoles = tempRoles.stream()
-                .filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.STUDENT.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.SALES_MANAGER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.IMPLEMENTERS_MANAGER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.PROJECT_MANAGER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.PRINT_MANAGER.name()))
-                .collect(Collectors.toList());
-        return tempRoles;
-    }
+	public List<Role> findNonMarkerRoles() {
+		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
+		tempRoles = tempRoles.stream()
+				.filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.SALES_MANAGER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.IMPLEMENTERS_MANAGER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.PROJECT_MANAGER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.PRINT_MANAGER.name()))
+				.collect(Collectors.toList());
+		return tempRoles;
+	}
 
-    public List<Role> findAdminRoles(){
-        List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-        tempRoles = tempRoles.stream()
-                .filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.STUDENT.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.LC_USER.name()))
-                .collect(Collectors.toList());
-        return tempRoles;
-    }
-    
-    public List<Role> findQmthRoles(){
-        List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-        tempRoles = tempRoles.stream()
-                .filter(role -> !role.getCode().equals(RoleMeta.LC_USER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.MARKING_ADMIN.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.QUESTION_ADMIN.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.STUDENT.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.OE_ADMIN.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.PRINT_MANAGER.name()))
-                .collect(Collectors.toList());
-        return tempRoles;
-    }
-    
-    public List<Role> findSchoolRoles(){
-    	List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-        tempRoles = tempRoles.stream()
-                .filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.STUDENT.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.LC_USER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.SALES_MANAGER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.IMPLEMENTERS_MANAGER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.PROJECT_MANAGER.name()))
-                .filter(role -> !role.getCode().equals(RoleMeta.PRINT_MANAGER.name()))
-                .collect(Collectors.toList());
-        return tempRoles;
-    }
+	public List<Role> findAdminRoles() {
+		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
+		tempRoles = tempRoles.stream()
+				.filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.LC_USER.name()))
+				.collect(Collectors.toList());
+		return tempRoles;
+	}
+
+	public List<Role> findQmthRoles() {
+		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
+		tempRoles = tempRoles.stream()
+				.filter(role -> !role.getCode().equals(RoleMeta.LC_USER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.MARKING_ADMIN.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.QUESTION_ADMIN.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.OE_ADMIN.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.PRINT_MANAGER.name()))
+				.collect(Collectors.toList());
+		return tempRoles;
+	}
+
+	public List<Role> findSchoolRoles() {
+		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
+		tempRoles = tempRoles.stream()
+				.filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.LC_USER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.SALES_MANAGER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.IMPLEMENTERS_MANAGER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.PROJECT_MANAGER.name()))
+				.filter(role -> !role.getCode().equals(RoleMeta.PRINT_MANAGER.name()))
+				.collect(Collectors.toList());
+		return tempRoles;
+	}
 
 }

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

@@ -2,10 +2,7 @@ package cn.com.qmth.examcloud.core.basic.service.impl;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import javax.persistence.criteria.Join;
@@ -91,47 +88,6 @@ public class UserServiceImpl implements UserService {
 		this.accessUserOps = new AccessUserOpsForRedis(redisTemplate);
 	}
 
-	/**
-	 * 过滤非评卷员
-	 * 
-	 * @param user
-	 * @return
-	 */
-	private boolean filterNonMarkerUser(UserEntity user) {
-		List<UserRole> userRoles = user.getUserRoles();
-		if (userRoles != null) {
-			if (userRoles.size() == 1
-					&& userRoles.get(0).getRoleCode().equals(RoleMeta.MARKER.name())) {
-				return false;
-			}
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * 过滤管理角色
-	 * 
-	 * @param user
-	 * @return
-	 */
-	private boolean filterAdminUser(UserEntity user) {
-		List<UserRole> userRoles = user.getUserRoles();
-		if (userRoles != null) {
-			for (UserRole userRole : userRoles) {
-				if (userRole.getRoleCode().equals(RoleMeta.MARKER.name())
-						|| userRole.getRoleCode().equals(RoleMeta.STUDENT.name())
-						|| userRole.getRoleCode().equals(RoleMeta.LC_USER.name())) {
-					return false;
-				}
-			}
-			return true;
-		} else {
-			return false;
-		}
-	}
-
 	/**
 	 * 一般登录
 	 * 
@@ -278,34 +234,6 @@ public class UserServiceImpl implements UserService {
 		userLoginRepo.save(userLogin);
 	}
 
-	/**
-	 * 创建访问用户并加入K/V缓存
-	 * 
-	 * @param token
-	 * @param user
-	 */
-	@Deprecated
-	public void createAccessUser(String token, UserEntity user, Long studentId) throws Exception {
-		AccessUser accessUser = new AccessUser();
-		Set<UserRole> userRoleSet = new HashSet<UserRole>(user.getUserRoles());
-		Org org = orgService.findOne(user.getRootOrgId());
-		// Map<String,Set<String>> rolesMap = userRoleSet.stream()
-		// .collect(Collectors.groupingBy(UserRole::getAppCode,
-		// Collectors.mapping(UserRole::getRoleCode,Collectors.toSet())));
-		accessUser.setLoginName(user.getLoginName());
-		accessUser.setName(user.getName());
-		accessUser.setOrgId(user.getOrgId());
-		accessUser.setRootOrgId(user.getRootOrgId());
-		if (org != null) {
-			accessUser.setRootOrgName(org.getName());
-		}
-		accessUser.setUserId(user.getId());
-		// accessUser.setRoles(rolesMap);
-		accessUser.setToken(token);
-		accessUser.setStudentId(studentId);
-		accessUserOps.set(token, accessUser);
-	}
-
 	/**
 	 * 获取用户信息DTO
 	 * 
@@ -331,8 +259,6 @@ public class UserServiceImpl implements UserService {
 			userInfo.setRootOrgName(rootOrg.getName());
 		}
 		userInfo.setToken(token);
-		userInfo.setUserRoles(user.getUserRoles());
-		userInfo.setRoleNames(getRoleNames(user.getUserRoles()));
 		return userInfo;
 	}
 
@@ -407,25 +333,6 @@ public class UserServiceImpl implements UserService {
 		return userRepo.save(user);
 	}
 
-	public UserEntity saveMarker(Long rootOrgId, String loginName, String name) {
-		UserEntity old = userRepo.findByRootOrgIdAndLoginName(rootOrgId, loginName);
-		if (old != null) {
-			return old;
-		}
-		UserEntity user = new UserEntity();
-		user.setName(name);
-		user.setLoginName(loginName);
-		user.setEnable(true);
-		user.setOrgId(rootOrgId);
-		user.setRootOrgId(rootOrgId);
-		user.setPassword(loginName);
-		UserRole userRole = new UserRole(RoleMeta.MARKER.toString());
-		List<UserRole> userRoles = new LinkedList<UserRole>();
-		userRoles.add(userRole);
-		user.setUserRoles(userRoles);
-		return userRepo.save(user);
-	}
-
 	@Override
 	public UserEntity getUser(Long rootOrgId, String loginName) {
 		UserEntity user = userRepo.findByRootOrgIdAndLoginName(rootOrgId, loginName);