From 85be01dafad672b1ec13bb8f285e8df3ec695623 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Wed, 27 Apr 2022 11:16:32 +0800 Subject: [PATCH] README --- README.md | 4 ++-- README_en.md | 4 ++-- .../NormalAuthenticationProvider.java | 2 +- .../maxkey-web-app/package-lock.json | 21 ++++++++++++++----- .../maxkey-web-app/package.json | 1 + .../maxkey-web-mgt-app/package-lock.json | 21 ++++++++++++++----- .../maxkey-web-mgt-app/package.json | 1 + 7 files changed, 39 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 54ca2556..c0e33758 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@

- Leading-Edge IAM Identity and Access management Product + Leading-Edge IAM Identity and Access Management Product

English | 中文 @@ -24,7 +24,7 @@ # Overview -Maxkey Single Sign On system, which means the Maximum key, Leading-Edge IAM Identity and Access management product , Support OAuth 2.x/OPENID CONNECT, SAML 2.0, JWT, CAS, SCIM and other standard protocols, and provide Simple, Standard, Secure and Open Identity management (IDM), Access management (AM), Single Sign On (SSO), RBAC permission management and Resource management. +Maxkey Single Sign On system, which means the Maximum key, Leading-Edge IAM Identity and Access Management product , Support OAuth 2.x/OPENID CONNECT, SAML 2.0, JWT, CAS, SCIM and other standard protocols, and provide Simple, Standard, Secure and Open Identity management (IDM), Access management (AM), Single Sign On (SSO), RBAC permission management and Resource management. Official Website Official | Line2 diff --git a/README_en.md b/README_en.md index 72101347..acd97d57 100644 --- a/README_en.md +++ b/README_en.md @@ -2,7 +2,7 @@

- Leading-Edge IAM Identity and Access management Product + Leading-Edge IAM Identity and Access Management Product

English | 中文 @@ -24,7 +24,7 @@ # Overview -Maxkey Single Sign On system, which means the Maximum key, Leading-Edge IAM Identity and Access management product , Support OAuth 2.x/OPENID CONNECT, SAML 2.0, JWT, CAS, SCIM and other standard protocols, and provide Simple, Standard, Secure and Open Identity management (IDM), Access management (AM), Single Sign On (SSO), RBAC permission management and Resource management. +Maxkey Single Sign On system, which means the Maximum key, Leading-Edge IAM Identity and Access Management product , Support OAuth 2.x/OPENID CONNECT, SAML 2.0, JWT, CAS, SCIM and other standard protocols, and provide Simple, Standard, Secure and Open Identity management (IDM), Access management (AM), Single Sign On (SSO), RBAC permission management and Resource management. Official Website Official | Line2 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 71b5be9a..ecaba5e6 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 @@ -57,7 +57,7 @@ public class NormalAuthenticationProvider extends AbstractAuthenticationProvider public NormalAuthenticationProvider( AbstractAuthenticationRealm authenticationRealm, ApplicationConfig applicationConfig, - SessionManager sessionService, + SessionManager sessionManager, AuthJwtService authJwtService) { this.authenticationRealm = authenticationRealm; this.applicationConfig = applicationConfig; diff --git a/maxkey-web-frontend/maxkey-web-app/package-lock.json b/maxkey-web-frontend/maxkey-web-app/package-lock.json index 3c118172..8033fc05 100644 --- a/maxkey-web-frontend/maxkey-web-app/package-lock.json +++ b/maxkey-web-frontend/maxkey-web-app/package-lock.json @@ -1,13 +1,13 @@ { - "name": "ng-alain", - "version": "13.4.0", + "name": "maxkey", + "version": "3.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "ng-alain", - "version": "13.4.0", - "license": "MIT", + "name": "maxkey", + "version": "3.5.0", + "license": "Apache-2.0", "dependencies": { "@angular/animations": "~13.3.0", "@angular/common": "~13.3.0", @@ -29,6 +29,7 @@ "ajv": "^8.10.0", "ajv-formats": "^2.1.1", "crypto-js": "^4.1.1", + "monaco-editor": "^0.33.0", "ng-zorro-antd": "^13.1.1", "ngx-cookie-service": "^13.2.0", "ngx-tinymce": "^13.0.0", @@ -14033,6 +14034,11 @@ "node": "^12.20.0 || >=14" } }, + "node_modules/monaco-editor": { + "version": "0.33.0", + "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.33.0.tgz", + "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", @@ -32236,6 +32242,11 @@ } } }, + "monaco-editor": { + "version": "0.33.0", + "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.33.0.tgz", + "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", diff --git a/maxkey-web-frontend/maxkey-web-app/package.json b/maxkey-web-frontend/maxkey-web-app/package.json index 92dfc4c6..edf8ee2b 100644 --- a/maxkey-web-frontend/maxkey-web-app/package.json +++ b/maxkey-web-frontend/maxkey-web-app/package.json @@ -60,6 +60,7 @@ "ajv": "^8.10.0", "ajv-formats": "^2.1.1", "crypto-js": "^4.1.1", + "monaco-editor": "^0.33.0", "ng-zorro-antd": "^13.1.1", "ngx-cookie-service": "^13.2.0", "ngx-tinymce": "^13.0.0", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/package-lock.json b/maxkey-web-frontend/maxkey-web-mgt-app/package-lock.json index 3c118172..8033fc05 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/package-lock.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/package-lock.json @@ -1,13 +1,13 @@ { - "name": "ng-alain", - "version": "13.4.0", + "name": "maxkey", + "version": "3.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "ng-alain", - "version": "13.4.0", - "license": "MIT", + "name": "maxkey", + "version": "3.5.0", + "license": "Apache-2.0", "dependencies": { "@angular/animations": "~13.3.0", "@angular/common": "~13.3.0", @@ -29,6 +29,7 @@ "ajv": "^8.10.0", "ajv-formats": "^2.1.1", "crypto-js": "^4.1.1", + "monaco-editor": "^0.33.0", "ng-zorro-antd": "^13.1.1", "ngx-cookie-service": "^13.2.0", "ngx-tinymce": "^13.0.0", @@ -14033,6 +14034,11 @@ "node": "^12.20.0 || >=14" } }, + "node_modules/monaco-editor": { + "version": "0.33.0", + "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.33.0.tgz", + "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", @@ -32236,6 +32242,11 @@ } } }, + "monaco-editor": { + "version": "0.33.0", + "resolved": "https://registry.npmmirror.com/monaco-editor/-/monaco-editor-0.33.0.tgz", + "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/package.json b/maxkey-web-frontend/maxkey-web-mgt-app/package.json index 92dfc4c6..edf8ee2b 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/package.json +++ b/maxkey-web-frontend/maxkey-web-mgt-app/package.json @@ -60,6 +60,7 @@ "ajv": "^8.10.0", "ajv-formats": "^2.1.1", "crypto-js": "^4.1.1", + "monaco-editor": "^0.33.0", "ng-zorro-antd": "^13.1.1", "ngx-cookie-service": "^13.2.0", "ngx-tinymce": "^13.0.0",