Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fenghuo12
zheng
提交
0b16ae4d
Z
zheng
项目概览
fenghuo12
/
zheng
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Z
zheng
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0b16ae4d
编写于
5月 12, 2017
作者:
shuzheng5201314
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
创建用户,不允许相同帐号,且不允许修改帐号
上级
ea9afdb0
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
25 addition
and
12 deletion
+25
-12
zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserService.java
...src/main/java/com/zheng/upms/rpc/api/UpmsUserService.java
+2
-1
zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserServiceMock.java
...main/java/com/zheng/upms/rpc/api/UpmsUserServiceMock.java
+2
-1
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsUserServiceImpl.java
.../com/zheng/upms/rpc/service/impl/UpmsUserServiceImpl.java
+9
-1
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java
...eng/upms/server/controller/manage/UpmsUserController.java
+10
-7
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/create.jsp
...server/src/main/webapp/WEB-INF/jsp/manage/user/create.jsp
+1
-1
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/update.jsp
...server/src/main/webapp/WEB-INF/jsp/manage/user/update.jsp
+1
-1
未找到文件。
zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserService.java
浏览文件 @
0b16ae4d
...
...
@@ -10,5 +10,6 @@ import com.zheng.upms.dao.model.UpmsUserExample;
*/
public
interface
UpmsUserService
extends
BaseService
<
UpmsUser
,
UpmsUserExample
>
{
UpmsUser
insert2
(
UpmsUser
upmsUser
);
UpmsUser
createUser
(
UpmsUser
upmsUser
);
}
\ No newline at end of file
zheng-upms/zheng-upms-rpc-api/src/main/java/com/zheng/upms/rpc/api/UpmsUserServiceMock.java
浏览文件 @
0b16ae4d
...
...
@@ -12,7 +12,8 @@ import com.zheng.upms.dao.model.UpmsUserExample;
public
class
UpmsUserServiceMock
extends
BaseServiceMock
<
UpmsUserMapper
,
UpmsUser
,
UpmsUserExample
>
implements
UpmsUserService
{
@Override
public
UpmsUser
insert2
(
UpmsUser
upmsUser
)
{
public
UpmsUser
createUser
(
UpmsUser
upmsUser
)
{
return
null
;
}
}
zheng-upms/zheng-upms-rpc-service/src/main/java/com/zheng/upms/rpc/service/impl/UpmsUserServiceImpl.java
浏览文件 @
0b16ae4d
...
...
@@ -27,8 +27,16 @@ public class UpmsUserServiceImpl extends BaseServiceImpl<UpmsUserMapper, UpmsUse
UpmsUserMapper
upmsUserMapper
;
@Override
public
UpmsUser
insert2
(
UpmsUser
upmsUser
)
{
public
UpmsUser
createUser
(
UpmsUser
upmsUser
)
{
UpmsUserExample
upmsUserExample
=
new
UpmsUserExample
();
upmsUserExample
.
createCriteria
()
.
andUsernameEqualTo
(
upmsUser
.
getUsername
());
long
count
=
upmsUserMapper
.
countByExample
(
upmsUserExample
);
if
(
count
>
0
)
{
return
null
;
}
upmsUserMapper
.
insert
(
upmsUser
);
return
upmsUser
;
}
}
\ No newline at end of file
zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsUserController.java
浏览文件 @
0b16ae4d
package
com.zheng.upms.server.controller.manage
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baidu.unbiz.fluentvalidator.ComplexResult
;
import
com.baidu.unbiz.fluentvalidator.FluentValidator
;
import
com.baidu.unbiz.fluentvalidator.ResultCollectors
;
...
...
@@ -16,7 +15,6 @@ import com.zheng.upms.rpc.api.*;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.math.NumberUtils
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -26,7 +24,10 @@ import org.springframework.ui.ModelMap;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.util.*
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.UUID
;
/**
* 用户controller
...
...
@@ -189,10 +190,12 @@ public class UpmsUserController extends BaseController {
upmsUser
.
setSalt
(
salt
);
upmsUser
.
setPassword
(
MD5Util
.
MD5
(
upmsUser
.
getPassword
()
+
upmsUser
.
getSalt
()));
upmsUser
.
setCtime
(
time
);
int
count
=
upmsUserService
.
insertSelective
(
upmsUser
);
//upmsUser = upmsUserService.insert2(upmsUser);
//_log.info("新增用户,主键:userId={}", upmsUser.getUserId());
return
new
UpmsResult
(
UpmsResultConstant
.
SUCCESS
,
count
);
upmsUser
=
upmsUserService
.
createUser
(
upmsUser
);
if
(
null
==
upmsUser
)
{
return
new
UpmsResult
(
UpmsResultConstant
.
FAILED
,
"帐号名已存在!"
);
}
_log
.
info
(
"新增用户,主键:userId={}"
,
upmsUser
.
getUserId
());
return
new
UpmsResult
(
UpmsResultConstant
.
SUCCESS
,
1
);
}
@ApiOperation
(
value
=
"删除用户"
)
...
...
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/create.jsp
浏览文件 @
0b16ae4d
...
...
@@ -96,7 +96,7 @@ function createSubmit() {
animation
:
'
rotateX
'
,
closeAnimation
:
'
rotateX
'
,
title
:
false
,
content
:
result
.
data
.
errorMsg
,
content
:
result
.
data
.
errorMsg
||
result
.
data
,
buttons
:
{
confirm
:
{
text
:
'
确认
'
,
...
...
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/update.jsp
浏览文件 @
0b16ae4d
...
...
@@ -10,7 +10,7 @@
<form
id=
"updateForm"
method=
"post"
>
<div
class=
"form-group"
>
<label
for=
"username"
>
帐号
</label>
<input
id=
"username"
type=
"text"
class=
"form-control"
name=
"username"
maxlength=
"20"
value=
"${user.username}"
>
<input
id=
"username"
type=
"text"
class=
"form-control"
name=
"username"
maxlength=
"20"
value=
"${user.username}"
readonly
>
</div>
<div
class=
"form-group"
>
<label
for=
"realname"
>
姓名
</label>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录