Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
3a1176df
提交
3a1176df
authored
2月 19, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'main' of github.com:dataease/dataease into main
上级
5c2912d9
00a51d9a
显示空白字符变更
内嵌
并排
正在显示
21 个修改的文件
包含
164 行增加
和
570 行删除
+164
-570
ExtPermissionBean.java
...va/com/fit2cloud/commons/auth/bean/ExtPermissionBean.java
+4
-7
UserInfo.java
...c/main/java/com/fit2cloud/commons/auth/bean/UserInfo.java
+1
-2
ExtUserMapper.java
...in/java/com/fit2cloud/commons/auth/dao/ExtUserMapper.java
+11
-9
OrgUser.java
.../main/java/com/fit2cloud/commons/auth/entity/OrgUser.java
+0
-44
Organization.java
.../java/com/fit2cloud/commons/auth/entity/Organization.java
+0
-62
Permission.java
...in/java/com/fit2cloud/commons/auth/entity/Permission.java
+0
-50
Resource.java
...main/java/com/fit2cloud/commons/auth/entity/Resource.java
+0
-62
Role.java
...src/main/java/com/fit2cloud/commons/auth/entity/Role.java
+0
-50
RoleUser.java
...main/java/com/fit2cloud/commons/auth/entity/RoleUser.java
+0
-44
User.java
...src/main/java/com/fit2cloud/commons/auth/entity/User.java
+0
-68
OrgUserMapper.java
...java/com/fit2cloud/commons/auth/mapper/OrgUserMapper.java
+0
-19
OrganizationMapper.java
...com/fit2cloud/commons/auth/mapper/OrganizationMapper.java
+0
-19
PermissionMapper.java
...a/com/fit2cloud/commons/auth/mapper/PermissionMapper.java
+0
-19
ResourceMapper.java
...ava/com/fit2cloud/commons/auth/mapper/ResourceMapper.java
+0
-19
RoleMapper.java
...in/java/com/fit2cloud/commons/auth/mapper/RoleMapper.java
+0
-19
RoleUserMapper.java
...ava/com/fit2cloud/commons/auth/mapper/RoleUserMapper.java
+0
-19
UserMapper.java
...in/java/com/fit2cloud/commons/auth/mapper/UserMapper.java
+0
-19
UserService.java
.../java/com/fit2cloud/commons/auth/service/UserService.java
+8
-6
ShiroServiceImpl.java
...fit2cloud/commons/auth/service/impl/ShiroServiceImpl.java
+8
-21
BusiApi.java
...ystem/src/main/java/com/fit2cloud/system/api/BusiApi.java
+4
-4
V1__init.sql
...cloud-system/src/main/resources/db/migration/V1__init.sql
+128
-8
没有找到文件。
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/ExtPermissionBean.java
浏览文件 @
3a1176df
package
com
.
fit2cloud
.
commons
.
auth
.
bean
;
package
com
.
fit2cloud
.
commons
.
auth
.
bean
;
import
com.fit2cloud.commons.auth.entity.Permission
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -10,10 +10,7 @@ import lombok.NoArgsConstructor;
...
@@ -10,10 +10,7 @@ import lombok.NoArgsConstructor;
@Builder
@Builder
@NoArgsConstructor
@NoArgsConstructor
@AllArgsConstructor
@AllArgsConstructor
public
class
ExtPermissionBean
extends
Permission
{
public
class
ExtPermissionBean
{
private
String
url
;
private
String
path
;
private
String
permission
;
public
PermissionKey
getKey
(){
return
PermissionKey
.
builder
().
resourceId
(
getResourceId
()).
url
(
url
).
build
();
}
}
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/bean/UserInfo.java
浏览文件 @
3a1176df
package
com
.
fit2cloud
.
commons
.
auth
.
bean
;
package
com
.
fit2cloud
.
commons
.
auth
.
bean
;
import
com.fit2cloud.commons.auth.entity.User
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.List
;
import
java.util.List
;
...
...
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/dao/ExtUserMapper.java
浏览文件 @
3a1176df
package
com
.
fit2cloud
.
commons
.
auth
.
dao
;
package
com
.
fit2cloud
.
commons
.
auth
.
dao
;
import
com.fit2cloud.commons.auth.bean.ExtPermissionBean
;
import
com.fit2cloud.commons.auth.bean.ExtPermissionBean
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Select
;
import
org.apache.ibatis.annotations.Select
;
...
@@ -10,22 +11,23 @@ import java.util.List;
...
@@ -10,22 +11,23 @@ import java.util.List;
@Mapper
@Mapper
public
interface
ExtUserMapper
{
public
interface
ExtUserMapper
{
@Select
(
"select password from user where user_id = #{userId,jdbcType=VARCHAR} "
)
@Select
(
"select password from
sys_
user where user_id = #{userId,jdbcType=VARCHAR} "
)
String
getPassword
(
String
userId
);
String
getPassword
(
String
userId
);
@Select
(
"select role_id from
role_user
where user_id = #{userId,jdbcType=VARCHAR} "
)
@Select
(
"select role_id from
sys_users_roles
where user_id = #{userId,jdbcType=VARCHAR} "
)
List
<
String
>
getRole
(
String
userId
);
List
<
String
>
getRole
(
String
userId
);
@Select
({
@Select
({
"select resource_id from permission p "
,
"select sm.permission "
,
"left join role_user ru on p.relation_id = ru.role_id "
,
"from sys_users_roles sur "
,
"where type = 'role' and ru.user_id = #{userId,jdbcType=VARCHAR} "
"LEFT JOIN sys_roles_menus srm on srm.role_id = sur.role_id "
,
"LEFT JOIN sys_menu sm on sm.menu_id = srm.menu_id "
,
"where sur.user_id = #{userId,jdbcType=VARCHAR} "
})
})
List
<
String
>
getPermission
(
String
userId
);
List
<
String
>
getPermission
(
String
userId
);
@Select
({
@Select
(
"select path,permission from sys_menu where path is not null"
)
"select p.*,r.url "
,
"from permission p left join resource r on p.resource_id = r.id"
})
List
<
ExtPermissionBean
>
getPermissions
();
List
<
ExtPermissionBean
>
getPermissions
();
}
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/OrgUser.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* <p>
*
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@TableName
(
"org_user"
)
public
class
OrgUser
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
@TableId
(
"id"
)
private
String
id
;
/**
* 部门ID
*/
@TableField
(
"org_id"
)
private
String
orgId
;
/**
* 用户ID
*/
@TableField
(
"user_id"
)
private
String
userId
;
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/Organization.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* <p>
*
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@TableName
(
"organization"
)
public
class
Organization
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
@TableId
(
"id"
)
private
String
id
;
/**
* 部门名称
*/
@TableField
(
"name"
)
private
String
name
;
/**
* 描述
*/
@TableField
(
"description"
)
private
String
description
;
/**
* 上级部门ID
*/
@TableField
(
"pid"
)
private
Integer
pid
;
/**
* 部门级别
*/
@TableField
(
"level"
)
private
Integer
level
;
/**
* 创建时间
*/
@TableField
(
"create_time"
)
private
Long
createTime
;
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/Permission.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* <p>
*
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@TableName
(
"permission"
)
public
class
Permission
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
@TableId
(
"id"
)
private
String
id
;
/**
* 类型
*/
@TableField
(
"type"
)
private
String
type
;
/**
* 关联ID
*/
@TableField
(
"relation_id"
)
private
String
relationId
;
/**
* 资源ID
*/
@TableField
(
"resource_id"
)
private
String
resourceId
;
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/Resource.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* <p>
*
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@TableName
(
"resource"
)
public
class
Resource
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
@TableId
(
"id"
)
private
String
id
;
/**
* 资源名称
*/
@TableField
(
"name"
)
private
String
name
;
/**
* 资源描述
*/
@TableField
(
"desc"
)
private
String
desc
;
/**
* 资源类型
*/
@TableField
(
"type"
)
private
String
type
;
/**
* 资源地址
*/
@TableField
(
"url"
)
private
String
url
;
/**
* 创建时间
*/
@TableField
(
"create_time"
)
private
Long
createTime
;
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/Role.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* <p>
*
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@TableName
(
"role"
)
public
class
Role
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 角色ID
*/
@TableId
(
"id"
)
private
String
id
;
/**
* 角色名称
*/
@TableField
(
"name"
)
private
String
name
;
/**
* 角色类型
*/
@TableField
(
"type"
)
private
String
type
;
/**
* 描述
*/
@TableField
(
"description"
)
private
String
description
;
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/RoleUser.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* <p>
*
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@TableName
(
"role_user"
)
public
class
RoleUser
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
@TableId
(
"id"
)
private
String
id
;
/**
* 角色ID
*/
@TableField
(
"role_id"
)
private
String
roleId
;
/**
* 用户ID
*/
@TableField
(
"user_id"
)
private
String
userId
;
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/entity/User.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* <p>
*
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@TableName
(
"user"
)
public
class
User
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
@TableId
(
"user_id"
)
private
String
userId
;
/**
* 姓名
*/
@TableField
(
"user_name"
)
private
String
userName
;
/**
* 密码
*/
@TableField
(
"password"
)
private
String
password
;
/**
* 是否有效
*/
@TableField
(
"valid"
)
private
Boolean
valid
;
/**
* 电话号码
*/
@TableField
(
"phone_number"
)
private
Integer
phoneNumber
;
/**
* 邮箱
*/
@TableField
(
"email"
)
private
String
email
;
/**
* 创建时间
*/
@TableField
(
"create_time"
)
private
Long
createTime
;
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/OrgUserMapper.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
mapper
;
import
com.fit2cloud.commons.auth.entity.OrgUser
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* <p>
* Mapper 接口
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Mapper
public
interface
OrgUserMapper
extends
BaseMapper
<
OrgUser
>
{
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/OrganizationMapper.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
mapper
;
import
com.fit2cloud.commons.auth.entity.Organization
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* <p>
* Mapper 接口
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Mapper
public
interface
OrganizationMapper
extends
BaseMapper
<
Organization
>
{
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/PermissionMapper.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
mapper
;
import
com.fit2cloud.commons.auth.entity.Permission
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* <p>
* Mapper 接口
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Mapper
public
interface
PermissionMapper
extends
BaseMapper
<
Permission
>
{
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/ResourceMapper.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
mapper
;
import
com.fit2cloud.commons.auth.entity.Resource
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* <p>
* Mapper 接口
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Mapper
public
interface
ResourceMapper
extends
BaseMapper
<
Resource
>
{
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/RoleMapper.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
mapper
;
import
com.fit2cloud.commons.auth.entity.Role
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* <p>
* Mapper 接口
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Mapper
public
interface
RoleMapper
extends
BaseMapper
<
Role
>
{
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/RoleUserMapper.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
mapper
;
import
com.fit2cloud.commons.auth.entity.RoleUser
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* <p>
* Mapper 接口
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Mapper
public
interface
RoleUserMapper
extends
BaseMapper
<
RoleUser
>
{
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/mapper/UserMapper.java
deleted
100644 → 0
浏览文件 @
5c2912d9
package
com
.
fit2cloud
.
commons
.
auth
.
mapper
;
import
com.fit2cloud.commons.auth.entity.User
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* <p>
* Mapper 接口
* </p>
*
* @author cyw
* @since 2021-02-03
*/
@Mapper
public
interface
UserMapper
extends
BaseMapper
<
User
>
{
}
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/UserService.java
浏览文件 @
3a1176df
package
com
.
fit2cloud
.
commons
.
auth
.
service
;
package
com
.
fit2cloud
.
commons
.
auth
.
service
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.fit2cloud.commons.auth.bean.UserBean
;
import
com.fit2cloud.commons.auth.bean.UserBean
;
import
com.fit2cloud.commons.auth.dao.ExtUserMapper
;
import
com.fit2cloud.commons.auth.dao.ExtUserMapper
;
import
com.fit2cloud.commons.auth.entity.User
;
import
com.fit2cloud.commons.auth.entity.
Sys
User
;
import
com.fit2cloud.commons.auth.mapper.UserMapper
;
import
com.fit2cloud.commons.auth.mapper.
Sys
UserMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.List
;
...
@@ -18,11 +19,12 @@ public class UserService {
...
@@ -18,11 +19,12 @@ public class UserService {
private
ExtUserMapper
extUserMapper
;
private
ExtUserMapper
extUserMapper
;
@Autowired
(
required
=
false
)
@Autowired
(
required
=
false
)
private
UserMapper
u
serMapper
;
private
SysUserMapper
sysU
serMapper
;
public
UserBean
getUser
(
String
username
){
public
UserBean
getUser
(
String
username
){
User
user
=
userMapper
.
selectById
(
username
);
SysUser
sysUser
=
sysUserMapper
.
selectById
(
username
);
if
(
ObjectUtil
.
isNull
(
user
))
return
null
;
String
password
=
user
.
getPassword
();
if
(
ObjectUtil
.
isNull
(
sysUser
))
return
null
;
String
password
=
sysUser
.
getPassword
();
List
<
String
>
roles
=
extUserMapper
.
getRole
(
username
);
List
<
String
>
roles
=
extUserMapper
.
getRole
(
username
);
String
role
=
roles
.
stream
().
collect
(
Collectors
.
joining
(
","
));
String
role
=
roles
.
stream
().
collect
(
Collectors
.
joining
(
","
));
List
<
String
>
permissions
=
extUserMapper
.
getPermission
(
username
);
List
<
String
>
permissions
=
extUserMapper
.
getPermission
(
username
);
...
...
fit2cloud-commons/fit2cloud-common-auth/src/main/java/com/fit2cloud/commons/auth/service/impl/ShiroServiceImpl.java
浏览文件 @
3a1176df
package
com
.
fit2cloud
.
commons
.
auth
.
service
.
impl
;
package
com
.
fit2cloud
.
commons
.
auth
.
service
.
impl
;
import
com.
baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.
fit2cloud.commons.auth.bean.ExtPermissionBean
;
import
com.fit2cloud.commons.auth.dao.ExtUserMapper
;
import
com.fit2cloud.commons.auth.dao.ExtUserMapper
;
import
com.fit2cloud.commons.auth.entity.Permission
;
import
com.fit2cloud.commons.auth.service.ShiroService
;
import
com.fit2cloud.commons.auth.service.ShiroService
;
import
org.apache.shiro.spring.web.ShiroFilterFactoryBean
;
import
org.apache.shiro.spring.web.ShiroFilterFactoryBean
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.StringJoiner
;
@Service
@Service
public
class
ShiroServiceImpl
implements
ShiroService
{
public
class
ShiroServiceImpl
implements
ShiroService
{
...
@@ -44,29 +45,15 @@ public class ShiroServiceImpl implements ShiroService {
...
@@ -44,29 +45,15 @@ public class ShiroServiceImpl implements ShiroService {
filterChainDefinitionMap
.
put
(
"/downline"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/downline"
,
"anon"
);
// 放行 end ----------------------------------------------------------
// 放行 end ----------------------------------------------------------
filterChainDefinitionMap
.
put
(
"/logout"
,
"logout"
);
filterChainDefinitionMap
.
put
(
"/logout"
,
"logout"
);
//List<Resource> resources = resourceMapper.selectList(null);
QueryWrapper
<
Permission
>
wrapper
=
new
QueryWrapper
<>();
wrapper
.
eq
(
"type"
,
"role"
);
/*List<ExtPermissionBean> extPermissionBeans = extUserMapper.getPermissions();
List
<
ExtPermissionBean
>
extPermissionBeans
=
extUserMapper
.
getPermissions
();
if (CollectionUtils.isNotEmpty(extPermissionBeans)){
extPermissionBeans
.
forEach
(
item
->
{
Map<PermissionKey, List<ExtPermissionBean>> resourcePerMap = extPermissionBeans.stream().collect(Collectors.groupingBy(ExtPermissionBean::getKey));
resourcePerMap.entrySet().stream().forEach(entry -> {
PermissionKey permissionKey = entry.getKey();
String url = permissionKey.getUrl();
String resourceId = permissionKey.getResourceId();
//List<ExtPermissionBean> permissionList = entry.getValue();
//StringJoiner f2cRoles = new StringJoiner(",", "f2cRoles[", "]");
StringJoiner
f2cPerms
=
new
StringJoiner
(
","
,
"f2cPerms["
,
"]"
);
StringJoiner
f2cPerms
=
new
StringJoiner
(
","
,
"f2cPerms["
,
"]"
);
f2cPerms.add(resourceId);
f2cPerms
.
add
(
item
.
getPermission
());
*//*permissionList.forEach(per -> {
filterChainDefinitionMap
.
put
(
item
.
getPath
(),
"jwt,"
+
f2cPerms
);
String roleId = per.getRelationId();
f2cRoles.add(roleId);
});*//*
filterChainDefinitionMap.put(url, "jwt," + f2cPerms);
});
});
}*/
filterChainDefinitionMap
.
put
(
"/**"
,
"jwt"
);
filterChainDefinitionMap
.
put
(
"/**"
,
"jwt"
);
return
filterChainDefinitionMap
;
return
filterChainDefinitionMap
;
}
}
...
...
fit2cloud-system/src/main/java/com/fit2cloud/system/api/BusiApi.java
浏览文件 @
3a1176df
...
@@ -3,8 +3,8 @@ package com.fit2cloud.system.api;
...
@@ -3,8 +3,8 @@ package com.fit2cloud.system.api;
import
com.fit2cloud.common.db.PageUtils
;
import
com.fit2cloud.common.db.PageUtils
;
import
com.fit2cloud.common.db.Pager
;
import
com.fit2cloud.common.db.Pager
;
import
com.fit2cloud.commons.auth.entity.User
;
/*
import com.fit2cloud.commons.auth.entity.User;
import
com.fit2cloud.commons.auth.mapper.UserMapper
;
import com.fit2cloud.commons.auth.mapper.UserMapper;
*/
import
com.github.pagehelper.Page
;
import
com.github.pagehelper.Page
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageHelper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -22,7 +22,7 @@ public class BusiApi {
...
@@ -22,7 +22,7 @@ public class BusiApi {
}
}
@Autowired
/*
@Autowired
private UserMapper userMapper;
private UserMapper userMapper;
@GetMapping("/page")
@GetMapping("/page")
...
@@ -33,5 +33,5 @@ public class BusiApi {
...
@@ -33,5 +33,5 @@ public class BusiApi {
List<User> users = userMapper.selectList(null);
List<User> users = userMapper.selectList(null);
Pager<List<User>> pageInfo = PageUtils.setPageInfo(page, users);
Pager<List<User>> pageInfo = PageUtils.setPageInfo(page, users);
return pageInfo;
return pageInfo;
}
}
*/
}
}
fit2cloud-system/src/main/resources/db/migration/V1__init.sql
浏览文件 @
3a1176df
CREATE
TABLE
test_users
(
DROP
TABLE
IF
EXISTS
`sys_dept`
;
id
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
,
CREATE
TABLE
`sys_dept`
(
username
varchar
(
100
)
NOT
NULL
,
`dept_id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'ID'
,
first_name
varchar
(
50
)
NOT
NULL
,
`pid`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'上级部门'
,
last_name
varchar
(
50
)
DEFAULT
NULL
,
`sub_count`
int
(
5
)
DEFAULT
0
COMMENT
'子部门数目'
,
PRIMARY
KEY
(
id
),
`name`
varchar
(
255
)
NOT
NULL
COMMENT
'名称'
,
UNIQUE
KEY
UK_username
(
username
)
`dept_sort`
int
(
5
)
DEFAULT
999
COMMENT
'排序'
,
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
;
`enabled`
bit
(
1
)
NOT
NULL
COMMENT
'状态'
,
`create_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'创建者'
,
`update_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'更新者'
,
`create_time`
datetime
DEFAULT
NULL
COMMENT
'创建日期'
,
`update_time`
datetime
DEFAULT
NULL
COMMENT
'更新时间'
,
PRIMARY
KEY
(
`dept_id`
)
USING
BTREE
,
KEY
`inx_pid`
(
`pid`
),
KEY
`inx_enabled`
(
`enabled`
)
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
18
DEFAULT
CHARSET
=
utf8
ROW_FORMAT
=
COMPACT
COMMENT
=
'部门'
;
DROP
TABLE
IF
EXISTS
`sys_dict`
;
CREATE
TABLE
`sys_dict`
(
`dict_id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'ID'
,
`name`
varchar
(
255
)
NOT
NULL
COMMENT
'字典名称'
,
`description`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'描述'
,
`create_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'创建者'
,
`update_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'更新者'
,
`create_time`
datetime
DEFAULT
NULL
COMMENT
'创建日期'
,
`update_time`
datetime
DEFAULT
NULL
COMMENT
'更新时间'
,
PRIMARY
KEY
(
`dict_id`
)
USING
BTREE
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
6
DEFAULT
CHARSET
=
utf8
ROW_FORMAT
=
COMPACT
COMMENT
=
'数据字典'
;
DROP
TABLE
IF
EXISTS
`sys_dict_detail`
;
CREATE
TABLE
`sys_dict_detail`
(
`detail_id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'ID'
,
`dict_id`
bigint
(
11
)
DEFAULT
NULL
COMMENT
'字典id'
,
`label`
varchar
(
255
)
NOT
NULL
COMMENT
'字典标签'
,
`value`
varchar
(
255
)
NOT
NULL
COMMENT
'字典值'
,
`dict_sort`
int
(
5
)
DEFAULT
NULL
COMMENT
'排序'
,
`create_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'创建者'
,
`update_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'更新者'
,
`create_time`
datetime
DEFAULT
NULL
COMMENT
'创建日期'
,
`update_time`
datetime
DEFAULT
NULL
COMMENT
'更新时间'
,
PRIMARY
KEY
(
`detail_id`
)
USING
BTREE
,
KEY
`FK5tpkputc6d9nboxojdbgnpmyb`
(
`dict_id`
)
USING
BTREE
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
7
DEFAULT
CHARSET
=
utf8
ROW_FORMAT
=
COMPACT
COMMENT
=
'数据字典详情'
;
DROP
TABLE
IF
EXISTS
`sys_menu`
;
CREATE
TABLE
`sys_menu`
(
`menu_id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'ID'
,
`pid`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'上级菜单ID'
,
`sub_count`
int
(
5
)
DEFAULT
0
COMMENT
'子菜单数目'
,
`type`
int
(
11
)
DEFAULT
NULL
COMMENT
'菜单类型'
,
`title`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'菜单标题'
,
`name`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'组件名称'
,
`component`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'组件'
,
`menu_sort`
int
(
5
)
DEFAULT
NULL
COMMENT
'排序'
,
`icon`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'图标'
,
`path`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'链接地址'
,
`i_frame`
bit
(
1
)
DEFAULT
NULL
COMMENT
'是否外链'
,
`cache`
bit
(
1
)
DEFAULT
b
'0'
COMMENT
'缓存'
,
`hidden`
bit
(
1
)
DEFAULT
b
'0'
COMMENT
'隐藏'
,
`permission`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'权限'
,
`create_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'创建者'
,
`update_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'更新者'
,
`create_time`
datetime
DEFAULT
NULL
COMMENT
'创建日期'
,
`update_time`
datetime
DEFAULT
NULL
COMMENT
'更新时间'
,
PRIMARY
KEY
(
`menu_id`
)
USING
BTREE
,
UNIQUE
KEY
`uniq_title`
(
`title`
),
UNIQUE
KEY
`uniq_name`
(
`name`
),
KEY
`inx_pid`
(
`pid`
)
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
118
DEFAULT
CHARSET
=
utf8
ROW_FORMAT
=
COMPACT
COMMENT
=
'系统菜单'
;
DROP
TABLE
IF
EXISTS
`sys_role`
;
CREATE
TABLE
`sys_role`
(
`role_id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'ID'
,
`name`
varchar
(
255
)
NOT
NULL
COMMENT
'名称'
,
`description`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'描述'
,
`create_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'创建者'
,
`update_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'更新者'
,
`create_time`
datetime
DEFAULT
NULL
COMMENT
'创建日期'
,
`update_time`
datetime
DEFAULT
NULL
COMMENT
'更新时间'
,
PRIMARY
KEY
(
`role_id`
)
USING
BTREE
,
UNIQUE
KEY
`uniq_name`
(
`name`
),
KEY
`role_name_index`
(
`name`
)
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
3
DEFAULT
CHARSET
=
utf8
ROW_FORMAT
=
COMPACT
COMMENT
=
'角色表'
;
DROP
TABLE
IF
EXISTS
`sys_user`
;
CREATE
TABLE
`sys_user`
(
`user_id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'ID'
,
`dept_id`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'部门名称'
,
`username`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'用户名'
,
`nick_name`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'昵称'
,
`gender`
varchar
(
2
)
DEFAULT
NULL
COMMENT
'性别'
,
`phone`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'手机号码'
,
`email`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'邮箱'
,
`avatar_name`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'头像地址'
,
`avatar_path`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'头像真实路径'
,
`password`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'密码'
,
`is_admin`
bit
(
1
)
DEFAULT
b
'0'
COMMENT
'是否为admin账号'
,
`enabled`
bigint
(
20
)
DEFAULT
NULL
COMMENT
'状态:1启用、0禁用'
,
`create_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'创建者'
,
`update_by`
varchar
(
255
)
DEFAULT
NULL
COMMENT
'更新着'
,
`pwd_reset_time`
datetime
DEFAULT
NULL
COMMENT
'修改密码的时间'
,
`create_time`
datetime
DEFAULT
NULL
COMMENT
'创建日期'
,
`update_time`
datetime
DEFAULT
NULL
COMMENT
'更新时间'
,
PRIMARY
KEY
(
`user_id`
)
USING
BTREE
,
UNIQUE
KEY
`UK_kpubos9gc2cvtkb0thktkbkes`
(
`email`
)
USING
BTREE
,
UNIQUE
KEY
`username`
(
`username`
)
USING
BTREE
,
UNIQUE
KEY
`uniq_username`
(
`username`
),
UNIQUE
KEY
`uniq_email`
(
`email`
),
KEY
`FK5rwmryny6jthaaxkogownknqp`
(
`dept_id`
)
USING
BTREE
,
KEY
`FKpq2dhypk2qgt68nauh2by22jb`
(
`avatar_name`
)
USING
BTREE
,
KEY
`inx_enabled`
(
`enabled`
)
)
ENGINE
=
InnoDB
AUTO_INCREMENT
=
3
DEFAULT
CHARSET
=
utf8
ROW_FORMAT
=
COMPACT
COMMENT
=
'系统用户'
;
DROP
TABLE
IF
EXISTS
`sys_users_roles`
;
CREATE
TABLE
`sys_users_roles`
(
`user_id`
bigint
(
20
)
NOT
NULL
COMMENT
'用户ID'
,
`role_id`
bigint
(
20
)
NOT
NULL
COMMENT
'角色ID'
,
PRIMARY
KEY
(
`user_id`
,
`role_id`
)
USING
BTREE
,
KEY
`FKq4eq273l04bpu4efj0jd0jb98`
(
`role_id`
)
USING
BTREE
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
ROW_FORMAT
=
COMPACT
COMMENT
=
'用户角色关联'
;
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论