tieshengkeji/tiesheng-springboot
1
1
Fork 0
Code Pull Requests Actions Packages Releases Activity

feat；增加角色模块

Browse Source
This commit is contained in:
曾文豪
2024-06-25 18:32:08 +08:00
parent 80cd48b97c
commit d2229e0028
24 changed files with 350 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
springboot-ademo/src/main/java/com/tiesheng/demo/config/DemoWebConfigurer.java
View File

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
import com.tiesheng.core.pojos.RequestUserInfo;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.core.service.TieshengWebConfigurer;
import com.tiesheng.login.config.token.bean.TokenBean;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.util.config.GlobalConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

43
springboot-ademo/src/main/java/com/tiesheng/demo/config/JWTAuthenticationFilter.java
View File

@@ -1,43 +0,0 @@
//package com.tiesheng.demo.config;
//
//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
//import org.springframework.security.core.GrantedAuthority;
//import org.springframework.security.core.authority.SimpleGrantedAuthority;
//import org.springframework.security.core.context.SecurityContextHolder;
//import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
//import org.springframework.web.filter.OncePerRequestFilter;
//
//import javax.servlet.FilterChain;
//import javax.servlet.ServletException;
//import javax.servlet.http.HttpServletRequest;
//import javax.servlet.http.HttpServletResponse;
//import java.io.IOException;
//import java.util.ArrayList;
//import java.util.List;
//
//public class JWTAuthenticationFilter extends OncePerRequestFilter {
//
// public JWTAuthenticationFilter(JwtTokenProvider tokenProvider) {
// this.tokenProvider = tokenProvider;
// }
//
// @Override
// protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
// String authHeader = request.getHeader("Authorization");
// if (authHeader != null && authHeader.startsWith("Bearer ")) {
// String token = authHeader.substring(7);
// String username = tokenProvider.getUsername(token);
// if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) {
// if (tokenProvider.validateToken(token)) {
// List<GrantedAuthority> authorities = new ArrayList<>();
// // 根据你的应用程序需求设置权限
// authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
// UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, null, authorities);
// authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
// SecurityContextHolder.getContext().setAuthentication(authenticationToken);
// }
// }
// }
// filterChain.doFilter(request, response);
// }
//}

29
springboot-ademo/src/main/java/com/tiesheng/demo/config/TieshengSecurityAdapter.java
View File

@@ -1,29 +0,0 @@
//package com.tiesheng.demo.config;
//
//import cn.hutool.extra.spring.SpringUtil;
//import org.springframework.context.annotation.Configuration;
//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
//import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
//
//import javax.servlet.http.HttpServletResponse;
//
//@Configuration
//@EnableWebSecurity
//public class TieshengSecurityAdapter extends WebSecurityConfigurerAdapter {
//
// @Override
// protected void configure(HttpSecurity http) throws Exception {
// SpringUtil.getBeanFactory().getA
// http.csrf().disable() // JWT 通常与状态无关，因此 CSRF 保护不适用
// .authorizeRequests()
// .antMatchers("/login").permitAll() // 登录接口允许所有人访问
// .anyRequest().authenticated() // 其他所有请求需要认证
// .and()
// .exceptionHandling()
// .authenticationEntryPoint((request, response, authException) -> response.sendError(HttpServletResponse.SC_UNAUTHORIZED))
// .and()
// .addFilterBefore(new JWTAuthenticationFilter(tokenProvider), UsernamePasswordAuthenticationFilter.class);
// }
//}

4
springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
View File

@@ -8,7 +8,6 @@ import cn.hutool.poi.excel.ExcelUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.read.listener.ReadListener;
import com.tiesheng.annotation.operation.OperationLog;
import com.tiesheng.annotation.token.TokenIgnore;
import com.tiesheng.core.service.CoreLogService;
import com.tiesheng.core.service.CoreMessageService;
@@ -16,7 +15,7 @@ import com.tiesheng.core.util.ProcessImportConsumer;
import com.tiesheng.database.config.DbBackupConfig;
import com.tiesheng.demo.pojos.PoiBean;
import com.tiesheng.demo.pojos.TestFile;
import com.tiesheng.login.config.token.TsTokenConfig;
import com.tiesheng.util.config.TsTokenConfig;
import com.tiesheng.message.pojos.MessageReqResp;
import com.tiesheng.message.pojos.UserChannel;
import com.tiesheng.util.config.EncryptConfig;
@@ -28,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.File;
import java.util.ArrayList;
import java.util.List;

3
springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenAspect.java → springboot-login/src/main/java/com/tiesheng/login/config/TsTokenAspect.java
View File

@@ -1,9 +1,10 @@
package com.tiesheng.login.config.token;
package com.tiesheng.login.config;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.tiesheng.annotation.token.TokenIgnore;
import com.tiesheng.util.ServletKit;
import com.tiesheng.util.config.TsTokenConfig;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;

4
springboot-login/src/main/java/com/tiesheng/login/controller/LoginController.java
View File

@@ -6,8 +6,8 @@ import cn.hutool.core.util.URLUtil;
import com.alibaba.fastjson.JSON;
import com.tiesheng.annotation.operation.OperationIgnore;
import com.tiesheng.annotation.token.TokenIgnore;
import com.tiesheng.login.config.token.TsTokenConfig;
import com.tiesheng.login.config.token.bean.TokenBean;
import com.tiesheng.util.config.TsTokenConfig;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.login.pojos.CodeExtraDTO;
import com.tiesheng.login.pojos.DoLoginInfo;
import com.tiesheng.login.pojos.UniqueIndexDTO;

3
springboot-login/src/main/java/com/tiesheng/login/service/TieshengLoginConfigurer.java
View File

@@ -1,8 +1,7 @@
package com.tiesheng.login.service;
import com.tiesheng.login.config.token.bean.TokenBean;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.login.pojos.DoLoginInfo;
import com.tiesheng.util.ServletKit;
import org.springframework.context.annotation.Configuration;
import javax.servlet.http.HttpServletResponse;

2
springboot-login/src/main/java/com/tiesheng/login/service/impl/DefaultLoginConfigurer.java
View File

@@ -1,6 +1,6 @@
package com.tiesheng.login.service.impl;
import com.tiesheng.login.config.token.bean.TokenBean;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.login.pojos.DoLoginInfo;
import com.tiesheng.login.service.TieshengLoginConfigurer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

78
springboot-role/src/main/java/com/tiesheng/role/controller/RoleController.java
View File

@@ -3,20 +3,22 @@ package com.tiesheng.role.controller;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.tiesheng.role.pojos.dao.CoreRoleAuthority;
import com.tiesheng.role.pojos.dao.CoreRoleGroup;
import com.tiesheng.role.pojos.dao.CoreRoleServer;
import com.tiesheng.role.pojos.dao.CoreRoleUser;
import com.tiesheng.role.pojos.dao.*;
import com.tiesheng.role.pojos.dto.GroupRxUpdateDTO;
import com.tiesheng.role.pojos.dto.MenuListDTO;
import com.tiesheng.role.pojos.dto.OwerPointDTO;
import com.tiesheng.role.pojos.dto.ServiceDTO;
import com.tiesheng.role.pojos.vo.GroupTypeDTO;
import com.tiesheng.role.pojos.vo.RoleUserPageVO;
import com.tiesheng.role.pojos.vo.ServiceMenuVO;
import com.tiesheng.role.service.CoreRoleService;
import com.tiesheng.role.service.CoreServerService;
import com.tiesheng.util.config.TsTokenConfig;
import com.tiesheng.util.exception.ApiException;
import com.tiesheng.util.pojos.ApiResp;
import com.tiesheng.util.pojos.IdDTO;
import com.tiesheng.util.pojos.PageDTO;
import com.tiesheng.util.pojos.TokenBean;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -94,6 +96,33 @@ public class RoleController {
}
/**
* 获取角色的权限
*
* @return
*/
@GetMapping("/group/rx/list")
public ApiResp<List<CoreRoleGroupRx>> groupRxList(@Valid IdDTO dto) {
List<CoreRoleGroupRx> list = coreRoleService.getGroupRxMapper().selectList(new QueryWrapper<CoreRoleGroupRx>()
.eq(CoreRoleGroupRx.IS_DELETED, 0)
.eq("group_id", dto.getId())
);
return ApiResp.respOK(list);
}
/**
* 橘色的权限编辑
*
* @return
*/
@PostMapping("/group/rx/update")
public ApiResp<String> groupRxUpdate(@RequestBody @Valid GroupRxUpdateDTO dto) {
coreRoleService.updateGroupRx(dto);
return ApiResp.respOK("");
}
/**
* 授权列表
*
@@ -175,11 +204,12 @@ public class RoleController {
* @return
*/
@GetMapping("/authority/list")
public ApiResp<List<ServiceMenuVO>> menuList(@Valid ServiceDTO dto) {
public ApiResp<List<ServiceMenuVO>> menuList(@Valid MenuListDTO dto) {
List<CoreRoleAuthority> list = coreServerService.getAuthorityMapper().selectList(new QueryWrapper<CoreRoleAuthority>()
.eq(CoreRoleAuthority.IS_DELETED, 0)
.eq("service", dto.getService())
.eq(StrUtil.isNotEmpty(dto.getPlatform()), "platform", dto.getPlatform())
.orderByAsc("sort")
);
@@ -196,6 +226,7 @@ public class RoleController {
*/
@PostMapping("/authority/update")
public ApiResp<String> menuUpdate(@RequestBody CoreRoleAuthority serviceMenu) {
serviceMenu.setParent(StrUtil.emptyToDefault(serviceMenu.getParent(), null));
if (StrUtil.isEmpty(serviceMenu.getId())) {
coreServerService.getAuthorityMapper().insert(serviceMenu);
} else {
@@ -206,4 +237,41 @@ public class RoleController {
}
/**
* 获取自己拥有的服务
*
* @return
*/
@GetMapping("/owner/server")
public ApiResp<List<CoreRoleAuthority>> ownerServer() {
TokenBean tokenBean = TsTokenConfig.get();
List<CoreRoleAuthority> allOwnerMenus = coreRoleService.getAllOwnerMenus(tokenBean.getId(), tokenBean.getRoleId());
return ApiResp.respOK(allOwnerMenus);
}
/**
* 获取自己拥有的菜单
*
* @return
*/
@GetMapping("/owner/menu")
public ApiResp<String> ownerMenu(@Valid ServiceDTO dto) {
return ApiResp.respOK("");
}
/**
* 获取自己拥有的功能点
*
* @return
*/
@GetMapping("/owner/point")
public ApiResp<String> ownerPoint(@Valid OwerPointDTO dto) {
return ApiResp.respOK("");
}
}

17
springboot-role/src/main/java/com/tiesheng/role/mapper/CoreRoleGroupRxMapper.java Normal file
View File

@@ -0,0 +1,17 @@
package com.tiesheng.role.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tiesheng.role.pojos.dao.CoreRoleGroupRx;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface CoreRoleGroupRxMapper extends BaseMapper<CoreRoleGroupRx> {
/**
* 批量插入数据
*
* @param coreRoleGroupRxs
* @return
*/
int batchInsert(@Param("list") List<CoreRoleGroupRx> coreRoleGroupRxs);
}

13
springboot-role/src/main/java/com/tiesheng/role/mapper/CoreRoleUserMapper.java
View File

@@ -3,10 +3,13 @@ package com.tiesheng.role.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.tiesheng.role.pojos.dao.CoreRoleAuthority;
import com.tiesheng.role.pojos.dao.CoreRoleUser;
import com.tiesheng.role.pojos.vo.RoleUserPageVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface CoreRoleUserMapper extends BaseMapper<CoreRoleUser> {
@@ -19,4 +22,14 @@ public interface CoreRoleUserMapper extends BaseMapper<CoreRoleUser> {
*/
Page<RoleUserPageVO> page(Page<RoleUserPageVO> page, @Param("ew") QueryWrapper<CoreRoleUser> wrapper);
/**
* 获取用户所有的权限
*
* @param userId
* @return
*/
List<CoreRoleAuthority> getAllAuthorityByUserId(@Param("userId") String userId,
@Param("roleId") String roleId);
}

62
springboot-role/src/main/java/com/tiesheng/role/pojos/dao/CoreRoleGroupRx.java Normal file
View File

@@ -0,0 +1,62 @@
package com.tiesheng.role.pojos.dao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tiesheng.util.pojos.DaoBase;
import java.util.Date;
/**
* 角色-分组-关系
*/
@TableName(value = "core_role_group_rx")
public class CoreRoleGroupRx extends DaoBase {
/**
* 角色id
*/
@TableField(value = "group_id")
private String groupId;
/**
* 菜单id
*/
@TableField(value = "menu_id")
private String menuId;
/**
* 获取角色id
*
* @return group_id - 角色id
*/
public String getGroupId() {
return groupId;
}
/**
* 设置角色id
*
* @param groupId 角色id
*/
public void setGroupId(String groupId) {
this.groupId = groupId;
}
/**
* 获取菜单id
*
* @return menu_id - 菜单id
*/
public String getMenuId() {
return menuId;
}
/**
* 设置菜单id
*
* @param menuId 菜单id
*/
public void setMenuId(String menuId) {
this.menuId = menuId;
}
}

22
springboot-role/src/main/java/com/tiesheng/role/pojos/dto/GroupRxUpdateDTO.java Normal file
View File

@@ -0,0 +1,22 @@
package com.tiesheng.role.pojos.dto;
import com.tiesheng.util.pojos.IdDTO;
import java.util.List;
public class GroupRxUpdateDTO extends IdDTO {
private List<String> menuIds;
///////////////////////////////////////////////////////////////////////////
// setter\getter
///////////////////////////////////////////////////////////////////////////
public List<String> getMenuIds() {
return menuIds;
}
public void setMenuIds(List<String> menuIds) {
this.menuIds = menuIds;
}
}

19
springboot-role/src/main/java/com/tiesheng/role/pojos/dto/MenuListDTO.java
View File

@@ -2,26 +2,17 @@ package com.tiesheng.role.pojos.dto;
public class MenuListDTO extends ServiceDTO {
private String parent;
private Integer childSize = 0;
private String platform;
///////////////////////////////////////////////////////////////////////////
// setter\getter
///////////////////////////////////////////////////////////////////////////
public String getParent() {
return parent;
public String getPlatform() {
return platform;
}
public void setParent(String parent) {
this.parent = parent;
}
public Integer getChildSize() {
return childSize;
}
public void setChildSize(Integer childSize) {
this.childSize = childSize;
public void setPlatform(String platform) {
this.platform = platform;
}
}

18
springboot-role/src/main/java/com/tiesheng/role/pojos/dto/OwerPointDTO.java Normal file
View File

@@ -0,0 +1,18 @@
package com.tiesheng.role.pojos.dto;
public class OwerPointDTO extends ServiceDTO {
private String parent;
///////////////////////////////////////////////////////////////////////////
// setter\getter
///////////////////////////////////////////////////////////////////////////
public String getParent() {
return parent;
}
public void setParent(String parent) {
this.parent = parent;
}
}

54
springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
View File

@@ -1,12 +1,20 @@
package com.tiesheng.role.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.tiesheng.role.mapper.CoreRoleGroupMapper;
import com.tiesheng.role.mapper.CoreRoleGroupRxMapper;
import com.tiesheng.role.mapper.CoreRoleUserMapper;
import com.tiesheng.role.pojos.dao.CoreRoleAuthority;
import com.tiesheng.role.pojos.dao.CoreRoleGroup;
import com.tiesheng.role.pojos.dao.CoreRoleGroupRx;
import com.tiesheng.role.pojos.dto.GroupRxUpdateDTO;
import com.tiesheng.util.service.TsServiceBase;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@Service
public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRoleGroup> {
@@ -15,7 +23,53 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
@Resource
CoreRoleUserMapper coreRoleUserMapper;
@Resource
CoreRoleGroupRxMapper coreRoleGroupRxMapper;
public CoreRoleUserMapper getUserMapper() {
return coreRoleUserMapper;
}
public CoreRoleGroupRxMapper getGroupRxMapper() {
return coreRoleGroupRxMapper;
}
/**
* 更新角色的权限
*
* @param dto
*/
@Transactional(rollbackFor = Exception.class)
public void updateGroupRx(GroupRxUpdateDTO dto) {
coreRoleGroupRxMapper.delete(new QueryWrapper<CoreRoleGroupRx>()
.eq("group_id", dto.getId())
);
List<CoreRoleGroupRx> list = new ArrayList<>();
for (String menuId : dto.getMenuIds()) {
CoreRoleGroupRx coreRoleGroupRx = new CoreRoleGroupRx();
coreRoleGroupRx.setGroupId(dto.getId());
coreRoleGroupRx.setMenuId(menuId);
list.add(coreRoleGroupRx);
}
coreRoleGroupRxMapper.batchInsert(list);
}
/**
* 获取所有的菜单
*
* @return
*/
public List<CoreRoleAuthority> getAllOwnerMenus(String userId,String roleId) {
List<CoreRoleAuthority> authority = coreRoleUserMapper.getAllAuthorityByUserId(userId, "");
return authority;
}
}

28
springboot-role/src/main/resources/mapper/CoreRoleGroupRxMapper.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.tiesheng.role.mapper.CoreRoleGroupRxMapper">
<resultMap id="BaseResultMap" type="com.tiesheng.role.pojos.dao.CoreRoleGroupRx">
<!--@mbg.generated-->
<!--@Table core_role_group_rx-->
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="is_deleted" jdbcType="INTEGER" property="isDeleted" />
<result column="group_id" jdbcType="VARCHAR" property="groupId" />
<result column="menu_id" jdbcType="VARCHAR" property="menuId" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, create_time, update_time, is_deleted, group_id, menu_id
</sql>
<insert id="batchInsert">
insert into core_role_group_rx(id, create_time, update_time, is_deleted, group_id, menu_id)
values
<foreach collection="list" separator="," open="(" close=")" item="item">
uuid(), now(), now(), 0,
#{item.groupId},
#{item.menuId}
</foreach>
</insert>
</mapper>

27
springboot-role/src/main/resources/mapper/CoreRoleUserMapper.xml
View File

@@ -32,4 +32,31 @@
${ew.customSqlSegment}
</select>
<select id="getAllAuthorityByUserId" resultType="com.tiesheng.role.pojos.dao.CoreRoleAuthority">
select *
from core_role_authority
where id in (select type_id
from core_role_user
where type = 'menu'
and user_id = #{userId}
union
select crgr.menu_id
from core_role_user cru
left join core_role_group_rx crgr on crgr.group_id = cru.type_id
where type = 'job'
and user_id = #{userId}
<if test="roleId != null and roleId != ''">
union
select menu_id
from core_role_group_rx
where group_id = #{roleId}
</if>
)
</select>
</mapper>

8
springboot-login/src/main/java/com/tiesheng/login/config/token/TsTokenConfig.java → springboot-util/src/main/java/com/tiesheng/util/config/TsTokenConfig.java
View File

@@ -1,4 +1,4 @@
package com.tiesheng.login.config.token;
package com.tiesheng.util.config;
import cn.hutool.core.map.MapUtil;
@@ -7,9 +7,9 @@ import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.hutool.jwt.JWT;
import cn.hutool.jwt.JWTValidator;
import com.tiesheng.login.config.token.bean.TokenBean;
import com.tiesheng.util.ServletKit;
import com.tiesheng.util.exception.ApiException;
import com.tiesheng.util.pojos.TokenBean;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -95,8 +95,10 @@ public class TsTokenConfig {
String id = decode.getPayload("id").toString();
String environmentType = decode.getPayload("environmentType").toString();
String service = decode.getPayload("service").toString();
String extra = decode.getPayload("extra").toString();
String extra = StrUtil.toStringOrNull(decode.getPayload("extra"));
String roleId = StrUtil.toStringOrNull(decode.getPayload("roleId"));
tokenBean = new TokenBean(id, environmentType, service);
tokenBean.setRoleId(roleId);
tokenBean.setExtra(extra);
} catch (Exception ignored) {
}

15
springboot-login/src/main/java/com/tiesheng/login/config/token/bean/TokenBean.java → springboot-util/src/main/java/com/tiesheng/util/pojos/TokenBean.java
View File

@@ -1,10 +1,10 @@
package com.tiesheng.login.config.token.bean;
package com.tiesheng.util.pojos;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil;
import cn.hutool.jwt.JWT;
import com.tiesheng.login.config.token.TsTokenConfig;
import com.tiesheng.util.config.TsTokenConfig;
/**
* @author hao
@@ -14,6 +14,7 @@ public class TokenBean {
private String id;
private String environmentType;
private String service;
private String roleId;
private String extra;
public TokenBean() {
@@ -23,6 +24,7 @@ public class TokenBean {
this.id = id;
this.environmentType = environmentType;
this.service = service;
this.roleId = "";
this.extra = "";
}
@@ -37,6 +39,7 @@ public class TokenBean {
.setPayload("id", getId())
.setPayload("environmentType", StrUtil.emptyToDefault(getEnvironmentType(), ""))
.setPayload("service", StrUtil.emptyToDefault(getService(), ""))
.setPayload("roleId", StrUtil.emptyToDefault(getRoleId(), ""))
.setPayload("extra", StrUtil.emptyToDefault(getExtra(), ""))
.setKey(tsTokenConfig.getEncryptKey().getBytes())
.sign();
@@ -77,4 +80,12 @@ public class TokenBean {
public void setExtra(String extra) {
this.extra = extra;
}
public String getRoleId() {
return roleId;
}
public void setRoleId(String roleId) {
this.roleId = roleId;
}
}

2
springboot-web/src/main/java/com/tiesheng/core/controller/JobController.java
View File

@@ -11,7 +11,7 @@ import com.tiesheng.core.pojos.dto.job.JobUpdateRxDTO;
import com.tiesheng.core.pojos.dto.job.JobUserAssignDTO;
import com.tiesheng.core.pojos.dto.job.JobUserOwner;
import com.tiesheng.core.service.CoreJobService;
import com.tiesheng.login.config.token.TsTokenConfig;
import com.tiesheng.util.config.TsTokenConfig;
import com.tiesheng.util.exception.ApiException;
import com.tiesheng.util.pojos.ApiResp;
import org.springframework.beans.factory.annotation.Autowired;

4
springboot-web/src/main/java/com/tiesheng/core/service/CoreLogService.java
View File

@@ -19,8 +19,8 @@ import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.core.pojos.vo.ProcessDetailVo;
import com.tiesheng.core.util.ProcessImportConsumer;
import com.tiesheng.core.util.ProcessSyncConsumer;
import com.tiesheng.login.config.token.TsTokenConfig;
import com.tiesheng.login.config.token.bean.TokenBean;
import com.tiesheng.util.config.TsTokenConfig;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.util.ServletKit;
import com.tiesheng.util.config.Ip2regionConfig;
import com.tiesheng.util.exception.ApiException;

2
springboot-web/src/main/java/com/tiesheng/core/service/CorePlatformUniqueService.java
View File

@@ -3,7 +3,7 @@ package com.tiesheng.core.service;
import cn.hutool.core.util.StrUtil;
import com.tiesheng.core.mapper.CorePlatformUniqueMapper;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.login.config.token.bean.TokenBean;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.login.pojos.DoLoginInfo;
import com.tiesheng.login.service.TieshengLoginConfigurer;
import com.tiesheng.util.service.TsServiceBase;

2
springboot-web/src/main/java/com/tiesheng/core/service/TieshengWebConfigurer.java
View File

@@ -4,7 +4,7 @@ import cn.hutool.log.LogFactory;
import com.tiesheng.core.pojos.RequestUserInfo;
import com.tiesheng.core.pojos.dao.CoreConfigSystem;
import com.tiesheng.core.pojos.dao.CorePlatformUnique;
import com.tiesheng.login.config.token.bean.TokenBean;
import com.tiesheng.util.pojos.TokenBean;
import com.tiesheng.util.ServletKit;
import com.tiesheng.util.exception.ApiRespEnum;
import com.tiesheng.util.pojos.ApiResp;