-
Notifications
You must be signed in to change notification settings - Fork 2.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
新增新功能并解决存在的bug #163
Open
liaomengge
wants to merge
4
commits into
knightliao:dev
Choose a base branch
from
liaomengge:master
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+466
−124
Open
新增新功能并解决存在的bug #163
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -92,6 +92,7 @@ public String addOneAppForUser(Long userId, int appId) { | |
User user = getUser(userId); | ||
|
||
String ownAppIds = user.getOwnApps(); | ||
//此处`admin`用户,并非指的是管理员,而是作为一个特殊的用户 | ||
if ("admin".equals(user.getName()) && StringUtils.isNotBlank(ownAppIds)) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 不要用admin字符串来判断是否是管理员 |
||
ownAppIds = StringUtils.EMPTY; | ||
user.setOwnApps(ownAppIds); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
import com.baidu.disconf.web.service.sign.service.SignMgr; | ||
import com.baidu.disconf.web.service.sign.utils.SignUtils; | ||
import com.baidu.disconf.web.service.user.bo.User; | ||
import com.baidu.disconf.web.service.user.dao.UserDao; | ||
import com.baidu.disconf.web.service.user.dto.Visitor; | ||
import com.baidu.disconf.web.service.user.form.PasswordModifyForm; | ||
import com.baidu.disconf.web.service.user.form.RegisterForm; | ||
|
@@ -29,7 +30,6 @@ | |
|
||
import javax.servlet.http.HttpServletRequest; | ||
import javax.validation.Valid; | ||
import java.util.List; | ||
|
||
/** | ||
* @author liaoqiqi | ||
|
@@ -53,6 +53,9 @@ public class UserController extends BaseController { | |
@Autowired | ||
private RedisLogin redisLogin; | ||
|
||
@Autowired | ||
private UserDao userDao; | ||
|
||
/** | ||
* GET 获取 | ||
* | ||
|
@@ -164,22 +167,19 @@ public JsonObjectBase register(@Valid RegisterForm registerForm, HttpServletRequ | |
String regPwd = registerForm.getPassword(); | ||
|
||
//校验是否存在用户名 | ||
List<User> userList = userMgr.getAll(); | ||
|
||
if (userList != null) { | ||
for (User user : userList) { | ||
if (regUserName.equals(user.getName().trim())) { | ||
return buildFail("用户名存在, 注册失败"); | ||
} | ||
} | ||
User user = userDao.getUserByName(regUserName); | ||
|
||
if (user != null) { | ||
return buildFail("用户名存在, 注册失败"); | ||
} | ||
|
||
//新增用户 | ||
User user = new User(); | ||
user = new User(); | ||
user.setName(regUserName); | ||
user.setPassword(SignUtils.createPassword(regPwd)); | ||
user.setToken(SignUtils.createToken(regUserName)); | ||
user.setOwnApps("0"); | ||
//此处给管理员的权限,就是为了admin中心权限,下方到各个部门权限 | ||
user.setRoleId(RoleEnum.ADMIN.getValue()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这样以后所有注册的用户都是管理员了? |
||
|
||
userMgr.create(user); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
不要用admin字符进行判断是否是管理员
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"admin"只是一个很特殊的用户,而并不是简单的管理员,这样做,是将admin唯一的管理员权限,下发到各个部门各自有自己的管理,这样便于脱离"中心管理",当然也可以去掉这个特殊情况,但是这样,就没有一个整体的管控了、、、