Merge branch 'master' of http://git.dayaedu.com/yonge/edu-saas

# Conflicts:
#	edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/handler/BaseAuthenticationSuccessEventHandler.java
#	edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/provider/service/DefaultUserDetailsService.java
#	edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/TokenController.java

edu-common/src/main/java/com/keao/edu/common/security/AuthUser.java → edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/dto/AuthUser.java

@@ -1,4 +1,4 @@
-package com.keao.edu.common.security;
+package com.keao.edu.auth.api.dto;
 
 import java.util.Collection;
 

edu-common/src/main/java/com/keao/edu/common/security/SecurityConstants.java → edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/util/SecurityConstants.java

@@ -1,4 +1,4 @@
-package com.keao.edu.common.security;
+package com.keao.edu.auth.api.util;
 
 public interface SecurityConstants {
 

edu-common/src/main/java/com/keao/edu/common/security/SecurityUtils.java → edu-auth/edu-auth-api/src/main/java/com/keao/edu/auth/api/util/SecurityUtils.java

@@ -1,4 +1,4 @@
-package com.keao.edu.common.security;
+package com.keao.edu.auth.api.util;
 
 import java.util.Map;
 
@@ -6,6 +6,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import com.alibaba.fastjson.JSON;
+import com.keao.edu.auth.api.dto.AuthUser;
 
 public class SecurityUtils {
 	/**

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/config/PermissionCheckService.java

@@ -8,10 +8,10 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.stereotype.Component;
 
+import com.keao.edu.auth.api.dto.AuthUser;
 import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.auth.api.util.SecurityUtils;
 import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.security.AuthUser;
-import com.keao.edu.common.security.SecurityUtils;
 
 @Component("pcs")
 public class PermissionCheckService {

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -15,8 +15,8 @@ import org.springframework.security.web.authentication.AbstractAuthenticationPro
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 import com.keao.edu.auth.api.entity.LoginEntity;
+import com.keao.edu.auth.api.util.SecurityConstants;
 import com.keao.edu.auth.config.token.PhoneAuthenticationToken;
-import com.keao.edu.common.security.SecurityConstants;
 
 public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
 

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/filter/UsernameAuthenticationFilter.java

@@ -18,8 +18,8 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.util.Assert;
 
 import com.keao.edu.auth.api.dto.SysUserInfo;
+import com.keao.edu.auth.api.util.SecurityConstants;
 import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.security.SecurityConstants;
 
 public class UsernameAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
 

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/handler/AuthenticationFailureListener.java

@@ -14,9 +14,9 @@ import org.springframework.stereotype.Component;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.auth.api.entity.SysUserLogin;
+import com.keao.edu.auth.api.util.SecurityConstants;
 import com.keao.edu.auth.service.SysUserLoginService;
 import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.security.SecurityConstants;
 
 @Component
 public class AuthenticationFailureListener implements ApplicationListener<AuthenticationFailureBadCredentialsEvent> {

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -9,7 +9,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.keao.edu.common.entity.HttpResponseResult;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -36,10 +35,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.auth.api.entity.SysUserLogin;
 import com.keao.edu.auth.api.entity.SysUserLoginLog;
+import com.keao.edu.auth.api.util.SecurityConstants;
 import com.keao.edu.auth.service.SysUserLoginLogService;
 import com.keao.edu.auth.service.SysUserLoginService;
 import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.security.SecurityConstants;
+import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/provider/PhoneAuthenticationProvider.java

@@ -11,9 +11,9 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.keao.edu.auth.api.entity.LoginEntity;
+import com.keao.edu.auth.api.util.SecurityConstants;
 import com.keao.edu.auth.config.token.PhoneAuthenticationToken;
 import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.security.SecurityConstants;
 import com.keao.edu.common.service.IdGeneratorService;
 
 public class PhoneAuthenticationProvider extends AbstractAuthenticationProvider {

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/core/provider/service/DefaultUserDetailsService.java

@@ -1,10 +1,8 @@
 package com.keao.edu.auth.core.provider.service;
 
-import com.keao.edu.auth.api.dto.SysUserInfo;
-import com.keao.edu.auth.api.entity.SysUser;
-import com.keao.edu.auth.service.SysUserService;
-import com.keao.edu.common.security.AuthUser;
-import com.keao.edu.common.security.SecurityConstants;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.LockedException;
@@ -14,15 +12,22 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.keao.edu.auth.api.dto.AuthUser;
+import com.keao.edu.auth.api.dto.SysUserInfo;
+import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.auth.api.util.SecurityConstants;
+import com.keao.edu.auth.service.SysUserService;
 
 @Service
 public class DefaultUserDetailsService implements UserDetailsService {
 
 	@Autowired
+	private PasswordEncoder passwordEncoder;
+
+	@Autowired
 	private SysUserService sysUserService;
 
 	private final String BCRYPT = "{bcrypt}";

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/MenuController.java

@@ -17,12 +17,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.keao.edu.auth.api.dto.AuthUser;
 import com.keao.edu.auth.api.dto.MenuQueryInfo;
 import com.keao.edu.auth.api.entity.SysMenu;
+import com.keao.edu.auth.api.util.SecurityUtils;
 import com.keao.edu.auth.service.SysMenuService;
 import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.security.AuthUser;
-import com.keao.edu.common.security.SecurityUtils;
 
 @RestController()
 @RequestMapping("menu")

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/RoleController.java

@@ -20,13 +20,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.keao.edu.auth.api.entity.SysRole;
+import com.keao.edu.auth.api.util.SecurityConstants;
 import com.keao.edu.auth.service.SysMenuService;
 import com.keao.edu.auth.service.SysRoleMenuService;
 import com.keao.edu.auth.service.SysRoleService;
 import com.keao.edu.auth.service.SysUserRoleService;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.page.QueryInfo;
-import com.keao.edu.common.security.SecurityConstants;
 
 @RestController()
 @RequestMapping("role")

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/TokenController.java

@@ -1,6 +1,5 @@
 package com.keao.edu.auth.web.controller;
 
-import com.keao.edu.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -29,11 +28,12 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.keao.edu.auth.api.dto.AuthUser;
 import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.auth.api.util.SecurityUtils;
 import com.keao.edu.auth.service.SysUserService;
 import com.keao.edu.common.controller.BaseController;
-import com.keao.edu.common.security.AuthUser;
-import com.keao.edu.common.security.SecurityUtils;
+import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;
 import com.keao.edu.im.api.entity.ImUserModel;

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/UserController.java

@@ -19,16 +19,16 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.keao.edu.auth.api.dto.AuthUser;
 import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.auth.api.util.SecurityConstants;
+import com.keao.edu.auth.api.util.SecurityUtils;
 import com.keao.edu.auth.service.SysRoleService;
 import com.keao.edu.auth.service.SysUserRoleService;
 import com.keao.edu.auth.service.SysUserService;
 import com.keao.edu.auth.web.controller.queryInfo.SysUserQueryInfo;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.exception.BizException;
-import com.keao.edu.common.security.AuthUser;
-import com.keao.edu.common.security.SecurityConstants;
-import com.keao.edu.common.security.SecurityUtils;
 import com.keao.edu.common.service.IdGeneratorService;
 import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.ImResult;

edu-common/src/main/java/com/keao/edu/common/entity/HttpResponseResult.java

@@ -0,0 +1,72 @@
+package com.keao.edu.common.entity;
+
+import org.springframework.http.HttpStatus;
+
+/**
+ * HttpResponse 返回结果
+ */
+public class HttpResponseResult<T> {
+
+	private boolean status = true;
+	private String msg;
+	private T data;
+	private int code;
+
+	public HttpResponseResult(boolean status, int code, T data, String message) {
+		this.status = status;
+		this.msg = message;
+		this.data = data;
+		this.code = code;
+	}
+
+	public HttpResponseResult(boolean status, HttpStatus resultCode, T data, String message) {
+		this.status = status;
+		this.msg = message;
+		this.data = data;
+		this.code = resultCode.value();
+	}
+
+	public HttpResponseResult() {
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public boolean getStatus() {
+		return status;
+	}
+
+	public void setStatus(boolean status) {
+		this.status = status;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public T getData() {
+		return data;
+	}
+
+	public void setData(T data) {
+		this.data = data;
+	}
+
+	public void success() {
+		this.status = true;
+	}
+
+	public void fail() {
+		this.status = false;
+	}
+
+}

edu-common/src/main/java/com/keao/edu/common/security/PermissionCheckService.java

@@ -1,45 +0,0 @@
-package com.keao.edu.common.security;
-
-import java.util.Collection;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.stereotype.Component;
-
-//@Component("pcs")
-public class PermissionCheckService {
-
-	public boolean hasPermissions(String... permissions) {
-		Authentication authentication = SecurityUtils.getAuthentication();
-		if (authentication == null) {
-			return false;
-		}
-
-		String username = authentication.getName();
-
-		if (StringUtils.startsWith(username, SecurityConstants.USERNAME_PRINCIPAL_PREFIX)) {
-			if ("admin".equals(StringUtils.removeStart(username, SecurityConstants.USERNAME_PRINCIPAL_PREFIX))) {
-				return true;
-			}
-		}
-
-		Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
-
-		for (String perm : permissions) {
-			for (GrantedAuthority authority : authorities) {
-				if (StringUtils.equalsIgnoreCase(perm, authority.getAuthority())) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	public boolean hasRoles(String... roles) {
-
-		return hasPermissions(roles);
-	}
-
-}