Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-shiro
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
xzxt-shiro
Commits
e3e5ea9e
Commit
e3e5ea9e
authored
Mar 03, 2020
by
mayunfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限新增科所队级别 以及admin添加的用户角色结构其他用户使用时目录排列问题
parent
e41b6f88
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
9 deletions
+21
-9
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
+6
-1
src/main/resources/resource/db.properties
+7
-6
src/main/resources/spring/applicationContext-jedis.xml
+2
-0
src/main/webapp/WEB-INF/jsp/admin/member/detail.jsp
+3
-1
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
+1
-0
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
+1
-0
xzxt-shiro.iml
+1
-1
No files found.
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
View file @
e3e5ea9e
...
@@ -456,7 +456,12 @@
...
@@ -456,7 +456,12 @@
</select>
</select>
<!--根据userid查询角色名-->
<!--根据userid查询角色名-->
<select
id=
"selectSysRolesByUserId"
parameterType=
"string"
resultType=
"com.xzxtshiro.pojo.SysRole"
>
<select
id=
"selectSysRolesByUserId"
parameterType=
"string"
resultType=
"com.xzxtshiro.pojo.SysRole"
>
select ROLENAME,a.ROLE_ID as id from
select
ROLENAME,
a.ROLE_ID as id ,
b.ISPARENT as isparent,
b.PID as pid
from
sys_user_role a,sys_role b
sys_user_role a,sys_role b
where A.USER_ID=#{userId,jdbcType=VARCHAR} and A.ROLE_ID=b.id
where A.USER_ID=#{userId,jdbcType=VARCHAR} and A.ROLE_ID=b.id
</select>
</select>
...
...
src/main/resources/resource/db.properties
View file @
e3e5ea9e
jdbc.driverClassName
=
oracle.jdbc.driver.OracleDriver
jdbc.driverClassName
=
oracle.jdbc.driver.OracleDriver
jdbc.driver
=
oracle.jdbc.driver.OracleDriver
jdbc.driver
=
oracle.jdbc.driver.OracleDriver
jdbc.url
=
jdbc:oracle:thin:@
192.168.100.105:1521:XZXT3
jdbc.url
=
jdbc:oracle:thin:@
47.92.129.99:1600:ORCL
jdbc.username
=
XZXT
jdbc.username
=
XZXT
jdbc.password
=
XZXT
jdbc.password
=
XZXT
...
@@ -9,13 +9,14 @@ shse.url=http://10.172.25.97:10096/framework/api/v1.0/rbac/user
...
@@ -9,13 +9,14 @@ shse.url=http://10.172.25.97:10096/framework/api/v1.0/rbac/user
shse.appKey
=
SHAANXIPXZ
shse.appKey
=
SHAANXIPXZ
shse.appSecret
=
bfawc1fe9b
shse.appSecret
=
bfawc1fe9b
rest.host
=
http://127.0.0.1
rest.host
=
39.98.114.80
rest.port
=
9043
rest.port
=
7779
#索引
redis.database
=
1
#ip地址
#ip地址
redis.hostName
=
127.0.0.1
redis.hostName
=
39.98.114.80
#端口号
#端口号
redis.port
=
63
79
redis.port
=
77
79
#如果有密码
#如果有密码
redis.password
=
redis.password
=
#客户端超时时间单位是毫秒 默认是2000
#客户端超时时间单位是毫秒 默认是2000
...
...
src/main/resources/spring/applicationContext-jedis.xml
View file @
e3e5ea9e
...
@@ -64,6 +64,8 @@
...
@@ -64,6 +64,8 @@
<!--redis连接工厂 -->
<!--redis连接工厂 -->
<bean
id=
"jedisConnectionFactory"
class=
"org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
destroy-method=
"destroy"
>
<bean
id=
"jedisConnectionFactory"
class=
"org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
destroy-method=
"destroy"
>
<property
name=
"poolConfig"
ref=
"jedisPoolConfig"
></property>
<property
name=
"poolConfig"
ref=
"jedisPoolConfig"
></property>
<!--数据库索引 -->
<property
name=
"database"
value=
"${redis.database}"
></property>
<!--IP地址 -->
<!--IP地址 -->
<property
name=
"hostName"
value=
"${redis.hostName}"
></property>
<property
name=
"hostName"
value=
"${redis.hostName}"
></property>
<!--端口号 -->
<!--端口号 -->
...
...
src/main/webapp/WEB-INF/jsp/admin/member/detail.jsp
View file @
e3e5ea9e
...
@@ -401,7 +401,9 @@
...
@@ -401,7 +401,9 @@
dataType
:
"json"
,
dataType
:
"json"
,
success
:
function
(
user
)
{
success
:
function
(
user
)
{
//判断用户等级
//判断用户等级
if
(
'X'
==
user
.
grade
){
if
(
'K'
==
user
.
grade
){
$
(
"#grade"
).
append
(
"科所队"
);
}
else
if
(
'X'
==
user
.
grade
){
$
(
"#grade"
).
append
(
"县级"
);
$
(
"#grade"
).
append
(
"县级"
);
}
else
if
(
'D'
==
user
.
grade
){
}
else
if
(
'D'
==
user
.
grade
){
$
(
"#grade"
).
append
(
"地市级"
);
$
(
"#grade"
).
append
(
"地市级"
);
...
...
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
View file @
e3e5ea9e
...
@@ -114,6 +114,7 @@
...
@@ -114,6 +114,7 @@
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<select
id=
"grade"
name=
"grade"
lay-verify=
"required"
lay-filter=
"type"
>
<select
id=
"grade"
name=
"grade"
lay-verify=
"required"
lay-filter=
"type"
>
<option
value=
""
>
请选择
</option>
<option
value=
""
>
请选择
</option>
<option
value=
"K"
>
科所队
</option>
<option
value=
"X"
>
县级
</option>
<option
value=
"X"
>
县级
</option>
<option
value=
"D"
>
地市级
</option>
<option
value=
"D"
>
地市级
</option>
<option
value=
"S"
>
省级
</option>
<option
value=
"S"
>
省级
</option>
...
...
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
View file @
e3e5ea9e
...
@@ -115,6 +115,7 @@
...
@@ -115,6 +115,7 @@
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<select
id=
"grade"
name=
"grade"
lay-verify=
"required"
lay-filter=
"grade"
>
<select
id=
"grade"
name=
"grade"
lay-verify=
"required"
lay-filter=
"grade"
>
<option
value=
""
>
请选择
</option>
<option
value=
""
>
请选择
</option>
<option
value=
"K"
>
科所队
</option>
<option
value=
"X"
>
县级
</option>
<option
value=
"X"
>
县级
</option>
<option
value=
"D"
>
地市级
</option>
<option
value=
"D"
>
地市级
</option>
<option
value=
"S"
>
省级
</option>
<option
value=
"S"
>
省级
</option>
...
...
xzxt-shiro.iml
View file @
e3e5ea9e
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
</configuration>
</configuration>
</facet>
</facet>
</component>
</component>
<component
name=
"NewModuleRootManager"
LANGUAGE_LEVEL=
"JDK_1_7"
inherit-compiler-output=
"false"
>
<component
name=
"NewModuleRootManager"
LANGUAGE_LEVEL=
"JDK_1_7"
>
<output
url=
"file://$MODULE_DIR$/target/classes"
/>
<output
url=
"file://$MODULE_DIR$/target/classes"
/>
<output-test
url=
"file://$MODULE_DIR$/target/test-classes"
/>
<output-test
url=
"file://$MODULE_DIR$/target/test-classes"
/>
<content
url=
"file://$MODULE_DIR$"
>
<content
url=
"file://$MODULE_DIR$"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment