test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: 登录后admin弱密码提示

This commit is contained in:
CaptainB 2022-10-26 18:55:52 +08:00 committed by 刘瑞斌
parent dc30efb75f
commit e9773d6dc1
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
framework/gateway/src/main/java/io/metersphere/gateway/controller/LoginController.java
View File

@ -11,6 +11,7 @@ import io.metersphere.gateway.service.BaseDisplayService;
import io.metersphere.gateway.service.SystemParameterService; import io.metersphere.gateway.service.SystemParameterService;
import io.metersphere.gateway.service.UserLoginService; import io.metersphere.gateway.service.UserLoginService;
import io.metersphere.request.LoginRequest; import io.metersphere.request.LoginRequest;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -71,7 +72,13 @@ public class LoginController {
return Mono.defer(() -> userLoginService.login(request, session, locale).map(Mono::just).orElseGet(Mono::empty)) return Mono.defer(() -> userLoginService.login(request, session, locale).map(Mono::just).orElseGet(Mono::empty))
.subscribeOn(Schedulers.boundedElastic()) .subscribeOn(Schedulers.boundedElastic())
.switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.BAD_REQUEST, "Not found user info or invalid password"))) .switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.BAD_REQUEST, "Not found user info or invalid password")))
.map(ResultHolder::success); .map(ResultHolder::success)
.map(rh -> {
// 登录是否提示修改密码
boolean changePassword = userLoginService.checkWhetherChangePasswordOrNot(request);
rh.setMessage(BooleanUtils.toStringTrueFalse(changePassword));
return rh;
});
} }
@GetMapping(value = "/currentUser") @GetMapping(value = "/currentUser")

12
framework/gateway/src/main/java/io/metersphere/gateway/service/UserLoginService.java
View File

@ -426,4 +426,16 @@ public class UserLoginService {
throw new RuntimeException("Please check csrf token."); throw new RuntimeException("Please check csrf token.");
} }
} }
public boolean checkWhetherChangePasswordOrNot(LoginRequest request) {
// 升级之后 admin 还使用弱密码也提示修改
if (StringUtils.equals("admin", request.getUsername())) {
UserExample example = new UserExample();
example.createCriteria().andIdEqualTo("admin")
.andPasswordEqualTo(CodingUtil.md5("metersphere"));
return userMapper.countByExample(example) > 0;
}
return false;
}
} }