diff --git a/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java b/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java index a8268d5ef5..f06ab40dfa 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@RequestMapping("/api/ldap") +@RequestMapping("/plugin/ldap") @RestController public class XLdapServer { diff --git a/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java b/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java new file mode 100644 index 0000000000..c2c21f24e7 --- /dev/null +++ b/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java @@ -0,0 +1,27 @@ +package io.dataease.plugins.server; + + +import io.dataease.plugins.config.SpringContextUtil; +import io.dataease.plugins.xpack.display.dto.response.SysSettingDto; +import io.dataease.plugins.xpack.oidc.service.OidcXpackService; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RequestMapping("/plugin/oidc") +@RestController +public class XOidcServer { + + + @PostMapping("/info") + public List getOidcInfo() { + OidcXpackService oidcXpackService = SpringContextUtil.getBean(OidcXpackService.class); + return oidcXpackService.oidcSettings(); + } + + @PostMapping("/save") + public void save(@RequestBody List settings) { + OidcXpackService oidcXpackService = SpringContextUtil.getBean(OidcXpackService.class); + oidcXpackService.save(settings); + } +} diff --git a/frontend/src/api/system/user.js b/frontend/src/api/system/user.js index 7b9e877ef2..64d7d65f05 100644 --- a/frontend/src/api/system/user.js +++ b/frontend/src/api/system/user.js @@ -100,7 +100,7 @@ export function roleGrid(pageIndex, pageSize, data) { export function ldapUsers(data) { return request({ - url: '/api/ldap/users', + url: '/plugin/ldap/users', method: 'post', loading: true }) diff --git a/frontend/src/components/Notification/index.vue b/frontend/src/components/Notification/index.vue index 80528bef8a..fa07c8e79d 100644 --- a/frontend/src/components/Notification/index.vue +++ b/frontend/src/components/Notification/index.vue @@ -232,7 +232,7 @@ export default { right: 178px; top: 8px; background: red; - // color: #fff; + color: #fff; border-radius: 17px; padding: 4px 7px; font-size: 16px; diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 051c0addb8..a36a7ef9f0 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -532,6 +532,15 @@ export default { mapping_cannot_be_empty: 'LDAP 用户属性映射不能为空', password_cannot_be_empty: 'LDAP 密码不能为空' }, + oidc: { + auth_endpoint: '请输入AuthEndpoint', + token_endpoint: '请输入TokenEndpoint', + userinfo_endpoint: '请输入UserinfoEndpoint', + logout_endpoint: '请输入logoutEndpoint', + clientId: '请输入ClientId', + secret: '请输入Secret', + open: '启用OIDC认证' + }, role: { menu_authorization: '菜单授权', data_authorization: '数据授权', diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index e2135981d0..813637c455 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -108,7 +108,7 @@ export default { loginImageUrl: null, loginLogoUrl: null, axiosFinished: false, - openLdap: true + openLdap: false } }, computed: {