forgetest5
/
ifffff
mirror of https://gitee.com/maxjhandsome/pig
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
冷冷 2018-06-15 22:33:40 +08:00
parent a5e13d4206 a79b33ad9c
commit 7e61fa0062
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pig-gateway/src/main/java/com/github/pig/gateway/component/config/DynamicRouteLocator.java
View File

@ -80,7 +80,7 @@ public class DynamicRouteLocator extends DiscoveryClientRouteLocator {
}
values.put(path, entry.getValue());
}
return routesMap;
return values;
}
/**

2
pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/UserController.java
View File

@ -209,6 +209,6 @@ public class UserController extends BaseController {
*/
@PutMapping("/editInfo")
public R<Boolean> editInfo(@RequestBody UserDTO userDto, UserVO userVo) {
return new R<>(userService.updateUserInfo(userDto, userVo.getUsername()));
return userService.updateUserInfo(userDto, userVo.getUsername());
}
}

1
pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/entity/SysUser.java
View File

@ -52,7 +52,6 @@ public class SysUser extends Model<SysUser> {
*/
private String username;
@JsonIgnore
private String password;
/**
* 随机盐

2
pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysUserService.java
View File

@ -75,7 +75,7 @@ public interface SysUserService extends IService<SysUser> {
* @param username 用户名
* @return Boolean
*/
Boolean updateUserInfo(UserDTO userDto, String username);
R<Boolean> updateUserInfo(UserDTO userDto, String username);
/**
* 更新指定用户信息

16
pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysUserServiceImpl.java
View File

@ -245,16 +245,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
@CacheEvict(value = "user_details", key = "#username")
public Boolean updateUserInfo(UserDTO userDto, String username) {
public R<Boolean> updateUserInfo(UserDTO userDto, String username) {
UserVO userVo = this.findUserByUsername(username);
SysUser sysUser = new SysUser();
if (ENCODER.matches(userDto.getPassword(), userVo.getPassword())) {
sysUser.setPassword(ENCODER.encode(userDto.getNewpassword1()));
if (StrUtil.isNotBlank(userDto.getPassword())
&& StrUtil.isNotBlank(userDto.getNewpassword1())) {
if (ENCODER.matches(userDto.getPassword(), userVo.getPassword())) {
sysUser.setPassword(ENCODER.encode(userDto.getNewpassword1()));
} else {
log.warn("原密码错误，修改密码失败:{}", username);
return new R<>(Boolean.FALSE, "原密码错误，修改失败");
}
}
sysUser.setPhone(userDto.getPhone());
sysUser.setUserId(userVo.getUserId());
sysUser.setAvatar(userDto.getAvatar());
return this.updateById(sysUser);
return new R<>(this.updateById(sysUser));
}
@Override

4
pom.xml
View File

@ -37,7 +37,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<pig.version>1.1.2</pig.version>
<pig.version>1.1.3</pig.version>
<spring-boot.version>1.5.12.RELEASE</spring-boot.version>
<spring-cloud.version>Edgware.SR3</spring-cloud.version>
@ -70,7 +70,7 @@
<!--注册中心-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
</dependency>
<!--配置中心-->
<dependency>