插入创建时间

user_auth/src/main/java/com/huaxu/dto/ResponseUserLoginDto.java

@@ -0,0 +1,15 @@
+package com.huaxu.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.security.oauth2.common.OAuth2AccessToken;
+
+import java.util.List;
+
+@Data
+public class ResponseUserLoginDto {
+    @ApiModelProperty(value="tonken")
+   public OAuth2AccessToken token;
+    @ApiModelProperty(value="此登录手机")
+   public List<UserDto> loginInfo;
+}

user_auth/src/main/java/com/huaxu/entity/User.java

@@ -0,0 +1,97 @@
+package com.huaxu.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户(User)实体类
+ *
+ * @author makejava
+ * @since 2020-10-21 15:23:51
+ */
+@Data
+@ApiModel
+public class User implements Serializable {
+    private static final long serialVersionUID = -96351358750261173L;
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+    /**
+     * 租户标识
+     */
+    @ApiModelProperty(value = "租户标识")
+    private String tenantId;
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value = "用户名")
+    private String username;
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+    /**
+     * 公司
+     */
+    @ApiModelProperty(value = "公司")
+    private Integer companyOrgId;
+    /**
+     * 部门
+     */
+    @ApiModelProperty(value = "部门")
+    private Integer deptOrgId;
+    /**
+     * 头像
+     */
+    @ApiModelProperty(value = "头像")
+    private String photo;
+    /**
+     * 用户类型
+     */
+    @ApiModelProperty(value = "用户类型")
+    private String userType;
+    /**
+     * 启用状态
+     */
+    @ApiModelProperty(value = "启用状态")
+    private String enableState;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**
+     * 邮箱
+     */
+    @ApiModelProperty(value = "邮箱")
+    private String email;
+    /**
+     * 数据删除标记
+     */
+    @ApiModelProperty(value = "数据删除标记")
+    private Integer status;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date dateCreate;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @ApiModelProperty(value = "")
+    private Date dateUpdate;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+}

user_auth/src/main/java/com/huaxu/security/MyAuthenctiationFailureHandler.java

@@ -9,11 +9,12 @@ import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
 import org.springframework.stereotype.Component;
-import com.huaxu.exception.SecurityException;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import com.huaxu.security.exception.SecurityException;
 
 @Component("myAuthenctiationFailureHandler")
 public class MyAuthenctiationFailureHandler extends SimpleUrlAuthenticationFailureHandler {

user_auth/src/main/java/com/huaxu/security/MyAuthenticationSuccessHandler.java

@@ -1,9 +1,12 @@
 package com.huaxu.security;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.huaxu.dao.LoginLogMapper;
+import com.huaxu.dto.ResponseUserLoginDto;
+import com.huaxu.dto.UserDto;
 import com.huaxu.entity.LoginLog;
 import com.huaxu.model.LoginUser;
 import com.huaxu.model.AjaxMessage;
@@ -84,10 +87,14 @@ public class MyAuthenticationSuccessHandler extends SavedRequestAwareAuthenticat
 
         response.setContentType("application/json;charset=UTF-8");
         ObjectMapper objectMapper = new ObjectMapper();
+        ResponseUserLoginDto responseUserLoginDto=new ResponseUserLoginDto();
+        responseUserLoginDto.setToken(token);
+        responseUserLoginDto.setLoginInfo(JSONArray.parseArray(loginUser.getUserInfos(), UserDto.class));
         JSONObject result=new JSONObject();
         result.put("token",token);
         result.put("userInfos",loginUser.getUserInfos());
-        AjaxMessage ajaxMessage = new AjaxMessage(ResultStatus.OK,result);
+
+        AjaxMessage ajaxMessage = new AjaxMessage(ResultStatus.OK,responseUserLoginDto);
 
 
 

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -16,6 +16,7 @@ import com.huaxu.security.smsCode.SmsCodeException;
 import com.huaxu.service.UserService;
 import com.huaxu.util.ByteArrayUtils;
 import com.huaxu.util.RedisUtil;
+import com.huaxu.util.UserUtil;
 import com.huaxu.util.Util;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -177,7 +178,7 @@ public class UserServiceImpl implements UserService {
         Set<GrantedAuthority> grantedAuthorities = new HashSet<>();
         OAuth2Authentication oAuth2Authentication = (OAuth2Authentication) SecurityContextHolder.getContext().getAuthentication();
         LoginUser loginUser = (LoginUser) oAuth2Authentication.getPrincipal();
-
+        Permission permission=new Permission();
         //角色必须是ROLE_开头，其余的是用户功能权限
         /* List<Permission> permissionList =findPermission(user);
         Integer permissionType = permissionList.get(0).getPermissionType();
@@ -192,11 +193,13 @@ public class UserServiceImpl implements UserService {
                     grantedAuthorities.add(authority1);
                 }
             }
-        }*/
+        }
+        loginUser.setProgramItemList(programItemList);
+        */
         GrantedAuthority authority1 = new SimpleGrantedAuthority("sys:menu:edit");
         grantedAuthorities.add(authority1);
-        loginUser.setLoginToken(UUID.randomUUID().toString());
-        // loginUser.setProgramItemList(programItemList);
+
+
         loginUser.setName(user.getUsername());
         loginUser.setId(user.getId());
         loginUser.setUsername(user.getUsername());
@@ -204,22 +207,17 @@ public class UserServiceImpl implements UserService {
         loginUser.setDepartmentId(user.getDeptOrgId());
         loginUser.setTenantId(user.getTenantId());
         loginUser.setType(user.getUserType());
+        loginUser.setPhoneNumber(user.getPhone());
         loginUser.setAuthorities(grantedAuthorities);
+        loginUser.setPermissonType(permission.getPermissionType());
+        loginUser.setRoleId(permission.getRoleId());
         MobileLoginAuthenticationToken authenticationTokenReslut = new MobileLoginAuthenticationToken(loginUser,oAuth2Authentication.getCredentials(),loginUser.getAuthorities());
         authenticationTokenReslut.setDetails(oAuth2Authentication.getDetails());
         OAuth2Authentication oAuth2AuthenticationNew = new OAuth2Authentication(oAuth2Authentication.getOAuth2Request(), authenticationTokenReslut);
 
         OAuth2AccessToken accessToken = authorizationServerTokenServices.createAccessToken(oAuth2AuthenticationNew);
-        LoginLog loginLog=new LoginLog();
-        loginLog.setName(loginUser.getName());
-        loginLog.setCreateTime(new Date());
-        loginLog.setPhone(loginUser.getPhoneNumber());
-        loginLog.setCompanyId(loginUser.getCompanyId());
-        loginLog.setDepartmentId(loginUser.getDepartmentId());
-        loginLog.setType("登录");
-        loginLog.setLoginIp(Util.getIpAddr(request));
-        loginLogMapper.insert(loginLog);
 
+        insertLoginLog(loginUser,"登录");
         return accessToken;
     }
 
@@ -276,6 +274,18 @@ public class UserServiceImpl implements UserService {
     public boolean logOut(String token) {
 
         boolean flag=consumerTokenServices.revokeToken(token);
+        insertLoginLog(UserUtil.getCurrentUser(),"登出");
         return flag;
     }
+    private void insertLoginLog(LoginUser loginUser,String type){
+        LoginLog loginLog=new LoginLog();
+        loginLog.setName(loginUser.getName());
+        loginLog.setPhone(loginUser.getPhoneNumber());
+        loginLog.setCompanyId(loginUser.getCompanyId());
+        loginLog.setDepartmentId(loginUser.getDepartmentId());
+        loginLog.setType(type);
+        loginLog.setCreateTime(new Date());
+        loginLog.setLoginIp(Util.getIpAddr(request));
+        loginLogMapper.insert(loginLog);
+    }
 }

user_auth/src/main/resources/mapper/UserMapper.xml

@@ -236,7 +236,9 @@
         </where>
     </select>
     <select id="findPermission" resultType="com.huaxu.model.Permission">
-        select * from uims_user a join uims_user_role b on a.id=b.USER_ID
+        select e.NAME,e.MENU_IMAGE overIcon,e.LINK_PATH path,e.id,e.PARENT_MENU_ID parentId
+          e.PERMISSION_FLAG permission, c.PERMISSION_TYPE ,c.id roleId
+          from uims_user a join uims_user_role b on a.id=b.USER_ID
         join uims_role c on b.ROLE_ID= c.ID
         join uims_role_menu d on c.ID=d.ROLE_ID
         join uims_menu e on e.id=d.MENU_ID

user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -74,6 +75,7 @@ public class OrgServiceImpl implements OrgService {
         LoginUser currentUser = UserUtil.getCurrentUser();
         org.setTenantId(currentUser.getTenantId());
         org.setCreateBy(currentUser.getUsername());
+        org.setDateCreate(new Date());
         return this.orgMapper.insert(org);
     }
 

user_center/src/main/java/com/huaxu/service/impl/RoleServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -83,6 +84,7 @@ public class RoleServiceImpl implements RoleService {
         LoginUser currentUser = UserUtil.getCurrentUser();
         role.setTenantId(currentUser.getTenantId());
         role.setCreateBy(currentUser.getUsername());
+        role.setDateCreate(new Date());
         return this.roleMapper.insert(role);
     }
 

user_center/src/main/java/com/huaxu/service/impl/UserGroupServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -75,6 +76,7 @@ public class UserGroupServiceImpl implements UserGroupService {
         LoginUser currentUser = UserUtil.getCurrentUser();
         userGroup.setTenantId(currentUser.getTenantId());
         userGroup.setCreateBy(currentUser.getUsername());
+        userGroup.setDateCreate(new Date());
         return this.userGroupMapper.insert(userGroup);
     }