From 94780b99cf17fd7ef4a5e8a8788284710a78bc2f Mon Sep 17 00:00:00 2001 From: shimingxy Date: Fri, 8 Nov 2024 17:48:11 +0800 Subject: [PATCH] maxkey.auth.session.timeout rename to maxkey.auth.jwt.refresh.expires --- .../maxkey/configuration/ApplicationConfig.java | 11 ----------- .../dromara/maxkey/configuration/AuthJwkConfig.java | 2 +- .../maxkey-web-app/src/environments/environment.ts | 3 ++- .../src/main/resources/application-maxkey.properties | 7 ++++--- .../main/resources/application-maxkey-mgt.properties | 7 ++++--- .../resources/application-maxkey-openapi.properties | 7 ++++--- 6 files changed, 15 insertions(+), 22 deletions(-) diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java index 7ec00b121..489a5177f 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/ApplicationConfig.java @@ -64,9 +64,6 @@ public class ApplicationConfig { @Value("${server.port:8080}") private int port; - @Value("${server.servlet.session.timeout:1800}") - private int sessionTimeout; - @Value("${maxkey.server.provision:false}") private boolean provision; @@ -220,14 +217,6 @@ public class ApplicationConfig { this.authzUri = authzUri; } - public int getSessionTimeout() { - return sessionTimeout; - } - - public void setSessionTimeout(int sessionTimeout) { - this.sessionTimeout = sessionTimeout; - } - public boolean isNoticesVisible() { return noticesVisible; } diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java index b207f179c..74563394f 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/configuration/AuthJwkConfig.java @@ -31,7 +31,7 @@ public class AuthJwkConfig { @Value("${maxkey.auth.jwt.secret}") String secret; - @Value("${maxkey.auth.session.timeout:86400}") + @Value("${maxkey.auth.jwt.refresh.expires:86400}") int refreshExpires; @Value("${maxkey.auth.jwt.refresh.secret}") diff --git a/maxkey-web-frontend/maxkey-web-app/src/environments/environment.ts b/maxkey-web-frontend/maxkey-web-app/src/environments/environment.ts index 44f5f1cd8..c33e07454 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/environments/environment.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/environments/environment.ts @@ -27,7 +27,8 @@ export const environment = { production: false, useHash: true, api: { - baseUrl: 'http://localhost:9527/sign/', + //baseUrl: 'http://localhost:9527/sign/', + baseUrl: '/sign/', refreshTokenEnabled: true, refreshTokenType: 're-request' }, diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-maxkey.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-maxkey.properties index 50d52ff9a..1f19a214f 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-maxkey.properties +++ b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application-maxkey.properties @@ -49,10 +49,11 @@ maxkey.server.provision =${SERVER_PROVISION:false} #issuer name maxkey.app.issuer =CN=ConSec,CN=COM,CN=SH -#must > jwt expire * 2 -maxkey.auth.session.timeout =${SERVER_SESSION_TIMEOUT:1800} -maxkey.auth.jwt.expires =600 +#jwt token +maxkey.auth.jwt.expires =${SERVER_EXPIRES:600} maxkey.auth.jwt.secret =7heM-14BtxjyKPuH3ITIm7q2-ps5MuBirWCsrrdbzzSAOuSPrbQYiaJ54AeA0uH2XdkYy3hHAkTFIsieGkyqxOJZ_dQzrCbaYISH9rhUZAKYx8tUY0wkE4ArOC6LqHDJarR6UIcMsARakK9U4dhoOPO1cj74XytemI-w6ACYfzRUn_Rn4e-CQMcnD1C56oNEukwalf06xVgXl41h6K8IBEzLVod58y_VfvFn-NGWpNG0fy_Qxng6dg8Dgva2DobvzMN2eejHGLGB-x809MvC4zbG7CKNVlcrzMYDt2Gt2sOVDrt2l9YqJNfgaLFjrOEVw5cuXemGkX1MvHj6TAsbLg +#must > jwt expire * 2 +maxkey.auth.jwt.refresh.expires =${SERVER_REFRESH_EXPIRES:1800} maxkey.auth.jwt.refresh.secret =7heM-14BtxjyKPuH3ITIm7q2-ps5MuBirWCsrrdbzzSAOuSPrbQYiaJ54AeA0uH2XdkYy3hHAkTFIsieGkyqxOJZ_dQzrCbaYISH9rhUZAKYx8tUY0wkE4ArOC6LqHDJarR6UIcMsARakK9U4dhoOPO1cj74XytemI-w6ACYfzRUn_Rn4e-CQMcnD1C56oNEukwalf06xVgXl41h6K8IBEzLVod58y_VfvFn-NGWpNG0fy_Qxng6dg8Dgva2DobvzMN2eejHGLGB-x809MvC4zbG7CKNVlcrzMYDt2Gt2sOVDrt2l9YqJNfgaLFjrOEVw5cuXemGkX1MvHj6TAsbLg maxkey.auth.jwt.issuer =${maxkey.server.uri} diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-maxkey-mgt.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-maxkey-mgt.properties index c4ae68a4d..6280133a5 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/application-maxkey-mgt.properties +++ b/maxkey-webs/maxkey-web-mgt/src/main/resources/application-maxkey-mgt.properties @@ -36,10 +36,11 @@ maxkey.server.persistence =${SERVER_PERSISTENCE:0} #identity true,false maxkey.server.provision =${SERVER_PROVISION:false} -maxkey.auth.session.timeout =${SERVER_SESSION_TIMEOUT:1800} -#default 900 -maxkey.auth.jwt.expires =900 +#jwt token +maxkey.auth.jwt.expires =${SERVER_EXPIRES:600} maxkey.auth.jwt.secret =7heM-14BtxjyKPuH3ITIm7q2-ps5MuBirWCsrrdbzzSAOuSPrbQYiaJ54AeA0uH2XdkYy3hHAkTFIsieGkyqxOJZ_dQzrCbaYISH9rhUZAKYx8tUY0wkE4ArOC6LqHDJarR6UIcMsARakK9U4dhoOPO1cj74XytemI-w6ACYfzRUn_Rn4e-CQMcnD1C56oNEukwalf06xVgXl41h6K8IBEzLVod58y_VfvFn-NGWpNG0fy_Qxng6dg8Dgva2DobvzMN2eejHGLGB-x809MvC4zbG7CKNVlcrzMYDt2Gt2sOVDrt2l9YqJNfgaLFjrOEVw5cuXemGkX1MvHj6TAsbLg +#must > jwt expire * 2 +maxkey.auth.jwt.refresh.expires =${SERVER_REFRESH_EXPIRES:1800} maxkey.auth.jwt.refresh.secret =7heM-14BtxjyKPuH3ITIm7q2-ps5MuBirWCsrrdbzzSAOuSPrbQYiaJ54AeA0uH2XdkYy3hHAkTFIsieGkyqxOJZ_dQzrCbaYISH9rhUZAKYx8tUY0wkE4ArOC6LqHDJarR6UIcMsARakK9U4dhoOPO1cj74XytemI-w6ACYfzRUn_Rn4e-CQMcnD1C56oNEukwalf06xVgXl41h6K8IBEzLVod58y_VfvFn-NGWpNG0fy_Qxng6dg8Dgva2DobvzMN2eejHGLGB-x809MvC4zbG7CKNVlcrzMYDt2Gt2sOVDrt2l9YqJNfgaLFjrOEVw5cuXemGkX1MvHj6TAsbLg maxkey.auth.jwt.issuer =${maxkey.server.uri} diff --git a/maxkey-webs/maxkey-web-openapi/src/main/resources/application-maxkey-openapi.properties b/maxkey-webs/maxkey-web-openapi/src/main/resources/application-maxkey-openapi.properties index 628efdd45..eba1b0c7a 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/resources/application-maxkey-openapi.properties +++ b/maxkey-webs/maxkey-web-openapi/src/main/resources/application-maxkey-openapi.properties @@ -36,10 +36,11 @@ maxkey.server.persistence =${SERVER_PERSISTENCE:0} #identity true,false maxkey.server.provision =${SERVER_PROVISION:false} -maxkey.auth.session.timeout =${SERVER_SESSION_TIMEOUT:1800} -#default 900 -maxkey.auth.jwt.expires =900 +#jwt token +maxkey.auth.jwt.expires =${SERVER_EXPIRES:600} maxkey.auth.jwt.secret =7heM-14BtxjyKPuH3ITIm7q2-ps5MuBirWCsrrdbzzSAOuSPrbQYiaJ54AeA0uH2XdkYy3hHAkTFIsieGkyqxOJZ_dQzrCbaYISH9rhUZAKYx8tUY0wkE4ArOC6LqHDJarR6UIcMsARakK9U4dhoOPO1cj74XytemI-w6ACYfzRUn_Rn4e-CQMcnD1C56oNEukwalf06xVgXl41h6K8IBEzLVod58y_VfvFn-NGWpNG0fy_Qxng6dg8Dgva2DobvzMN2eejHGLGB-x809MvC4zbG7CKNVlcrzMYDt2Gt2sOVDrt2l9YqJNfgaLFjrOEVw5cuXemGkX1MvHj6TAsbLg +#must > jwt expire * 2 +maxkey.auth.jwt.refresh.expires =${SERVER_REFRESH_EXPIRES:1800} maxkey.auth.jwt.refresh.secret =7heM-14BtxjyKPuH3ITIm7q2-ps5MuBirWCsrrdbzzSAOuSPrbQYiaJ54AeA0uH2XdkYy3hHAkTFIsieGkyqxOJZ_dQzrCbaYISH9rhUZAKYx8tUY0wkE4ArOC6LqHDJarR6UIcMsARakK9U4dhoOPO1cj74XytemI-w6ACYfzRUn_Rn4e-CQMcnD1C56oNEukwalf06xVgXl41h6K8IBEzLVod58y_VfvFn-NGWpNG0fy_Qxng6dg8Dgva2DobvzMN2eejHGLGB-x809MvC4zbG7CKNVlcrzMYDt2Gt2sOVDrt2l9YqJNfgaLFjrOEVw5cuXemGkX1MvHj6TAsbLg maxkey.auth.jwt.issuer =${maxkey.server.uri}