diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/provider/NormalAuthenticationProvider.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/provider/NormalAuthenticationProvider.java index 1e359d721..01df5620a 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/provider/NormalAuthenticationProvider.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/provider/NormalAuthenticationProvider.java @@ -78,8 +78,9 @@ public class NormalAuthenticationProvider extends AbstractAuthenticationProvider if(this.applicationConfig.getLoginConfig().isCaptcha()) { captchaValid(loginCredential.getState(),loginCredential.getCaptcha()); - } - else if(inst.getCaptchaSupport().equalsIgnoreCase("YES")) { + + }else if(!inst.getCaptcha().equalsIgnoreCase("NONE")) { + captchaValid(loginCredential.getState(),loginCredential.getCaptcha()); } diff --git a/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java b/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java index d8b1e76b2..8523e312e 100644 --- a/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java +++ b/maxkey-core/src/main/java/org/maxkey/entity/Institutions.java @@ -78,9 +78,8 @@ public class Institutions extends JpaBaseEntity implements Serializable { private String consoleTitle; @Column - private String captchaType; - @Column - private String captchaSupport; + private String captcha; + @Column private String defaultUri; @@ -130,14 +129,6 @@ public class Institutions extends JpaBaseEntity implements Serializable { this.frontTitle = frontTitle; } - public String getCaptchaType() { - return captchaType; - } - - public void setCaptchaType(String captchaType) { - this.captchaType = captchaType; - } - public String getConsoleDomain() { return consoleDomain; } @@ -259,12 +250,12 @@ public class Institutions extends JpaBaseEntity implements Serializable { } - public String getCaptchaSupport() { - return captchaSupport; + public String getCaptcha() { + return captcha; } - public void setCaptchaSupport(String captchaSupport) { - this.captchaSupport = captchaSupport; + public void setCaptcha(String captcha) { + this.captcha = captcha; } public String getDefaultUri() { @@ -310,16 +301,16 @@ public class Institutions extends JpaBaseEntity implements Serializable { builder.append(description); builder.append(", logo="); builder.append(logo); - builder.append(", frontTitle="); - builder.append(frontTitle); - builder.append(", consoleTitle="); - builder.append(consoleTitle); builder.append(", domain="); builder.append(domain); - builder.append(", captchaType="); - builder.append(captchaType); - builder.append(", captchaSupport="); - builder.append(captchaSupport); + builder.append(", frontTitle="); + builder.append(frontTitle); + builder.append(", consoleDomain="); + builder.append(consoleDomain); + builder.append(", consoleTitle="); + builder.append(consoleTitle); + builder.append(", captcha="); + builder.append(captcha); builder.append(", defaultUri="); builder.append(defaultUri); builder.append("]"); diff --git a/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java b/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java index ec0228886..c1f5624fd 100644 --- a/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java +++ b/maxkey-core/src/main/java/org/maxkey/persistence/repository/InstitutionsRepository.java @@ -96,8 +96,7 @@ public class InstitutionsRepository { institution.setFrontTitle(rs.getString("fronttitle")); institution.setConsoleDomain(rs.getString("consoledomain")); institution.setConsoleTitle(rs.getString("consoletitle")); - institution.setCaptchaType(rs.getString("captchatype")); - institution.setCaptchaSupport(rs.getString("captchasupport")); + institution.setCaptcha(rs.getString("captcha")); institution.setDefaultUri(rs.getString("defaultUri")); return institution; } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Institutions.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Institutions.ts index c58466c12..9699784cd 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Institutions.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Institutions.ts @@ -28,7 +28,6 @@ export class Institutions extends BaseEntity { consoleTitle!: String; consoleDomain!: String; domain!: String; - captchaType!: String; - captchaSupport!: String; + captcha!: String; defaultUri!: String; } diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.html index a52f545b1..6cf9508c6 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/institutions/institutions.component.html @@ -64,26 +64,16 @@ name="consoleTitle" id="consoleTitle" /> - - {{ 'mxk.institutions.captchaSupport' | i18n }} - - - - - - - {{ 'mxk.institutions.captchaType' | i18n }} - + + - {{ 'mxk.institutions.contact' | i18n }} diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html index d6058c66a..964c6e48b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/organizations/organization-editer/organization-editer.component.html @@ -43,6 +43,7 @@ + diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json index ea59b2cb1..0ed95b5a7 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/en-US.json @@ -193,6 +193,7 @@ "type.company": "Company", "type.division": "Division", "type.department": "Department", + "type.team": "Team", "type.entity": "Entity", "type.virtual": "Virtual", "codePath": "Code Path", @@ -502,6 +503,7 @@ "consoleTitle": "Console Title", "consoleDomain": "Console Domain", "captchaType": "Captcha Type", + "captchaType.none": "None", "captchaType.text": "Text", "captchaType.arithmetic": "Arithmetic", "captchaSupport": "Captcha Support", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json index bd4e82d3a..5b05ffbca 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-CN.json @@ -194,6 +194,7 @@ "type.company": "公司", "type.division": "分支机构", "type.department": "部门", + "type.team": "组", "type.entity": "实体", "type.virtual": "虚拟", "codePath": "编码路径", @@ -500,6 +501,7 @@ "consoleDomain": "控制台域名", "consoleTitle": "控制台名称", "captchaType": "验证码", + "captchaType.none": "无", "captchaType.text": "字符", "captchaType.arithmetic": "算术", "captchaSupport": "验证码支持", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json index 58528ae86..3623f467d 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/assets/i18n/zh-TW.json @@ -195,6 +195,7 @@ "type.company": "公司", "type.division": "分支機搆", "type.department": "部門", + "type.team": "組", "type.entity": "實體", "type.virtual": "虛擬", "codePath": "編碼路徑", @@ -501,6 +502,7 @@ "consoleDomain": "控制台域名", "consoleTitle": "控制台名稱", "captchaType": "驗證碼", + "captchaType.none": "無", "captchaType.text": "字符", "captchaType.arithmetic": "算術", "captchaSupport": "驗證碼支持", diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java index b19b47423..9e307cb54 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java @@ -142,8 +142,7 @@ public class LoginEntryPoint { if(applicationConfig.getLoginConfig().isCaptcha()) { model.put("captcha", "true"); }else { - model.put("captcha", inst.getCaptchaSupport()); - model.put("captchaType", inst.getCaptchaType()); + model.put("captcha", inst.getCaptcha()); } model.put("state", authTokenService.genRandomJwt()); //load Social Sign On Providers diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java index 07d4c4262..b3e0e4a70 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/web/contorller/LoginEntryPoint.java @@ -72,8 +72,7 @@ public class LoginEntryPoint { if(applicationConfig.getLoginConfig().isCaptcha()) { model.put("captcha", "true"); }else { - model.put("captcha", inst.getCaptchaSupport()); - model.put("captchaType", inst.getCaptchaType()); + model.put("captcha", inst.getCaptcha()); } model.put("state", authTokenService.genRandomJwt()); return new Message>(model).buildResponse();