Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/interceptor/UserAuthRestInterceptor.java

@@ -54,6 +54,7 @@ public class UserAuthRestInterceptor extends HandlerInterceptorAdapter {
         BaseContextHandler.setUsername(infoFromToken.getUniqueName());
         BaseContextHandler.setName(infoFromToken.getName());
         BaseContextHandler.setUserID(infoFromToken.getId());
+        // 这里可以添加RequestType
         return super.preHandle(request, response, handler);
     }
 

ace-auth/ace-auth-common/src/main/java/com/github/wxiaoqi/security/auth/common/util/jwt/JWTHelper.java

@@ -47,7 +47,7 @@ public class JWTHelper {
                 .setSubject(jwtInfo.getUniqueName())
                 .claim(CommonConstants.JWT_KEY_USER_ID, jwtInfo.getId())
                 .claim(CommonConstants.JWT_KEY_NAME, jwtInfo.getName())
-                .claim(CommonConstants.JWT_KEY_REQUEST_TYPE, jwtInfo.getRequestType())
+                .claim(CommonConstants.JWT_KEY_REQUEST_TYPE, jwtInfo.getRequestType()) // keliii 添加请求分类
                 .setExpiration(DateTime.now().plusSeconds(expire).toDate())
                 .signWith(SignatureAlgorithm.RS256, rsaKeyHelper.getPrivateKey(priKey))
                 .compact();

ace-auth/ace-auth-common/src/main/java/com/github/wxiaoqi/security/auth/common/util/jwt/JWTInfo.java

@@ -9,6 +9,7 @@ public class JWTInfo implements Serializable,IJWTInfo {
     private String username;
     private String userId;
     private String name;
+    // keliii 请求分类
     private String requestType;
 //    private Integer dataAll;
 //    private String dataZone;

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -35,7 +35,7 @@ public class AuthController {
             @RequestBody JwtAuthenticationRequest authenticationRequest,
             HttpServletRequest request) throws Exception {
         log.info(authenticationRequest.getUsername()+" require logging...");
-
+        // keliii 分请求类型处理token
         String requestType = request.getHeader(RequestTypeConstants.HEADER_KEY);
         if (requestType == null || requestType.trim().equals("")) {
             requestType = RequestTypeConstants.BASE;

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -12,6 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+/**
+ * @author keliii
+ */
 @Service("appAuthService")
 public class AppAuthServiceImpl implements AuthService {
 
@@ -25,6 +28,7 @@ public class AppAuthServiceImpl implements AuthService {
     public String login(JwtAuthenticationRequest authenticationRequest) throws Exception {
         AppUserInfo info = userService.AppValidate(authenticationRequest);
         if (!StringUtils.isEmpty(info.getId())) {
+            // 在jwt中加入requestType
             return jwtTokenUtil.generateToken(new JWTInfo(info.getUsername(), info.getId() + "", info.getName(),
                     RequestTypeConstants.APP));
         }

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/feign/IAppUserService.java

@@ -11,10 +11,8 @@ import java.util.List;
 
 
 /**
- * ${DESCRIPTION}
  *
- * @author wanghaobin
- * @create 2017-06-21 8:11
+ * @author keliii
  */
 @FeignClient(value = "ace-admin",fallback = UserServiceFallback.class)
 public interface IAppUserService {

ace-gate/src/main/java/com/github/wxiaoqi/security/gate/filter/AccessGatewayFilter.java

@@ -209,6 +209,7 @@ public class AccessGatewayFilter implements GlobalFilter {
 
     private boolean checkUserPermission(PermissionInfo[] permissions, ServerWebExchange ctx, IJWTInfo user) {
         List<PermissionInfo> permissionInfos;
+        // keliii 根据请求类型区别权限
         if (RequestTypeConstants.APP.equals(user.getRequestType())) {
             permissionInfos = appUserService.getPermissionByUsername(user.getUniqueName());
         } else {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserBiz.java

@@ -23,6 +23,9 @@ import java.util.Set;
 
 import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_TRUE;
 
+/**
+ * @author keliii
+ */
 @Service
 public class AppUserBiz extends BaseBiz<AppUserMapper, AppUser> {
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUser.java

@@ -6,6 +6,9 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import java.util.Date;
 
+/**
+ * @author keliii
+ */
 @Table(name = "app_user")
 public class AppUser {
     @Id

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserMapper.java

@@ -8,6 +8,9 @@ import tk.mybatis.mapper.common.Mapper;
 import java.util.List;
 import java.util.Set;
 
+/**
+ * @author keliii
+ */
 public interface AppUserMapper extends Mapper<AppUser> {
     List<Group> selectGroupsByAppUserId(Integer id);
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -5,20 +5,22 @@ import com.github.wxiaoqi.security.admin.entity.AppUser;
 import com.github.wxiaoqi.security.admin.entity.Group;
 import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
-import com.github.wxiaoqi.security.admin.vo.GroupUsers;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.util.Query;
-import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
+/**
+ * @author keliii
+ */
 @RestController
 @RequestMapping("app/user")
 @Slf4j

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -13,10 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * ${DESCRIPTION}
- *
- * @author wanghaobin
- * @create 2017-06-21 8:15
+ * @author keliii
  */
 @RestController
 @RequestMapping("api/app")

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -15,6 +15,9 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * @author keliii
+ */
 @Service
 public class AppPermissionService {
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserGroups.java

@@ -6,6 +6,7 @@ import java.util.Set;
 
 /**
  * App用户角色
+ * @author keliii
  */
 @Data
 public class AppUserGroups {

ace-modules/ace-admin/src/main/resources/mapper/AppUserMapper.xml

@@ -6,7 +6,6 @@
         VALUES
         <trim suffixOverrides=",">
             <foreach collection="groups" item="groupId">
-
                 (#{appUserId}, #{groupId}),
             </foreach>
         </trim>