Merge branch 'master_guanjia' into dev

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

@@ -188,8 +188,14 @@ public class AuthController {
             if(result==null){
                 data.put("status",1001);
             }else {
+                Integer positionId=result.getInteger("positionId")==null?0:result.getInteger("positionId");
+                if (positionId==4 || positionId==1 || positionId==2 || positionId==3){
                     String token=appAuthService.getToken(username,result.getInteger("userId"));
                     data.put("token",token);
+                }else {
+                    data.put("status",ResultCode.FAILED_CODE);
+                    data.put("message","登录失败");
+                }
             }
         }
         return data;

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

@@ -444,6 +444,7 @@ public class AppPermissionService {
             data.put("userId", userid);
             data.put("imUserId", userVo.getImUserid());
             data.put("code", userVo.getCode());
+            data.put("positionId", userVo.getPositionId());
             //更新登录时间 和 ip
             String clientIp = getIp();
             appUserLoginBiz.updateLoginInfo(userid, clientIp);