From 5ae9dfd16fd6450e55878b5129b53ece19c12c46 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Mon, 18 Jul 2022 08:29:13 +0800 Subject: [PATCH] =?UTF-8?q?oauth=20select=E5=A4=9A=E9=80=89=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/entity/AppsOauth20Details.ts | 23 ++++++++++++++++++- .../main/java/org/maxkey/MaxKeyMvcConfig.java | 4 ++-- .../java/org/maxkey/MaxKeyMgtMvcConfig.java | 4 ++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts index 795deaf95..bf0d1aae9 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/AppsOauth20Details.ts @@ -76,7 +76,6 @@ export class AppsOauth20Details extends Apps { override init(data: any): void { Object.assign(this, data); super.init(data); - //console.log(data); if (this.status == 1) { this.switch_status = true; } @@ -105,5 +104,27 @@ export class AppsOauth20Details extends Apps { } else { this.status = 0; } + this.scope = ''; + + for (let i = 0; i < this.select_scope.length; i++) { + if (this.select_scope[i] != '') { + if (this.scope === '') { + this.scope = this.select_scope[i]; + } else { + this.scope = `${this.scope},${this.select_scope[i]}`; + } + } + } + this.authorizedGrantTypes = ''; + let n = 0; + for (let i = 0; i < this.select_authorizedGrantTypes.length; i++) { + if (this.select_authorizedGrantTypes[i] != '') { + if (this.authorizedGrantTypes === '') { + this.authorizedGrantTypes = this.select_authorizedGrantTypes[i]; + } else { + this.authorizedGrantTypes = `${this.authorizedGrantTypes},${this.select_authorizedGrantTypes[i]}`; + } + } + } } } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java index 6d1a65f3b..6a6c9ff56 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java @@ -80,7 +80,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - _logger.debug("addResourceHandlers"); + _logger.debug("add Resource Handlers"); _logger.debug("add statics"); registry.addResourceHandler("/static/**") .addResourceLocations("classpath:/static/"); @@ -98,7 +98,7 @@ public class MaxKeyMvcConfig implements WebMvcConfigurer { registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - _logger.debug("addResourceHandler finished ."); + _logger.debug("add Resource Handler finished ."); } @Override diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java index 40db38fb9..d9c107492 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java @@ -58,7 +58,7 @@ public class MaxKeyMgtMvcConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { - _logger.debug("addResourceHandlers"); + _logger.debug("add Resource Handlers"); _logger.debug("add statics"); registry.addResourceHandler("/static/**") @@ -77,7 +77,7 @@ public class MaxKeyMgtMvcConfig implements WebMvcConfigurer { registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - _logger.debug("addResourceHandler finished ."); + _logger.debug("add Resource Handler finished ."); } @Override