|
|
|
@@ -186,7 +186,7 @@ public class SysUserController extends BaseController { |
|
|
|
} |
|
|
|
user.setCreateBy(SecurityUtils.getUsername()); |
|
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); |
|
|
|
user.setGitLinkPassword(SecurityUtils.encryptPassword(user.getGitLinkPassword())); |
|
|
|
// user.setGitLinkPassword(SecurityUtils.encryptPassword(user.getGitLinkPassword())); |
|
|
|
return toAjax(userService.insertUser(user)); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -212,9 +212,9 @@ public class SysUserController extends BaseController { |
|
|
|
if(StringUtils.isNotEmpty(user.getPassword())){ |
|
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); |
|
|
|
} |
|
|
|
if(StringUtils.isNotEmpty(user.getGitLinkPassword())){ |
|
|
|
user.setGitLinkPassword(SecurityUtils.encryptPassword(user.getGitLinkPassword())); |
|
|
|
} |
|
|
|
// if(StringUtils.isNotEmpty(user.getGitLinkPassword())){ |
|
|
|
// user.setGitLinkPassword(SecurityUtils.encryptPassword(user.getGitLinkPassword())); |
|
|
|
// } |
|
|
|
return toAjax(userService.updateUser(user)); |
|
|
|
} |
|
|
|
|
|
|
|
|