v3.5.16

build.gradle

@@ -218,7 +218,7 @@ subprojects {
          implementation group: 'org.apache.logging.log4j', name: 'log4j-jul', version: "${log4jVersion}"
          implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}"
          implementation group: 'org.apache.logging.log4j', name: 'log4j-web', version: "${log4jVersion}"
-        //logs
+         //logs
          implementation group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}"
          implementation group: 'org.jboss.logging', name: 'jboss-logging', version: "${jbossloggingVersion}"
          //spring
@@ -315,7 +315,7 @@ subprojects {
          // https://mvnrepository.com/artifact/org.eclipse.persistence/javax.persistence
          // for mybatis-jpa-extra
          implementation group: 'org.eclipse.persistence', name: 'javax.persistence', version: "${javaxpersistenceVersion}"
-         implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: '3.0.0'
+         implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: "${jakartapersistenceapiVersion}"
          implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: "${jakartaannotationVersion}"
          implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: "${jakartavalidationapiVersion}"
          implementation group: 'javax.activation', name: 'activation', version: "${activationVersion}"
@@ -347,7 +347,7 @@ subprojects {
          implementation group: 'org.quartz-scheduler', name: 'quartz', version: "${quartzVersion}"
          //database
          implementation group: 'com.mysql', name: 'mysql-connector-j', version: "${mysqlconnectorjavaVersion}"
-         implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}"
+         //implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}"
          implementation group: 'com.alibaba', name: 'druid', version: "${druidVersion}"
          implementation group: 'com.alibaba', name: 'druid-spring-boot-starter', version: "${druidspringbootstarterVersion}"
          implementation group: 'redis.clients', name: 'jedis', version: "${jedisVersion}"
@@ -391,17 +391,14 @@ subprojects {
          implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}"
          implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"
          implementation group: 'org.jsoup', name: 'jsoup', version: "${jsoupVersion}"
-         
          implementation group: 'io.netty', name: 'netty-all', version: "${nettyVersion}"
-          //阿里云
+         //阿里云
          implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}"
          // https://mvnrepository.com/artifact/io.opentracing/opentracing-util
-         implementation 'io.opentracing:opentracing-util:0.33.0'
+         implementation "io.opentracing:opentracing-util:${opentracingVersion}"
          // https://mvnrepository.com/artifact/io.opentracing/opentracing-api
-         implementation 'io.opentracing:opentracing-api:0.33.0'
-         implementation 'io.opentracing:opentracing-noop:0.33.0'
-
-
+         implementation "io.opentracing:opentracing-api:${opentracingVersion}"
+         implementation "io.opentracing:opentracing-noop:${opentracingVersion}"
          //腾讯云
          implementation group: 'com.tencentcloudapi', name: 'tencentcloud-sdk-java', version: "${tencentcloudsdkjavaVersion}"
          //json
@@ -420,25 +417,22 @@ subprojects {
          implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}"
          implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}"
          //docs
-         //implementation group: 'io.swagger', name: 'swagger-annotations', version: "${swaggerVersion}"
-         //implementation group: 'io.swagger', name: 'swagger-models', version: "${swaggerVersion}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-core', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-integration', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-models', version: "${swaggerV3Version}"
          //springdoc
-         implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.137'
+         implementation group: 'io.github.classgraph', name: 'classgraph', version: "${classgraphVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-common', version: "${springdocVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-webmvc-core', version: "${springdocVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: "${springdocVersion}"
-         implementation group: 'org.webjars', name: 'webjars-locator-core', version: '0.48'
-         implementation group: 'org.webjars', name: 'webjars-locator', version: '0.42'
-         implementation group: 'org.webjars', name: 'swagger-ui', version: '4.11.1'
+         implementation group: 'org.webjars', name: 'webjars-locator-core', version: "${webjarslocatorcoreVersion}"
+         implementation group: 'org.webjars', name: 'webjars-locator', version: "${webjarslocatorVersion}"
+         implementation group: 'org.webjars', name: 'swagger-ui', version: "${swaggeruiVersion}"
          //knife4j
          implementation group: 'com.github.xiaoymin', name: 'knife4j-core', version: "${knife4jVersion}"
          implementation group: 'com.github.xiaoymin', name: 'knife4j-openapi3-ui', version: "${knife4jVersion}"
          implementation group: 'com.github.xiaoymin', name: 'knife4j-openapi3-spring-boot-starter', version: "${knife4jVersion}"
-        
          //local jars
          implementation fileTree(dir: "${rootDir}/maxkey-lib/", include: '*.jar')
     }

config/build_docker.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright [2021] [MaxKey of copyright http://www.maxkey.top]
+ * Copyright [2023] [MaxKey of copyright http://www.maxkey.top]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -122,7 +122,7 @@ subprojects {
 	//all dependencies
     dependencies {
         
-        //for Test and Compile
+                //for Test and Compile
          testImplementation group: 'junit', name: 'junit', version: "${junitVersion}"
          compileOnly group: 'junit', name: 'junit', version: "${junitVersion}"
          testImplementation group: 'org.mockito', name: 'mockito-all', version: "${mockitoallVersion}"
@@ -180,7 +180,7 @@ subprojects {
          implementation group: 'org.apache.logging.log4j', name: 'log4j-jul', version: "${log4jVersion}"
          implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}"
          implementation group: 'org.apache.logging.log4j', name: 'log4j-web', version: "${log4jVersion}"
-        //logs
+         //logs
          implementation group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}"
          implementation group: 'org.jboss.logging', name: 'jboss-logging', version: "${jbossloggingVersion}"
          //spring
@@ -227,6 +227,8 @@ 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}"
@@ -236,7 +238,8 @@ 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}"
          //spring cloud
@@ -252,7 +255,7 @@ subprojects {
          implementation group: 'com.alibaba.cloud', name: 'spring-cloud-starter-alibaba-nacos-discovery', version: "${springcloudalibabaVersion}"
          implementation group: 'com.alibaba.cloud', name: 'spring-cloud-starter-alibaba-nacos-config', version: "${springcloudalibabaVersion}"
          
-         //Message Queue
+         //Message Queue Removed
          
          //saml see maxkey-lib
          //implementation group: 'org.opensaml', name: 'opensaml', version: "${opensamlVersion}"
@@ -274,7 +277,7 @@ subprojects {
          // https://mvnrepository.com/artifact/org.eclipse.persistence/javax.persistence
          // for mybatis-jpa-extra
          implementation group: 'org.eclipse.persistence', name: 'javax.persistence', version: "${javaxpersistenceVersion}"
-         implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: '3.0.0'
+         implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: "${jakartapersistenceapiVersion}"
          implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: "${jakartaannotationVersion}"
          implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: "${jakartavalidationapiVersion}"
          implementation group: 'javax.activation', name: 'activation', version: "${activationVersion}"
@@ -306,7 +309,7 @@ subprojects {
          implementation group: 'org.quartz-scheduler', name: 'quartz', version: "${quartzVersion}"
          //database
          implementation group: 'com.mysql', name: 'mysql-connector-j', version: "${mysqlconnectorjavaVersion}"
-         implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}"
+         //implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}"
          implementation group: 'com.alibaba', name: 'druid', version: "${druidVersion}"
          implementation group: 'com.alibaba', name: 'druid-spring-boot-starter', version: "${druidspringbootstarterVersion}"
          implementation group: 'redis.clients', name: 'jedis', version: "${jedisVersion}"
@@ -339,6 +342,7 @@ subprojects {
          implementation group: 'com.thoughtworks.xstream', name: 'xstream', version: "${xstreamVersion}"
          implementation group: 'org.passay', name: 'passay', version: "${passayVersion}"
          implementation group: 'io.micrometer', name: 'micrometer-core', version: "${micrometercoreVersion}"
+         implementation group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: "${micrometercoreVersion}"
          implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}"
          implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}"
          implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}"
@@ -349,10 +353,14 @@ subprojects {
          implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}"
          implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"
          implementation group: 'org.jsoup', name: 'jsoup', version: "${jsoupVersion}"
-         
          implementation group: 'io.netty', name: 'netty-all', version: "${nettyVersion}"
-          //阿里云
+         //阿里云
          implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}"
+         // https://mvnrepository.com/artifact/io.opentracing/opentracing-util
+         implementation "io.opentracing:opentracing-util:${opentracingVersion}"
+         // https://mvnrepository.com/artifact/io.opentracing/opentracing-api
+         implementation "io.opentracing:opentracing-api:${opentracingVersion}"
+         implementation "io.opentracing:opentracing-noop:${opentracingVersion}"
          //腾讯云
          implementation group: 'com.tencentcloudapi', name: 'tencentcloud-sdk-java', version: "${tencentcloudsdkjavaVersion}"
          //json
@@ -369,25 +377,24 @@ subprojects {
          implementation group: 'com.fasterxml', name: 'classmate', version: "${classmateVersion}"
          implementation group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: "${woodstoxVersion}"
          implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}"
-         //docs
          implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}"
-         //implementation group: 'io.swagger', name: 'swagger-annotations', version: "${swaggerVersion}"
-         //implementation group: 'io.swagger', name: 'swagger-models', version: "${swaggerVersion}"
+         //docs
          implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-core', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-integration', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-models', version: "${swaggerV3Version}"
          //springdoc
-         implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.137'
+         implementation group: 'io.github.classgraph', name: 'classgraph', version: "${classgraphVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-common', version: "${springdocVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-webmvc-core', version: "${springdocVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: "${springdocVersion}"
-         implementation group: 'org.webjars', name: 'webjars-locator-core', version: '0.48'
-         implementation group: 'org.webjars', name: 'webjars-locator', version: '0.42'
-         implementation group: 'org.webjars', name: 'swagger-ui', version: '4.1.3'
+         implementation group: 'org.webjars', name: 'webjars-locator-core', version: "${webjarslocatorcoreVersion}"
+         implementation group: 'org.webjars', name: 'webjars-locator', version: "${webjarslocatorVersion}"
+         implementation group: 'org.webjars', name: 'swagger-ui', version: "${swaggeruiVersion}"
          //knife4j
-         implementation group: 'com.github.xiaoymin', name: 'knife4j-springdoc-ui', version: "${knife4jVersion}"
-        
+         implementation group: 'com.github.xiaoymin', name: 'knife4j-core', version: "${knife4jVersion}"
+         implementation group: 'com.github.xiaoymin', name: 'knife4j-openapi3-ui', version: "${knife4jVersion}"
+         implementation group: 'com.github.xiaoymin', name: 'knife4j-openapi3-spring-boot-starter', version: "${knife4jVersion}"
          //local jars
          implementation fileTree(dir: "${rootDir}/maxkey-lib/", include: '*.jar')
     }

config/build_jar.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright [2021] [MaxKey of copyright http://www.maxkey.top]
+ * Copyright [2023] [MaxKey of copyright http://www.maxkey.top]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -121,7 +121,7 @@ subprojects {
 	//all dependencies
     dependencies {
         
-        //for Test and Compile
+                //for Test and Compile
          testImplementation group: 'junit', name: 'junit', version: "${junitVersion}"
          compileOnly group: 'junit', name: 'junit', version: "${junitVersion}"
          testImplementation group: 'org.mockito', name: 'mockito-all', version: "${mockitoallVersion}"
@@ -179,7 +179,7 @@ subprojects {
          implementation group: 'org.apache.logging.log4j', name: 'log4j-jul', version: "${log4jVersion}"
          implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}"
          implementation group: 'org.apache.logging.log4j', name: 'log4j-web', version: "${log4jVersion}"
-        //logs
+         //logs
          implementation group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}"
          implementation group: 'org.jboss.logging', name: 'jboss-logging', version: "${jbossloggingVersion}"
          //spring
@@ -205,7 +205,7 @@ subprojects {
          //implementation group: 'org.springframework', name: 'spring-websocket', version: "${springVersion}"
          // https://mvnrepository.com/artifact/org.springframework.retry/spring-retry
          implementation group: 'org.springframework.retry', name: 'spring-retry', version: "${springretryVersion}"
-         testImplementation  group: 'org.springframework', name: 'spring-test', version: "${springVersion}"
+         testImplementation group: 'org.springframework', name: 'spring-test', version: "${springVersion}"
          
          //spring-security
          implementation group: 'org.springframework.security', name: 'spring-security-core', version: "${springSecurityVersion}"
@@ -226,6 +226,8 @@ 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}"
@@ -235,7 +237,8 @@ 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}"
          //spring cloud
@@ -251,8 +254,8 @@ subprojects {
          implementation group: 'com.alibaba.cloud', name: 'spring-cloud-starter-alibaba-nacos-discovery', version: "${springcloudalibabaVersion}"
          implementation group: 'com.alibaba.cloud', name: 'spring-cloud-starter-alibaba-nacos-config', version: "${springcloudalibabaVersion}"
          
-         //Message Queue
-
+         //Message Queue Removed
+         
          //saml see maxkey-lib
          //implementation group: 'org.opensaml', name: 'opensaml', version: "${opensamlVersion}"
          //implementation group: 'org.opensaml', name: 'openws', version: "${openwsVersion}"
@@ -273,7 +276,7 @@ subprojects {
          // https://mvnrepository.com/artifact/org.eclipse.persistence/javax.persistence
          // for mybatis-jpa-extra
          implementation group: 'org.eclipse.persistence', name: 'javax.persistence', version: "${javaxpersistenceVersion}"
-         implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: '3.0.0'
+         implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: "${jakartapersistenceapiVersion}"
          implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: "${jakartaannotationVersion}"
          implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: "${jakartavalidationapiVersion}"
          implementation group: 'javax.activation', name: 'activation', version: "${activationVersion}"
@@ -305,7 +308,7 @@ subprojects {
          implementation group: 'org.quartz-scheduler', name: 'quartz', version: "${quartzVersion}"
          //database
          implementation group: 'com.mysql', name: 'mysql-connector-j', version: "${mysqlconnectorjavaVersion}"
-         implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}"
+         //implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}"
          implementation group: 'com.alibaba', name: 'druid', version: "${druidVersion}"
          implementation group: 'com.alibaba', name: 'druid-spring-boot-starter', version: "${druidspringbootstarterVersion}"
          implementation group: 'redis.clients', name: 'jedis', version: "${jedisVersion}"
@@ -338,6 +341,7 @@ subprojects {
          implementation group: 'com.thoughtworks.xstream', name: 'xstream', version: "${xstreamVersion}"
          implementation group: 'org.passay', name: 'passay', version: "${passayVersion}"
          implementation group: 'io.micrometer', name: 'micrometer-core', version: "${micrometercoreVersion}"
+         implementation group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: "${micrometercoreVersion}"
          implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}"
          implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}"
          implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}"
@@ -348,10 +352,14 @@ subprojects {
          implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}"
          implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"
          implementation group: 'org.jsoup', name: 'jsoup', version: "${jsoupVersion}"
-         
          implementation group: 'io.netty', name: 'netty-all', version: "${nettyVersion}"
-          //阿里云
+         //阿里云
          implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}"
+         // https://mvnrepository.com/artifact/io.opentracing/opentracing-util
+         implementation "io.opentracing:opentracing-util:${opentracingVersion}"
+         // https://mvnrepository.com/artifact/io.opentracing/opentracing-api
+         implementation "io.opentracing:opentracing-api:${opentracingVersion}"
+         implementation "io.opentracing:opentracing-noop:${opentracingVersion}"
          //腾讯云
          implementation group: 'com.tencentcloudapi', name: 'tencentcloud-sdk-java', version: "${tencentcloudsdkjavaVersion}"
          //json
@@ -368,25 +376,24 @@ subprojects {
          implementation group: 'com.fasterxml', name: 'classmate', version: "${classmateVersion}"
          implementation group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: "${woodstoxVersion}"
          implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}"
-         //docs
          implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}"
-         //implementation group: 'io.swagger', name: 'swagger-annotations', version: "${swaggerVersion}"
-         //implementation group: 'io.swagger', name: 'swagger-models', version: "${swaggerVersion}"
+         //docs
          implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-core', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-integration', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-models', version: "${swaggerV3Version}"
          //springdoc
-         implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.137'
+         implementation group: 'io.github.classgraph', name: 'classgraph', version: "${classgraphVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-common', version: "${springdocVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-webmvc-core', version: "${springdocVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: "${springdocVersion}"
-         implementation group: 'org.webjars', name: 'webjars-locator-core', version: '0.48'
-         implementation group: 'org.webjars', name: 'webjars-locator', version: '0.42'
-         implementation group: 'org.webjars', name: 'swagger-ui', version: '4.1.3'
+         implementation group: 'org.webjars', name: 'webjars-locator-core', version: "${webjarslocatorcoreVersion}"
+         implementation group: 'org.webjars', name: 'webjars-locator', version: "${webjarslocatorVersion}"
+         implementation group: 'org.webjars', name: 'swagger-ui', version: "${swaggeruiVersion}"
          //knife4j
-         implementation group: 'com.github.xiaoymin', name: 'knife4j-springdoc-ui', version: "${knife4jVersion}"
-        
+         implementation group: 'com.github.xiaoymin', name: 'knife4j-core', version: "${knife4jVersion}"
+         implementation group: 'com.github.xiaoymin', name: 'knife4j-openapi3-ui', version: "${knife4jVersion}"
+         implementation group: 'com.github.xiaoymin', name: 'knife4j-openapi3-spring-boot-starter', version: "${knife4jVersion}"
          //local jars
          implementation fileTree(dir: "${rootDir}/maxkey-lib/", include: '*.jar')
     }

config/build_standard.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright [2021] [MaxKey of copyright http://www.maxkey.top]
+ * Copyright [2023] [MaxKey of copyright http://www.maxkey.top]
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,7 +159,7 @@ subprojects {
     //all dependencies
     dependencies {
         
-        //for Test and Compile
+                //for Test and Compile
          testImplementation group: 'junit', name: 'junit', version: "${junitVersion}"
          compileOnly group: 'junit', name: 'junit', version: "${junitVersion}"
          testImplementation group: 'org.mockito', name: 'mockito-all', version: "${mockitoallVersion}"
@@ -217,7 +217,7 @@ subprojects {
          implementation group: 'org.apache.logging.log4j', name: 'log4j-jul', version: "${log4jVersion}"
          implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}"
          implementation group: 'org.apache.logging.log4j', name: 'log4j-web', version: "${log4jVersion}"
-        //logs
+         //logs
          implementation group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}"
          implementation group: 'org.jboss.logging', name: 'jboss-logging', version: "${jbossloggingVersion}"
          //spring
@@ -243,7 +243,7 @@ subprojects {
          //implementation group: 'org.springframework', name: 'spring-websocket', version: "${springVersion}"
          // https://mvnrepository.com/artifact/org.springframework.retry/spring-retry
          implementation group: 'org.springframework.retry', name: 'spring-retry', version: "${springretryVersion}"
-         testImplementation  group: 'org.springframework', name: 'spring-test', version: "${springVersion}"
+         testImplementation group: 'org.springframework', name: 'spring-test', version: "${springVersion}"
          
          //spring-security
          implementation group: 'org.springframework.security', name: 'spring-security-core', version: "${springSecurityVersion}"
@@ -264,6 +264,8 @@ 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}"
@@ -273,7 +275,8 @@ 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}"
          //spring cloud
@@ -289,8 +292,8 @@ subprojects {
          implementation group: 'com.alibaba.cloud', name: 'spring-cloud-starter-alibaba-nacos-discovery', version: "${springcloudalibabaVersion}"
          implementation group: 'com.alibaba.cloud', name: 'spring-cloud-starter-alibaba-nacos-config', version: "${springcloudalibabaVersion}"
          
-         //Message Queue
-
+         //Message Queue Removed
+         
          //saml see maxkey-lib
          //implementation group: 'org.opensaml', name: 'opensaml', version: "${opensamlVersion}"
          //implementation group: 'org.opensaml', name: 'openws', version: "${openwsVersion}"
@@ -311,7 +314,7 @@ subprojects {
          // https://mvnrepository.com/artifact/org.eclipse.persistence/javax.persistence
          // for mybatis-jpa-extra
          implementation group: 'org.eclipse.persistence', name: 'javax.persistence', version: "${javaxpersistenceVersion}"
-         implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: '3.0.0'
+         implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: "${jakartapersistenceapiVersion}"
          implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: "${jakartaannotationVersion}"
          implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: "${jakartavalidationapiVersion}"
          implementation group: 'javax.activation', name: 'activation', version: "${activationVersion}"
@@ -343,7 +346,7 @@ subprojects {
          implementation group: 'org.quartz-scheduler', name: 'quartz', version: "${quartzVersion}"
          //database
          implementation group: 'com.mysql', name: 'mysql-connector-j', version: "${mysqlconnectorjavaVersion}"
-         implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}"
+         //implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}"
          implementation group: 'com.alibaba', name: 'druid', version: "${druidVersion}"
          implementation group: 'com.alibaba', name: 'druid-spring-boot-starter', version: "${druidspringbootstarterVersion}"
          implementation group: 'redis.clients', name: 'jedis', version: "${jedisVersion}"
@@ -376,6 +379,7 @@ subprojects {
          implementation group: 'com.thoughtworks.xstream', name: 'xstream', version: "${xstreamVersion}"
          implementation group: 'org.passay', name: 'passay', version: "${passayVersion}"
          implementation group: 'io.micrometer', name: 'micrometer-core', version: "${micrometercoreVersion}"
+         implementation group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: "${micrometercoreVersion}"
          implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}"
          implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}"
          implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}"
@@ -386,10 +390,14 @@ subprojects {
          implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}"
          implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"
          implementation group: 'org.jsoup', name: 'jsoup', version: "${jsoupVersion}"
-         
          implementation group: 'io.netty', name: 'netty-all', version: "${nettyVersion}"
-          //阿里云
+         //阿里云
          implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}"
+         // https://mvnrepository.com/artifact/io.opentracing/opentracing-util
+         implementation "io.opentracing:opentracing-util:${opentracingVersion}"
+         // https://mvnrepository.com/artifact/io.opentracing/opentracing-api
+         implementation "io.opentracing:opentracing-api:${opentracingVersion}"
+         implementation "io.opentracing:opentracing-noop:${opentracingVersion}"
          //腾讯云
          implementation group: 'com.tencentcloudapi', name: 'tencentcloud-sdk-java', version: "${tencentcloudsdkjavaVersion}"
          //json
@@ -406,25 +414,24 @@ subprojects {
          implementation group: 'com.fasterxml', name: 'classmate', version: "${classmateVersion}"
          implementation group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: "${woodstoxVersion}"
          implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}"
-         //docs
          implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}"
-         //implementation group: 'io.swagger', name: 'swagger-annotations', version: "${swaggerVersion}"
-         //implementation group: 'io.swagger', name: 'swagger-models', version: "${swaggerVersion}"
+         //docs
          implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-core', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-integration', version: "${swaggerV3Version}"
          implementation group: 'io.swagger.core.v3', name: 'swagger-models', version: "${swaggerV3Version}"
          //springdoc
-         implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.137'
+         implementation group: 'io.github.classgraph', name: 'classgraph', version: "${classgraphVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-common', version: "${springdocVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-webmvc-core', version: "${springdocVersion}"
          implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: "${springdocVersion}"
-         implementation group: 'org.webjars', name: 'webjars-locator-core', version: '0.48'
-         implementation group: 'org.webjars', name: 'webjars-locator', version: '0.42'
-         implementation group: 'org.webjars', name: 'swagger-ui', version: '4.1.3'
+         implementation group: 'org.webjars', name: 'webjars-locator-core', version: "${webjarslocatorcoreVersion}"
+         implementation group: 'org.webjars', name: 'webjars-locator', version: "${webjarslocatorVersion}"
+         implementation group: 'org.webjars', name: 'swagger-ui', version: "${swaggeruiVersion}"
          //knife4j
-         implementation group: 'com.github.xiaoymin', name: 'knife4j-springdoc-ui', version: "${knife4jVersion}"
-        
+         implementation group: 'com.github.xiaoymin', name: 'knife4j-core', version: "${knife4jVersion}"
+         implementation group: 'com.github.xiaoymin', name: 'knife4j-openapi3-ui', version: "${knife4jVersion}"
+         implementation group: 'com.github.xiaoymin', name: 'knife4j-openapi3-spring-boot-starter', version: "${knife4jVersion}"
          //local jars
          implementation fileTree(dir: "${rootDir}/maxkey-lib/", include: '*.jar')
     }

gradle.properties

@@ -15,7 +15,7 @@
 # */
 #maxkey properties 
 group                           =net.maxsso
-version                         =3.5.15
+version                         =3.5.16
 vendor                          =https://www.maxkey.top
 author                          =MaxKeyTop
 
@@ -64,7 +64,7 @@ rocketmqspringbootVersion       =2.2.2
 tomcatVersion                   =9.0.71
 tomcatembedloggingjuliVersion   =8.5.2
 #spring 
-springVersion                   =5.3.25
+springVersion                   =5.3.26
 springBootVersion               =2.7.9
 springSecurityVersion           =5.7.7
 springDataVersion               =2.7.8
@@ -91,6 +91,10 @@ jbossloggingVersion             =3.4.3.Final
 hibernateVersion                =6.2.5.Final
 #doc
 swaggerV3Version                =2.2.8
+classgraphVersion               =4.8.137
+webjarslocatorcoreVersion       =0.48
+webjarslocatorVersion           =0.42
+swaggeruiVersion                =4.11.1
 springdocVersion                =1.6.15
 knife4jVersion                  =4.0.0
 #database
@@ -114,6 +118,7 @@ nettyVersion                    =4.1.65.Final
 hazelcastVersion                =4.2.2
 jakartaannotationVersion        =2.0.0
 jakartavalidationapiVersion     =3.0.0
+jakartapersistenceapiVersion    =3.0.0
 attoparserVersion               =2.0.5.RELEASE
 unbescapeVersion                =1.1.6.RELEASE
 slf4jVersion                    =1.7.36
@@ -178,6 +183,7 @@ prometheusVersion               =0.16.0
 LatencyUtilsVersion             =2.0.3
 stax2apiVersion                 =4.2.1
 mapstructVersion                =1.4.1.Final
+opentracingVersion              =0.33.0
 ip2regionVersion                =2.6.5
 #sdk
 aliyunjavasdkcoreVersion        =4.5.1

maxkey-web-frontend/maxkey-web-app/src/app/shared/consts.ts

@@ -26,5 +26,5 @@ export const CONSTS = {
   REDIRECT_URI: 'redirect_uri',
   REMEMBER: 'remember_me',
   TOKEN: '_token',
-  VERSION: 'v3.5.15 GA'
+  VERSION: 'v3.5.16 GA'
 };

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.15 GA'
+  VERSION: 'v3.5.16 GA'
 };

maxkey-webs/maxkey-gataway/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 #端口号
 application:
   name: maxkey-gateway-server
-  formatted-version: v3.5.15 GA
+  formatted-version: v3.5.16 GA
 server:
   port: 9000
 spring:

maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties

@@ -16,7 +16,7 @@
 #MaxKey Title and Version                                                  #
 ############################################################################
 application.title                           =MaxKey
-application.formatted-version               =v3.5.15 GA
+application.formatted-version               =v3.5.16 GA
 #for dynamic service discovery
 spring.application.name                     =maxkey
 ############################################################################

maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties

@@ -16,7 +16,7 @@
 #MaxKey Title and Version                                                  #
 ############################################################################
 application.title                               =MaxKey-Mgt
-application.formatted-version                   =v3.5.15 GA
+application.formatted-version                   =v3.5.16 GA
 #for dynamic service discovery
 spring.application.name                         =maxkey-mgt
 ############################################################################