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
a3efb429
Commit
a3efb429
authored
Sep 05, 2018
by
liuyongshuai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改页面样式;调整多个角色权限重复菜单问题;放开修改用户功能的密码。
parent
1d7f4173
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
+2
-2
src/main/java/com/xzxtshiro/util/RedisUtil.java
+2
-2
src/main/resources/resource/db.properties
+3
-3
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
+2
-2
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
+4
-4
src/main/webapp/resources/common/css/common.css
+0
-0
No files found.
src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml
View file @
a3efb429
...
...
@@ -437,7 +437,7 @@
<!--根据userId查询用户拥有的权限-->
<select
id=
"selectSysPermissionsByUserId"
resultType=
"com.xzxtshiro.pojo.SysPermissionNew"
parameterType=
"java.lang.String"
>
SELECT
id,NAME ||'['||id||']' as NAME,menuname,permission,url,flag,zindex,pid,userid
distinct
id,NAME ||'['||id||']' as NAME,menuname,permission,url,flag,zindex,pid,userid
FROM
VW_USER_PERMISSION
WHERE
...
...
@@ -485,7 +485,7 @@
<select
id=
"selectMencusByUserId"
resultType=
"com.xzxtshiro.pojo.SysPermissionNew"
>
<!---->
SELECT
ID, NAME, MENUNAME, PID, PERMISSION, URL, TYPE
distinct
ID, NAME, MENUNAME, PID, PERMISSION, URL, TYPE
FROM
VW_USER_PERMISSION
where flag=1
...
...
src/main/java/com/xzxtshiro/util/RedisUtil.java
View file @
a3efb429
...
...
@@ -32,8 +32,8 @@ public class RedisUtil {
public
static
String
getRedisParam
(){
PropertiesUtils
propertiesUtil
=
new
PropertiesUtils
(
"resource/db.properties"
);
String
host
=
propertiesUtil
.
getValue
(
"re
dis
.host"
);
String
port
=
propertiesUtil
.
getValue
(
"re
dis
.port"
);
String
host
=
propertiesUtil
.
getValue
(
"re
st
.host"
);
String
port
=
propertiesUtil
.
getValue
(
"re
st
.port"
);
return
host
+
":"
+
port
;
}
...
...
src/main/resources/resource/db.properties
View file @
a3efb429
jdbc.driverClassName
=
oracle.jdbc.driver.OracleDriver
jdbc.driver
=
oracle.jdbc.driver.OracleDriver
jdbc.url
=
jdbc:oracle:thin:@192.168.1.1
09
:1521:XZXT3
jdbc.url
=
jdbc:oracle:thin:@192.168.1.1
21
:1521:XZXT3
jdbc.username
=
XZXT
jdbc.password
=
XZXT
re
dis
.host
=
http://127.0.0.1
re
dis
.port
=
9043
re
st
.host
=
http://127.0.0.1
re
st
.port
=
9043
src/main/webapp/WEB-INF/jsp/admin/user/add.jsp
View file @
a3efb429
...
...
@@ -135,7 +135,7 @@
<input
type=
"text"
name=
"unitname"
id=
"unitname"
lay-verify=
"required"
class=
"layui-input"
>
<input
type=
"text"
id=
"unitcode"
Name=
"unitcode"
style=
"display: none;"
>
<span
class=
"layui-btn"
id=
"checkPer"
onclick=
"checkTree('myUnitTree');"
style=
"left: 440px;"
>
选择单位
</span>
<span
class=
"layui-btn"
id=
"checkPer"
onclick=
"checkTree('myUnitTree');"
>
选择单位
</span>
<div
id=
"myUnitTree"
style=
"display: none"
>
<ul
id=
"unit"
class=
"ztree"
></ul>
</div>
...
...
@@ -148,7 +148,7 @@
<input
type=
"text"
name=
"roleName"
id=
"roleName"
lay-verify=
"required"
class=
"layui-input"
>
<input
type=
"text"
id=
"roleId"
Name=
"roleId"
style=
"display: none;"
>
<span
class=
"layui-btn"
id=
"checkRolePid"
onclick=
"checkTree('myRoleTree');"
style=
"left: 440px;"
>
选择角色
</span>
<span
class=
"layui-btn"
id=
"checkRolePid"
onclick=
"checkTree('myRoleTree');"
>
选择角色
</span>
<div
id=
"myRoleTree"
style=
"display: none"
>
<ul
id=
"roleTree"
class=
"ztree"
></ul>
</div>
...
...
src/main/webapp/WEB-INF/jsp/admin/user/update.jsp
View file @
a3efb429
...
...
@@ -71,13 +71,13 @@
<input
type=
"hidden"
id=
"yhzpPath"
name=
"yhzpPath"
value=
""
/>
<button
type=
"button"
class=
"layui-btn"
id=
"yhzpBtn"
><i
class=
"layui-icon"
>
</i>
上传照片
</button>
</div>
<
%
--
<
div
class=
"layui-form-item btx"
>
<div
class=
"layui-form-item btx"
>
<label
class=
"layui-form-label"
>
登录密码
</label>
<div
class=
"layui-input-block"
>
<input
type=
"password"
name=
"password"
lay-verify=
"required"
placeholder=
"默认密码000000"
value=
"${user.password}"
class=
"layui-input"
>
</div>
</div>
--%>
</div>
<div
class=
"layui-form-item btx"
>
<label
class=
"layui-form-label"
>
身份证号码
</label>
...
...
@@ -136,7 +136,7 @@
<input
type=
"text"
name=
"unitname"
id=
"unitname"
lay-verify=
"required"
class=
"layui-input"
>
<input
type=
"text"
id=
"unitcode"
Name=
"unitcode"
style=
"display: none;"
>
<span
class=
"layui-btn"
id=
"checkPer"
onclick=
"checkTree('myUnitTree');"
style=
"left: 440px;"
>
选择单位
</span>
<span
class=
"layui-btn"
id=
"checkPer"
onclick=
"checkTree('myUnitTree');"
>
选择单位
</span>
<div
id=
"myUnitTree"
style=
"display: none"
>
<ul
id=
"unit"
class=
"ztree"
></ul>
</div>
...
...
@@ -149,7 +149,7 @@
<input
type=
"text"
name=
"roleName"
id=
"roleName"
lay-verify=
"required"
class=
"layui-input"
>
<input
type=
"text"
id=
"roleId"
Name=
"roleId"
style=
"display: none;"
>
<span
class=
"layui-btn"
id=
"checkRolePid"
onclick=
"checkTree('myRoleTree');"
style=
"left: 440px;"
>
选择角色
</span>
<span
class=
"layui-btn"
id=
"checkRolePid"
onclick=
"checkTree('myRoleTree');"
>
选择角色
</span>
<div
id=
"myRoleTree"
style=
"display: none"
>
<ul
id=
"roleTree"
class=
"ztree"
></ul>
</div>
...
...
src/main/webapp/resources/common/css/common.css
View file @
a3efb429
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