36 changed files with 877 additions and 8 deletions
@ -0,0 +1,5 @@ |
|||
------------------------------------------2019-11-20----------------------------------------------- |
|||
-- 用户表新增微信openId字段 |
|||
ALTER TABLE sys_user ADD open_id varchar(32) NULL COMMENT '微信openId'; |
|||
|
|||
------------------------------------------2019-11-20----------------------------------------------- |
@ -0,0 +1,27 @@ |
|||
package com.elink.esua.epdc.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* |
|||
* 用户角色部门信息 |
|||
* |
|||
* @Author:liuchuang |
|||
* @Date:2019/11/19 23:21 |
|||
*/ |
|||
@Data |
|||
public class DataScopeDeptList implements Serializable { |
|||
private static final long serialVersionUID = -7811155461423939389L; |
|||
|
|||
/** |
|||
* 部门ID |
|||
*/ |
|||
private Long deptId; |
|||
|
|||
/** |
|||
* 部门名称 |
|||
*/ |
|||
private String deptName; |
|||
} |
@ -0,0 +1,30 @@ |
|||
package com.elink.esua.epdc.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* |
|||
* 更新用户openId |
|||
* |
|||
* @Author:liuchuang |
|||
* @Date:2019/11/20 9:45 |
|||
*/ |
|||
@Data |
|||
public class SysUserOpenIdFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 9009918598017070100L; |
|||
|
|||
/** |
|||
* 用户名 |
|||
*/ |
|||
@NotBlank(message = "用户名不能为空") |
|||
private String username; |
|||
|
|||
/** |
|||
* 微信openId |
|||
*/ |
|||
@NotBlank(message = "微信openId不能为空") |
|||
private String openId; |
|||
} |
@ -0,0 +1,27 @@ |
|||
package com.elink.esua.epdc.common.token.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* |
|||
* 用户所有角色权限信息 |
|||
* |
|||
* @Author:liuchuang |
|||
* @Date:2019/11/19 23:48 |
|||
*/ |
|||
@Data |
|||
public class DeptDataScopeDTO implements Serializable { |
|||
private static final long serialVersionUID = -6319876948812713836L; |
|||
|
|||
/** |
|||
* 部门ID |
|||
*/ |
|||
private Long deptId; |
|||
|
|||
/** |
|||
* 部门名称 |
|||
*/ |
|||
private String deptName; |
|||
} |
@ -0,0 +1,43 @@ |
|||
package com.elink.esua.epdc.common.token.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* |
|||
* 工作端用户授权信息 |
|||
* |
|||
* @Author:liuchuang |
|||
* @Date:2019/11/19 20:17 |
|||
*/ |
|||
@Data |
|||
public class WorkUserAuthorizationDTO implements Serializable { |
|||
private static final long serialVersionUID = -4230190448906007120L; |
|||
|
|||
/** |
|||
* 令牌 |
|||
*/ |
|||
private String token; |
|||
|
|||
/** |
|||
* 过期时长,单位秒 |
|||
*/ |
|||
private Integer expire; |
|||
|
|||
/** |
|||
* 部门名称 |
|||
*/ |
|||
private String deptName; |
|||
|
|||
/** |
|||
* 用户标签key |
|||
*/ |
|||
private String userTagKey; |
|||
|
|||
/** |
|||
* 用户所有角色权限信息 |
|||
*/ |
|||
private List<DeptDataScopeDTO> deptDataScopeList; |
|||
} |
@ -0,0 +1,29 @@ |
|||
package com.elink.esua.epdc.common.token.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* |
|||
* 工作端用户登录信息 |
|||
* |
|||
* @Author:liuchuang |
|||
* @Date:2019/11/19 20:19 |
|||
*/ |
|||
@Data |
|||
public class WorkUserLoginDTO implements Serializable { |
|||
private static final long serialVersionUID = 1905641243346550379L; |
|||
|
|||
@NotBlank(message="用户名不能为空") |
|||
private String username; |
|||
|
|||
@NotBlank(message="密码不能为空") |
|||
private String password; |
|||
|
|||
@NotBlank(message="微信code不能为空") |
|||
private String wxCode; |
|||
|
|||
private String openId; |
|||
} |
@ -0,0 +1,25 @@ |
|||
package com.elink.esua.epdc.common.token.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* |
|||
* 工作端获取token Form DTO |
|||
* |
|||
* @Author:liuchuang |
|||
* @Date:2019/11/19 20:35 |
|||
*/ |
|||
@Data |
|||
public class WorkUserTokenFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -2239027109939769097L; |
|||
|
|||
@NotNull(message = "用户ID不能为空") |
|||
private Long id; |
|||
|
|||
@NotBlank(message = "用户名不能为空") |
|||
private String username; |
|||
} |
@ -0,0 +1,24 @@ |
|||
package com.elink.esua.epdc.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* |
|||
* 工作端获取token |
|||
* |
|||
* @Author:liuchuang |
|||
* @Date:2019/11/19 16:53 |
|||
*/ |
|||
@Data |
|||
public class EpdcWorkAppUserMaTokenFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 1283317301539797996L; |
|||
|
|||
/** |
|||
* 微信code |
|||
*/ |
|||
@NotBlank(message = "微信code不能为空") |
|||
private String wxCode; |
|||
} |
@ -0,0 +1,46 @@ |
|||
package com.elink.esua.epdc.feign; |
|||
|
|||
import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; |
|||
import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; |
|||
import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; |
|||
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; |
|||
import com.elink.esua.epdc.commons.tools.utils.Result; |
|||
import com.elink.esua.epdc.feign.fallback.ResourceFeignClientFallback; |
|||
import org.springframework.cloud.openfeign.FeignClient; |
|||
import org.springframework.web.bind.annotation.GetMapping; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
|
|||
/** |
|||
* |
|||
* 资源接口 |
|||
* |
|||
* @Author:liuchuang |
|||
* @Date:2019/11/19 18:59 |
|||
*/ |
|||
@FeignClient(name = ServiceConstant.EPDC_AUTH_SERVER, fallback = ResourceFeignClientFallback.class) |
|||
public interface ResourceFeignClient { |
|||
|
|||
/** |
|||
* |
|||
* 工作端用户获取token |
|||
* |
|||
* @params [workUserTokenFormDto] |
|||
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO> |
|||
* @author liuchuang |
|||
* @since 2019/11/19 20:48 |
|||
*/ |
|||
@GetMapping("auth/getToken") |
|||
Result<WorkUserAuthorizationDTO> getToken(WorkUserTokenFormDTO workUserTokenFormDto); |
|||
|
|||
/** |
|||
* |
|||
* 工作端用户登录并获取授权信息 |
|||
* |
|||
* @params [workUserLoginDto] |
|||
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO> |
|||
* @author liuchuang |
|||
* @since 2019/11/19 20:27 |
|||
*/ |
|||
@PostMapping("auth/workLogin") |
|||
Result<WorkUserAuthorizationDTO> workLogin(WorkUserLoginDTO workUserLoginDto); |
|||
} |
@ -0,0 +1,31 @@ |
|||
package com.elink.esua.epdc.feign.fallback; |
|||
|
|||
import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; |
|||
import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; |
|||
import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; |
|||
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; |
|||
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; |
|||
import com.elink.esua.epdc.commons.tools.utils.Result; |
|||
import com.elink.esua.epdc.feign.ResourceFeignClient; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* |
|||
* 资源接口 Fallback |
|||
* |
|||
* @Author:liuchuang |
|||
* @Date:2019/11/19 19:00 |
|||
*/ |
|||
@Component |
|||
public class ResourceFeignClientFallback implements ResourceFeignClient { |
|||
|
|||
@Override |
|||
public Result<WorkUserAuthorizationDTO> getToken(WorkUserTokenFormDTO workUserTokenFormDto) { |
|||
return ModuleUtils.feignConError(ServiceConstant.EPDC_AUTH_SERVER, "getToken", workUserTokenFormDto); |
|||
} |
|||
|
|||
@Override |
|||
public Result<WorkUserAuthorizationDTO> workLogin(WorkUserLoginDTO workUserLoginDto) { |
|||
return ModuleUtils.feignConError(ServiceConstant.EPDC_AUTH_SERVER, "workLogin", workUserLoginDto); |
|||
} |
|||
} |
Loading…
Reference in new issue