From 208435cec1950f0c1390e1c626c5b0be082089b7 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Fri, 5 Aug 2022 06:48:01 +0800 Subject: [PATCH] remove spring redis --- config/build_docker.gradle | 3 --- config/build_jar.gradle | 3 --- config/build_standard.gradle | 3 --- .../maxkey-web-app/src/app/shared/consts.ts | 24 +++++++++---------- .../src/app/shared/consts.ts | 2 +- release_frontend_docker.bat | 2 +- 6 files changed, 14 insertions(+), 23 deletions(-) diff --git a/config/build_docker.gradle b/config/build_docker.gradle index b46525d53..de66e8705 100644 --- a/config/build_docker.gradle +++ b/config/build_docker.gradle @@ -228,8 +228,6 @@ subprojects { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: "${springBootVersion}" - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis', version: "${springBootVersion}" - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis-reactive', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation', version: "${springBootVersion}" testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: "${springBootVersion}" @@ -239,7 +237,6 @@ subprojects { //spring-data implementation group: 'org.springframework.data', name: 'spring-data-commons', version: "${springDataVersion}" implementation group: 'org.springframework.data', name: 'spring-data-keyvalue', version: "${springDataVersion}" - //implementation group: 'org.springframework.data', name: 'spring-data-redis', version: "${springDataVersion}" //implementation group: 'org.springframework.plugin', name: 'spring-plugin-core', version: "${springplugincoreVersion}" //implementation group: 'org.springframework.plugin', name: 'spring-plugin-metadata', version: "${springpluginmetadataVersion}" diff --git a/config/build_jar.gradle b/config/build_jar.gradle index f3db2816b..b145e72b1 100644 --- a/config/build_jar.gradle +++ b/config/build_jar.gradle @@ -228,8 +228,6 @@ subprojects { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: "${springBootVersion}" - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis', version: "${springBootVersion}" - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis-reactive', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation', version: "${springBootVersion}" testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: "${springBootVersion}" @@ -239,7 +237,6 @@ subprojects { //spring-data implementation group: 'org.springframework.data', name: 'spring-data-commons', version: "${springDataVersion}" implementation group: 'org.springframework.data', name: 'spring-data-keyvalue', version: "${springDataVersion}" - //implementation group: 'org.springframework.data', name: 'spring-data-redis', version: "${springDataVersion}" //implementation group: 'org.springframework.plugin', name: 'spring-plugin-core', version: "${springplugincoreVersion}" //implementation group: 'org.springframework.plugin', name: 'spring-plugin-metadata', version: "${springpluginmetadataVersion}" diff --git a/config/build_standard.gradle b/config/build_standard.gradle index 783654c54..b18ba4343 100644 --- a/config/build_standard.gradle +++ b/config/build_standard.gradle @@ -264,8 +264,6 @@ subprojects { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: "${springBootVersion}" - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis', version: "${springBootVersion}" - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis-reactive', version: "${springBootVersion}" implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation', version: "${springBootVersion}" testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: "${springBootVersion}" @@ -275,7 +273,6 @@ subprojects { //spring-data implementation group: 'org.springframework.data', name: 'spring-data-commons', version: "${springDataVersion}" implementation group: 'org.springframework.data', name: 'spring-data-keyvalue', version: "${springDataVersion}" - // implementation group: 'org.springframework.data', name: 'spring-data-redis', version: "${springDataVersion}" //implementation group: 'org.springframework.plugin', name: 'spring-plugin-core', version: "${springplugincoreVersion}" //implementation group: 'org.springframework.plugin', name: 'spring-plugin-metadata', version: "${springpluginmetadataVersion}" diff --git a/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts b/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts index e8e9756dd..19d962623 100644 --- a/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts +++ b/maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts @@ -15,16 +15,16 @@ */ export const CONSTS = { - // Regular expression to check if string is a IP v4 address - IP_V4_REGEXEXP: /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/gi, - // Regular expression to check if string is a IPv6 address - IP_V6_REGEXEXP: - /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/gi, - INST: 'inst', - CONGRESS: 'congress', - ONLINE_TICKET: 'online_ticket', - REDIRECT_URI: 'redirect_uri', - REMEMBER: 'remember_me', - TOKEN: '_token', - VERSION: 'v3.5.2 GA' + // Regular expression to check if string is a IP v4 address + IP_V4_REGEXEXP: /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/gi, + // Regular expression to check if string is a IPv6 address + IP_V6_REGEXEXP: + /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/gi, + INST: 'inst', + CONGRESS: 'congress', + ONLINE_TICKET: 'online_ticket', + REDIRECT_URI: 'redirect_uri', + REMEMBER: 'remember_me', + TOKEN: '_token', + VERSION: 'v3.5.4 GA' }; diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts index 6ef09019e..cafdfcec8 100644 --- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts +++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/shared/consts.ts @@ -19,5 +19,5 @@ export const CONSTS = { INST: 'inst', REDIRECT_URI: 'redirect_uri', REMEMBER: 'remember', - VERSION: 'v3.5.2 GA' + VERSION: 'v3.5.4 GA' }; diff --git a/release_frontend_docker.bat b/release_frontend_docker.bat index 99227507e..77b563d90 100644 --- a/release_frontend_docker.bat +++ b/release_frontend_docker.bat @@ -1,6 +1,6 @@ echo off -set MXK_VERSION=3.5.3 +set MXK_VERSION=3.5.4 set MXK_REPOSITORY=maxkeytop set START_TIME="%date:~0,10% %time:~0,2%:%time:~3,5%"