Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
chengwang 1 year ago
parent
commit
5341249d52
2 changed files with 3 additions and 7 deletions
  1. +2
    -2
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/RoleController.java
  2. +1
    -5
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/oidc/AddOidcUserService.java

+ 2
- 2
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/controller/RoleController.java View File

* @param query * @param query
* @return * @return
*/ */
@GetMapping("/getMenuList")
public JsonResult getMenuList(RoleClientQuery query) {
@PostMapping("/getMenuList")
public JsonResult getMenuList(@RequestBody RoleClientQuery query) {
return roleService.getMenuList(query); return roleService.getMenuList(query);
} }



+ 1
- 5
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/oidc/AddOidcUserService.java View File

private OidcCreateUserRequest buildOidcCreateUserRequest(User user, Tenant tenant) { private OidcCreateUserRequest buildOidcCreateUserRequest(User user, Tenant tenant) {
OidcCreateUserRequest oidcCreateUserRequest = new OidcCreateUserRequest(); OidcCreateUserRequest oidcCreateUserRequest = new OidcCreateUserRequest();
oidcCreateUserRequest.setUsername(user.getUsername()); oidcCreateUserRequest.setUsername(user.getUsername());
if (StringUtils.isNotEmpty(user.getPassword())) {
oidcCreateUserRequest.setPassword(user.getPassword());
} else {
oidcCreateUserRequest.setPassword(SystemConstant.INIT_PASSWORD);
}
oidcCreateUserRequest.setPassword(SystemConstant.INIT_PASSWORD);
if (ObjectUtil.isNull(tenant)) { if (ObjectUtil.isNull(tenant)) {
// 普通用户新增 // 普通用户新增
oidcCreateUserRequest.setTenantFlag(0); oidcCreateUserRequest.setTenantFlag(0);

Loading…
Cancel
Save