springBootVersion 4.1.0

build.gradle

@@ -136,11 +136,19 @@ subprojects {
     //all dependencies
     dependencies {
         //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}"
-        testImplementation group: 'org.xmlunit', name: 'xmlunit-legacy', version: "${xmlunitVersion}"
-        testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: "${xmlunitVersion}"
+        testImplementation group: "org.junit.jupiter", name: "junit-jupiter", version: "${junitVersion}"
+		testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: "${junitVersion}"
+		testImplementation group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "${junitVersion}"
+		testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: "${junitVersion}"
+		testImplementation group: "org.junit.platform", name: "junit-platform-commons", version: "${junitVersion}"
+		testImplementation group: "org.junit.platform", name: "junit-platform-engine", version: "${junitVersion}"
+		testImplementation group: "org.apiguardian", name: "apiguardian-api", version: "1.1.2"
+		testImplementation group: "org.opentest4j", name: "opentest4j", version: "1.3.0"
+
+        testImplementation group: "org.mockito", name: "mockito-all", version: "${mockitoallVersion}"
+		testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: "${xmlunitVersion}"
+		testImplementation group: "org.xmlunit", name: "xmlunit-legacy", version: "${xmlunitVersion}"
+		
         //apache
         implementation group: 'commons-beanutils', name: 'commons-beanutils', version: "${commonsbeanutilsVersion}"
         implementation group: 'commons-codec', name: 'commons-codec', version: "${commonscodecVersion}"
@@ -211,7 +219,7 @@ subprojects {
         implementation group: 'org.springframework', name: 'spring-context-support', version: "${springVersion}"
         implementation group: 'org.springframework', name: 'spring-expression', version: "${springVersion}"
         //implementation group: 'org.springframework', name: 'spring-instrument', version: "${springVersion}"
-        implementation group: 'org.springframework', name: 'spring-jcl', version: "${springVersion}"
+        //implementation group: 'org.springframework', name: 'spring-jcl', version: "${springVersion}"
         implementation group: 'org.springframework', name: 'spring-jdbc', version: "${springVersion}"
         //implementation group: 'org.springframework', name: 'spring-jms', version: "${springVersion}"
         implementation group: 'org.springframework', name: 'spring-messaging', version: "${springVersion}"
@@ -231,24 +239,41 @@ subprojects {
         implementation group: 'org.springframework.security', name: 'spring-security-web', version: "${springSecurityVersion}"
         implementation group: 'org.springframework.security', name: 'spring-security-crypto', version: "${springSecurityVersion}"
         //srpingboot
-        implementation group: 'org.springframework.boot', name: 'spring-boot', version: "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-starter', version:  "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-actuator', version:  "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version:  "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-actuator-autoconfigure', version:  "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-autoconfigure', version:  "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-starter-freemarker', version:  "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-starter-json', version: "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-starter-log4j2', version:  "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-starter-logging', version: "${springBootVersion}"
-        implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:  "${springBootVersion}"
-        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}"
+		implementation group: "org.springframework.boot", name: "spring-boot", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-actuator", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-actuator-autoconfigure", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-autoconfigure", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-freemarker", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-kafka", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-webflux", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-health", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-http-codec", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-http-converter", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-jackson", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-jdbc", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-persistence", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-quartz", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-security", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-sql", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-servlet", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-tomcat", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-transaction", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-webmvc", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-web-server", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-actuator", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-freemarker", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-jackson", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-jdbc", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-json", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-log4j2", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-reactor-netty", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-security", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-tomcat", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-web", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-webflux", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-test", version: "${springBootVersion}"
+		implementation group: "org.springframework.boot", name: "spring-boot-starter-validation", version: "${springBootVersion}"
         //spring-boot-admin
         implementation group: 'de.codecentric', name: 'spring-boot-admin-client', version: "${springbootadminVersion}"
         implementation group: 'de.codecentric', name: 'spring-boot-admin-starter-client', version: "${springbootadminVersion}"
@@ -264,14 +289,14 @@ subprojects {
         implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter', version: "${springcloudVersion}"
         implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: "${springcloudVersion}"
         //spring-cloud-alibaba
-        implementation group: 'com.alibaba.spring', name: 'spring-context-support', version: "${springcloudalibabaspringVersion}"
-        implementation group: 'com.alibaba.cloud', name: 'spring-cloud-alibaba-commons', version: "${springcloudalibabaVersion}"
+        //implementation group: 'com.alibaba.spring', name: 'spring-context-support', version: "${springcloudalibabaspringVersion}"
+        //implementation group: 'com.alibaba.cloud', name: 'spring-cloud-alibaba-commons', version: "${springcloudalibabaVersion}"
         //alibaba nacos
-        implementation group: 'com.alibaba.nacos', name: 'nacos-client', version: "${alibabanacosclientVersion}"
-        implementation group: 'com.alibaba.nacos', name: 'nacos-auth-plugin', version: "${alibabanacosclientVersion}"
-        implementation group: 'com.alibaba.nacos', name: 'nacos-encryption-plugin', version: "${alibabanacosclientVersion}"
-        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}"
+        //implementation group: 'com.alibaba.nacos', name: 'nacos-client', version: "${alibabanacosclientVersion}"
+        //implementation group: 'com.alibaba.nacos', name: 'nacos-auth-plugin', version: "${alibabanacosclientVersion}"
+        //implementation group: 'com.alibaba.nacos', name: 'nacos-encryption-plugin', version: "${alibabanacosclientVersion}"
+        //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}"
         //saml see maxkey-lib
         //implementation group: 'org.opensaml', name: 'opensaml', version: "${opensamlVersion}"
         //implementation group: 'org.opensaml', name: 'openws', version: "${openwsVersion}"
@@ -279,7 +304,7 @@ subprojects {
         implementation group: 'net.shibboleth.utilities', name: 'java-support', version: "${javasupportVersion}"
         //jose-jwt
         implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: "${nimbusjosejwtVersion}"
-        implementation group: 'com.github.stephenc.jcip', name: 'jcip-annotations', version: "${jcipannotationsVersion}"
+        //implementation group: 'com.github.stephenc.jcip', name: 'jcip-annotations', version: "${jcipannotationsVersion}"
         implementation group: 'net.minidev', name: 'json-smart', version: "${minidevjsonsmartVersion}"
         implementation group: 'net.minidev', name: 'asm', version: "${minidevasmVersion}"
         //oauth third party JustAuth
@@ -306,8 +331,9 @@ subprojects {
         implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: "${xmlbindjaxbimplVersion}"
         implementation group: 'com.sun.xml.bind', name: 'jaxb-xjc',  version: "${xmlbindjaxbxjcVersion}"
         //crypto
-        implementation group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}"
-        implementation group: 'org.bouncycastle', name: 'bcprov-ext-jdk18on', version: "${bouncycastleVersion}"
+        implementation group: "org.bouncycastle", name: "bcpkix-jdk18on", version: "${bouncycastleVersion}"
+		implementation group: "org.bouncycastle", name: "bcprov-jdk18on", version: "${bouncycastleVersion}"
+		implementation group: "org.bouncycastle", name: "bcutil-jdk18on", version: "${bouncycastleVersion}"
         //google
         implementation group: 'com.google.crypto.tink', name: 'tink', version: "${tinkVersion}"
         //kaptcha
@@ -315,19 +341,23 @@ subprojects {
         implementation group: 'com.github.penggle', name: 'kaptcha', version: "${kaptchaVersion}"
         //json-gson
         implementation group: 'com.google.code.gson', name: 'gson', version: "${gsonVersion}"
-        //json-jackson
-        implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jdk8', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-parameter-names', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jaxb-annotations', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-jakarta-xmlbind-annotations', version: "${jacksonVersion}"
-        implementation group: 'com.fasterxml', name: 'classmate', version: "${classmateVersion}"
-        implementation group: 'com.fasterxml.woodstox', name: 'woodstox-core', version: "${woodstoxVersion}"
+        //json-jackson 3
+		implementation group: "tools.jackson.core", name: "jackson-core", version: "${jackson3Version}"
+		implementation group: "tools.jackson.core", name: "jackson-databind", version: "${jackson3Version}"
+		//jackson2
+		implementation group: "com.fasterxml", name: "classmate", version: "${classmateVersion}"
+		implementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "${jacksonAnnotationsVersion}"
+		implementation group: "com.fasterxml.woodstox", name: "woodstox-core", version: "${woodstoxVersion}"
+		implementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: "${jacksonVersion}"
+		implementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "${jacksonVersion}"
+		implementation group: "com.fasterxml.jackson.dataformat", name: "jackson-dataformat-cbor", version: "${jacksonVersion}"
+		implementation group: "com.fasterxml.jackson.dataformat", name: "jackson-dataformat-xml", version: "${jacksonVersion}"
+		implementation group: "com.fasterxml.jackson.dataformat", name: "jackson-dataformat-yaml", version: "${jacksonVersion}"
+		implementation group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jdk8", version: "${jacksonVersion}"
+		implementation group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jsr310", version: "${jacksonVersion}"
+		implementation group: "com.fasterxml.jackson.module", name: "jackson-module-jakarta-xmlbind-annotations", version: "${jacksonVersion}"
+		implementation group: "com.fasterxml.jackson.module", name: "jackson-module-jaxb-annotations", version: "${jacksonVersion}"
+		implementation group: "com.fasterxml.jackson.module", name: "jackson-module-parameter-names", version: "${jacksonVersion}"
         //json-fastjson
         implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}"
         //reactive
@@ -338,20 +368,58 @@ subprojects {
         implementation group: 'com.mysql', name: 'mysql-connector-j', version: "${mysqlconnectorjVersion}"
         //implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}"
         implementation group: 'com.alibaba', name: 'druid', version: "${druidVersion}"
-        implementation group: 'com.alibaba', name: 'druid-spring-boot-3-starter', version: "${druidspringbootstarterVersion}"
+        implementation group: 'com.alibaba', name: 'druid-spring-boot-4-starter', version: "${druidspringbootstarterVersion}"
         implementation group: 'redis.clients', name: 'jedis', version: "${jedisVersion}"
         implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: "${caffeineVersion}"
         //mybatis
         implementation group: 'org.mybatis', name: 'mybatis', version: "${mybatisVersion}"
         implementation group: 'org.mybatis', name: 'mybatis-spring', version: "${mybatisspringVersion}"
         implementation group: 'org.dromara.mybatis-jpa-extra', name: 'mybatis-jpa-extra', version: "${mybatisjpaextraVersion}"
+        implementation group: 'org.dromara.mybatis-jpa-extra', name: 'mybatis-jpa-extra-spring', version: "${mybatisjpaextraVersion}"
         implementation group: 'org.dromara.mybatis-jpa-extra', name: 'mybatis-jpa-extra-spring-boot-starter', version: "${mybatisjpaextraVersion}"
         //hibernate
-        implementation group: 'org.hibernate.validator', name: 'hibernate-validator', version: "${hibernateVersion}"
-        implementation group: 'org.hibernate', name: 'hibernate-validator-cdi', version: "${hibernateVersion}"
-        implementation group: 'org.hibernate.validator', name: 'hibernate-validator-annotation-processor', version: "${hibernateVersion}"
+        implementation group: "org.hibernate.validator", name: "hibernate-validator", version: "${hibernateVersion}"
+		implementation group: "org.hibernate.validator", name: "hibernate-validator-annotation-processor", version: "${hibernateVersion}"
+		implementation group: "org.hibernate.validator", name: "hibernate-validator-cdi", version: "${hibernateVersion}"
         //usefull
+        //netty
+		implementation group: "io.netty", name: "netty-buffer", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-base", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-dns", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-haproxy", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-compression", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-http", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-http2", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-http3", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-transport-native-unix-common", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-memcache", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-mqtt", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-redis", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-smtp", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-socks", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-stomp", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-xml", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-protobuf", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-marshalling", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-common", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-handler", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-handler-proxy", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-handler-ssl-ocsp", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-resolver", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-resolver-dns", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-transport", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-transport-rxtx", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-transport-sctp", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-transport-udt", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-transport-classes-epoll", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-transport-classes-kqueue", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-resolver-dns-classes-macos", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-transport-classes-io_uring", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-codec-classes-quic", version: "${nettyVersion}"
+		implementation group: "io.netty", name: "netty-all", version: "${nettyVersion}"
         implementation group: 'io.netty', name: 'netty-all', version: "${nettyVersion}"
+        implementation group: 'org.jspecify', name: 'jspecify', version: '1.0.0'
         implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"
         implementation group: 'org.jsoup', name: 'jsoup', version: "${jsoupVersion}"
         implementation group: 'joda-time', name: 'joda-time', version: "${jodatimeVersion}"

gradle.properties

@@ -15,7 +15,7 @@
 # */
 #maxkey properties 
 group                           =org.dromara.maxkey
-version                         =4.1.12
+version                         =4.2.0
 vendor                          =https://www.maxkey.top
 author                          =MaxKeyTop
 githubUrl						=https://github.com/dromara/MaxKey
@@ -29,42 +29,42 @@ org.gradle.caching              =true
 
 #maxkey dependencies jars version
 #spring 
-springVersion                   =6.2.19
-springBootVersion               =3.5.16
-springSecurityVersion           =6.5.11
-springDataVersion               =3.5.13
+springVersion                   =7.0.8
+springBootVersion               =4.1.0
+springDataVersion               =4.1.0
+springSecurityVersion           =7.1.0
 springretryVersion              =2.0.11
 #spring plugin
-springbootpluginVersion         =3.5.12
-springplugincoreVersion         =3.5.12
-springpluginmetadataVersion     =3.5.12
+springbootpluginVersion         =4.1.0
+springplugincoreVersion         =4.1.0
+springpluginmetadataVersion     =4.1.0
 #spring cloud
-springcloudVersion              =4.3.1
+springcloudVersion              =5.0.2
 #spring cloud alibaba
 springcloudalibabaVersion       =2023.0.1.2
 springcloudalibabaspringVersion =1.0.11
 springcloudalibabacsplVersion   =1.8.7
 alibabanacosclientVersion       =2.2.3
 #Apache commons
-commonsbeanutilsVersion         =1.9.4
-commonscodecVersion             =1.17.0
+commonsbeanutilsVersion         =1.11.0
+commonscodecVersion             =1.21.0
 commonscollectionsVersion       =3.2.2
-commonscollections4Version      =4.4
-commonscompressVersion          =1.21
-commonscsvVersion               =1.7
-commonstextVersion              =1.9
-commonsdbcp2Version             =2.12.0
-commonsdbutilsVersion           =1.7
+commonscollections4Version      =4.5.0
+commonscompressVersion          =1.28.0
+commonscsvVersion               =1.14.1
+commonstextVersion              =1.15.0
+commonsdbcp2Version             =2.14.0
+commonsdbutilsVersion           =1.8.1
 commonsdigester3Version         =3.2
 commonsdigesterVersion          =2.1
-commonsioVersion                =2.16.1
+commonsioVersion                =2.21.0
 commonslangVersion              =2.6
-commonslang3Version             =3.14.0
-commonsloggingVersion           =1.3.5
-commonspool2Version             =2.12.0
+commonslang3Version             =3.20.0
+commonsloggingVersion           =1.3.6
+commonspool2Version             =2.13.1
 commonshttpclientVersion        =3.1
 commonsfileuploadVersion        =1.5
-commonsvalidatorVersion         =1.7
+commonsvalidatorVersion         =1.10.1
 #Apache Http
 #v4
 httpcomponentsVersion           =4.5.14
@@ -77,53 +77,55 @@ httpcomponentsclient5Version    =5.4.1
 velocityVersion                 =1.7
 velocitydepVersion              =1.4
 freemarkerVersion               =2.3.34
-xmlbeansVersion                 =5.0.2
-poiVersion                      =5.2.3
+xmlbeansVersion                 =5.2.0
+poiVersion                      =5.5.1
 #tomcat
-tomcatVersion                   =10.1.56
+tomcatVersion                   =11.0.22
 #logs
 log4jVersion                    =2.25.4
-slf4jVersion                    =2.0.17
+slf4jVersion                    =2.0.18
 
 #google
-jibGradlePluginVersion          =3.3.2
+#jibGradlePluginVersion          =3.3.2
 jhlabsfiltersVersion            =2.0.235-1
 kaptchaVersion                  =2.3.2
-guavaVersion                    =33.4.0-jre
+guavaVersion                    =33.5.0-jre
 tinkVersion                     =1.8.0
 zxingcoreVersion                =3.5.3
 concurrentlinkedhashmaplruVersion =1.4.2
 #json
-gsonVersion                     =2.12.1
-jacksonVersion                  =2.18.4
+gsonVersion                     =2.13.2
+jacksonAnnotationsVersion       =2.22
+jacksonVersion                  =2.21.4
+jackson3Version                 =3.0.4
 fastjsonVersion                 =1.2.83
-minidevjsonsmartVersion         =2.4.5
+minidevjsonsmartVersion         =2.6.0
 #database
 mysqlconnectorjVersion          =8.4.0
 postgresqlVersion               =42.4.1
-druidVersion                    =1.2.24
-druidspringbootstarterVersion   =1.2.24
+druidVersion                    =1.2.28
+druidspringbootstarterVersion   =1.2.28
 jedisVersion                    =4.3.2
 caffeineVersion                 =3.2.4
 #hibernate
 jbossloggingVersion             =3.6.3.Final
-hibernateVersion                =7.0.5.Final
+hibernateVersion                =9.1.0.Final
 mybatisVersion                  =3.5.19
 mybatisspringVersion            =3.0.4
-mybatisjpaextraVersion          =3.3.10
+mybatisjpaextraVersion          =3.4.5
 #saml
 opensamlVersion                 =2.6.6
 openwsVersion                   =1.5.6
 xmltoolingVersion               =1.4.6
 javasupportVersion              =8.0.0
 #jakarta
-jakartaannotationVersion        =3.0.0
 jakartaactivationVersion        =2.1.4
+jakartaannotationVersion        =3.0.0
 jakartamailapiVersion           =2.1.5
-jakartapersistenceapiVersion    =3.0.0
+jakartapersistenceapiVersion    =3.2.0
 jakartatransactionapiVersion    =2.0.1
 jakartavalidationapiVersion     =3.1.1
-jakartaxmlbindapiVersion        =4.0.4
+jakartaxmlbindapiVersion        =4.0.5
 #mail
 angusmailVersion                =2.0.5
 angusactivationVersion          =2.0.2
@@ -132,16 +134,17 @@ xmlbindjaxbcoreVersion          =3.0.2
 xmlbindjaxbimplVersion          =3.0.2
 xmlbindjaxbxjcVersion           =3.0.2
 #jwt
-nimbusjosejwtVersion            =9.47
-jcipannotationsVersion          =1.0-1
+nimbusjosejwtVersion            =10.7
+#jcipannotationsVersion          =1.0-1
 #others
-nettyVersion                    =4.1.65.Final
+jspecifyVersion                 =1.0.0
+nettyVersion                    =4.2.15.Final
 hazelcastVersion                =4.2.2
 attoparserVersion               =2.0.5.RELEASE
 unbescapeVersion                =1.1.6.RELEASE
 woodstoxVersion                 =6.2.8
-bouncycastleVersion             =1.71
-junitVersion                    =4.11
+bouncycastleVersion             =1.83
+junitVersion                    =6.0.3
 xmlunitVersion                  =2.10.4
 mockitoallVersion               =1.10.19
 minidevasmVersion               =1.0.2
@@ -160,15 +163,15 @@ szxcvbnVersion                  =0.2
 nekohtmlVersion                 =1.9.22
 ognlVersion                     =3.3.3
 cglibVersion                    =3.3.0
-asmVersion                      =9.4
+asmVersion                      =9.9
 aopallianceVersion              =1.0
-aspectjtoolsVersion             =1.9.9.1
+aspectjtoolsVersion             =1.9.25
 evictorVersion                  =1.0.0
 lettuceVersion                  =6.1.9.RELEASE
 reflectionsVersion              =0.10.2
 #xml
 jdom2Version                    =2.0.6.1
-dom4jVersion                    =2.1.4
+dom4jVersion                    =2.2.0
 serializerVersion               =2.7.2
 webauthn4jVersion               =0.29.4.RELEASE
 xmlresolverVersion              =1.2
@@ -177,17 +180,17 @@ xpp3Version                     =1.1.6
 xstreamVersion                  =1.4.19
 passayVersion                   =1.6.2
 LatencyUtilsVersion             =2.0.3
-stax2apiVersion                 =4.2.1
+stax2apiVersion                 =4.2.2
 #tools
 quartzVersion                   =2.3.2
 springbootadminVersion          =2.7.3
-jodatimeVersion                 =2.12.2
+jodatimeVersion                 =2.14.0
 snakeyamlVersion                =2.0
 ip2regionVersion                =2.7.0
 maxminddbVersion                =3.0.0
 maxmindgeoip2Version            =4.0.1
 pinyin4jVersion                 =2.5.1
-jsoupVersion                    =1.15.4
+jsoupVersion                    =1.21.1
 micrometercoreVersion           =1.10.5
 prometheusVersion               =0.16.0
 mapstructVersion                =1.5.3.Final

maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/http/HttpRequestAdapter.java

@@ -109,7 +109,7 @@ public class HttpRequestAdapter {
                     e.printStackTrace();
                 }
             }else if(mediaType.equals(ContentType.APPLICATION_JSON)) {
-                String jsonString = JsonUtils.gsonToString(parameterMap);
+                String jsonString = JsonUtils.toString(parameterMap);
                 StringEntity stringEntity =new StringEntity(jsonString, "UTF-8");
                 stringEntity.setContentType(ContentType.APPLICATION_JSON);
                 httpMethod.setEntity(stringEntity);
@@ -143,7 +143,7 @@ public class HttpRequestAdapter {
         buildHeader(httpMethod,headers);  
         
         // 封装put请求参数
-        String jsonString = JsonUtils.gsonToString(data);
+        String jsonString = JsonUtils.toString(data);
         StringEntity stringEntity =new StringEntity(jsonString, "UTF-8");
         stringEntity.setContentType(ContentType.APPLICATION_JSON);
         httpMethod.setEntity(stringEntity);
@@ -174,7 +174,7 @@ public class HttpRequestAdapter {
         buildHeader(httpMethod,headers);  
         
         // 封装put请求参数
-        String jsonString = JsonUtils.gsonToString(data);
+        String jsonString = JsonUtils.toString(data);
         StringEntity stringEntity =new StringEntity(jsonString, "UTF-8");
         stringEntity.setContentType(ContentType.APPLICATION_JSON);
         httpMethod.setEntity(stringEntity);

maxkey-commons/maxkey-common/src/main/java/org/dromara/maxkey/util/JsonUtils.java

@@ -1,31 +1,42 @@
 /*
- * Copyright [2020] [MaxKey of copyright http://www.maxkey.top]
+ * Copyright (c) 2024, MaxKey and/or its affiliates. All rights reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * License Restrictions
+ * This software and related documentation are provided under a license 
+ * agreement containing restrictions on use and disclosure and are 
+ * protected by intellectual property laws. Except as expressly permitted
+ * in your license agreement or allowed by law, you may not use, copy, 
+ * reproduce, translate, broadcast, modify, license, transmit, distribute, 
+ * exhibit, perform, publish, or display any part, in any form, or by any means. 
+ * Reverse engineering, disassembly, or decompilation of this software, 
+ * unless required by law for interoperability, is prohibited.
+ *
+ * Please contact MaxKey, visit www.maxkey.top if you need additional information
+ * or have any questions,support email support@maxsso.net .
  * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
  
 
+ 
+
 package org.dromara.maxkey.util;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import java.io.IOException;
+import java.text.SimpleDateFormat;
 
-public class JsonUtils {
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import tools.jackson.core.StreamReadFeature;
+import tools.jackson.databind.DeserializationFeature;
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
+
+public class JsonUtils {
+	private static final Logger logger = LoggerFactory.getLogger(JsonUtils.class);
+	
     /**
      * jackson Transform json string to java bean object.
      * 
@@ -36,82 +47,91 @@ public class JsonUtils {
     public static Object stringToObject(String json, Object bean) {
         try {
             bean = (new ObjectMapper()).readValue(json, bean.getClass());
-        } catch (JsonParseException e) {
-            e.printStackTrace();
-        } catch (JsonMappingException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } 
+        } catch (Exception e) {
+            logger.error("Exception readValue", e);
+        }
         return bean;
     }
-
+    
     /**
      * jackson Transform json string to java bean object.
      * 
      * @param json String
-     * @param cls Class
-     * @return Object
+     * @param bean Object 
+     * @return Object 
      */
-    public static <T> T stringToObject(String json, Class<T> cls) {
-        T bean = null;
+    public static Object stringToObject(String json, Object bean, String dateFormat) {
         try {
-            bean = (new ObjectMapper()).readValue(json, cls);
-        } catch (JsonParseException e) {
-            e.printStackTrace();
-        } catch (JsonMappingException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } 
+            JsonMapper mapper = JsonMapper.builder()
+                    .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                    .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+                    .defaultDateFormat(new SimpleDateFormat(dateFormat))
+                    .build();
+            bean = mapper.readValue(json, bean.getClass());
+        } catch (Exception e) {
+            logger.error("Exception DateFormat readValue", e);
+        }
         return bean;
     }
 
     /**
-     * jackson Transform java bean object to json string.
+     * jackson Transform json string to java bean object.
      * 
-     * @param bean Object
-     * @return string
+     * @param json String
+     * @param cls Class
+     * @return Object
      */
-    public static String toString(Object bean) {
-        String json = "";
+    public static <T> T stringToObject(String json, Class<T> cls) {
+        T bean = null;
         try {
-            json = (new ObjectMapper()).writeValueAsString(bean);
-        } catch (JsonGenerationException e) {
-            e.printStackTrace();
-        } catch (JsonMappingException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } 
-        return json;
+            JsonMapper mapper = JsonMapper.builder()
+                    .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                    .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+                    .build();
+            bean = mapper.readValue(json, cls);
+        } catch (Exception e) {
+            logger.error("Exception Class readValue", e);
+        }
+        return bean;
     }
 
     /**
-     * Gson Transform json string to java bean object.
+     * jackson Transform json string to java bean object.
      * 
-     * @param <T> Class
      * @param json String
+     * @param cls Class
      * @return Object
      */
-
-    public static <T> T gsonStringToObject(String json, Class<T> cls) {
-        T newBean = (new Gson()).fromJson(json, cls);
-        return newBean;
+    public static <T> T stringToObject(String json, Class<T> cls , String dateFormat) {
+        T bean = null;
+        try {
+            JsonMapper mapper = JsonMapper.builder()
+                    .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+                    .enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION)
+                    .defaultDateFormat(new SimpleDateFormat(dateFormat))
+                    .build();
+            bean = mapper.readValue(json, cls);
+        } catch (Exception e) {
+            logger.error("Exception DateFormat readValue", e);
+        }
+        return bean;
     }
+    
+    
 
     /**
-     * Gson Transform java bean object to json string .
+     * jackson Transform java bean object to json string.
      * 
      * @param bean Object
      * @return string
      */
-    public static String gsonToString(Object bean) {
+    public static String toString(Object bean) {
         String json = "";
-        // convert java object to JSON format,
-        // and returned as JSON formatted string
-        json = (new Gson()).toJson(bean);
-
+        try {
+            json = (new ObjectMapper()).writeValueAsString(bean);
+        } catch (Exception e) {
+            logger.error("Exception writeValueAsString", e);
+        }
         return json;
     }
 

maxkey-commons/maxkey-common/src/test/java/org/maxkey/rest/AuthorizationHeaderTest.java

@@ -19,7 +19,7 @@ package org.maxkey.rest;
 
 import org.dromara.maxkey.http.AuthorizationHeader;
 import org.dromara.maxkey.http.AuthorizationHeaderUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AuthorizationHeaderTest {
     

maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/PathUtilsTest.java

@@ -17,7 +17,7 @@
 
 package org.maxkey.util;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PathUtilsTest {
     @Test

maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/SonwFlakeIdTest.java

@@ -19,7 +19,7 @@ package org.maxkey.util;
 
 import org.dromara.maxkey.id.SnowFlakeId;
 import org.joda.time.DateTime;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SonwFlakeIdTest {
 

maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/SqlPrettyTest.java

@@ -18,7 +18,7 @@
 package org.maxkey.util;
 
 import org.dromara.maxkey.pretty.PrettyFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SqlPrettyTest {
 

maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/StringGeneratorTest.java

@@ -20,7 +20,7 @@ package org.maxkey.util;
 import java.util.UUID;
 
 import org.dromara.maxkey.util.StringGenerator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StringGeneratorTest {
     @Test

maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/UUIDGeneratorTest.java

@@ -22,7 +22,7 @@ import java.util.Date;
 
 import org.dromara.maxkey.id.UUIDGenerator;
 import org.dromara.maxkey.id.uuid.UUID;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class UUIDGeneratorTest {
     

maxkey-commons/maxkey-common/src/test/java/org/maxkey/util/XMLHelperTest.java

@@ -18,7 +18,8 @@
 package org.maxkey.util;
 
 import org.dromara.maxkey.pretty.impl.XMLHelper;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public class XMLHelperTest {
 

maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/Base64UtilsTest.java

@@ -19,7 +19,8 @@ package org.maxkey.crypto;
 
 import org.dromara.maxkey.crypto.Base64Utils;
 import org.dromara.maxkey.crypto.DigestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public class Base64UtilsTest {
 

maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/DigestUtilsTest.java

@@ -20,7 +20,8 @@ package org.maxkey.crypto;
 import java.time.Instant;
 
 import org.dromara.maxkey.crypto.DigestUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public class DigestUtilsTest {
 /*

maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/RSAUtilsTest.java

@@ -22,7 +22,8 @@ import java.security.KeyPair;
 import org.dromara.maxkey.crypto.Base64Utils;
 import org.dromara.maxkey.crypto.HexUtils;
 import org.dromara.maxkey.crypto.RSAUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 
 public class RSAUtilsTest {

maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/ReciprocalUtilsTest.java

@@ -20,7 +20,7 @@ package org.maxkey.crypto;
 import java.io.UnsupportedEncodingException;
 
 import org.dromara.maxkey.crypto.password.PasswordReciprocal;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ReciprocalUtilsTest {
     @Test

maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/cert/X509V3CertGenTest.java

@@ -26,7 +26,8 @@ import java.util.Date;
 
 import org.dromara.maxkey.crypto.cert.X509V3CertGen;
 import org.joda.time.DateTime;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public class X509V3CertGenTest {
 

maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/DsaSignerTest.java

@@ -21,7 +21,8 @@ import java.util.Map;
 
 import org.dromara.maxkey.crypto.KeyPairUtil;
 import org.dromara.maxkey.crypto.signature.DsaSigner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 public final class DsaSignerTest {
     @Test

maxkey-commons/maxkey-crypto/src/test/java/org/maxkey/crypto/signature/RsaSignerTest.java

@@ -24,7 +24,8 @@ import java.util.Map;
 
 import org.dromara.maxkey.crypto.KeyPairUtil;
 import org.dromara.maxkey.crypto.signature.RsaSigner;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 
 
 public final class RsaSignerTest  {

maxkey-entity/src/main/java/org/dromara/maxkey/entity/ExtraAttrs.java

@@ -44,7 +44,7 @@ public class ExtraAttrs {
     public ExtraAttrs(String arrayJsonString) {
         String extraAttrsJsonString= "{\"extraAttrs\":"+arrayJsonString+"}";
         _logger.debug("Extra Attrs Json String {}" ,extraAttrsJsonString);
-        ExtraAttrs extraAttrs=JsonUtils.gsonStringToObject(extraAttrsJsonString, ExtraAttrs.class);
+        ExtraAttrs extraAttrs=JsonUtils.stringToObject(extraAttrsJsonString, ExtraAttrs.class);
         this.extraAttrs=extraAttrs.getExtraAttrs();
     }
     
@@ -77,7 +77,7 @@ public class ExtraAttrs {
     }
     
     public String toJsonString(){
-        String jsonString =JsonUtils.gsonToString(extraAttrs);
+        String jsonString =JsonUtils.toString(extraAttrs);
         _logger.debug("jsonString {}" ,jsonString);
         return jsonString;
     }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccessMapper.java

@@ -30,7 +30,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface AccessMapper extends IJpaMapper<Access> {
+public  interface AccessMapper extends IJpaMapper<Access,String> {
     
     public List<Access>appsInGroup(Access entity);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsMapper.java

@@ -34,7 +34,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface AccountsMapper extends IJpaMapper<Accounts> {
+public  interface AccountsMapper extends IJpaMapper<Accounts,String> {
     
 
     public List<UserInfo> queryUserNotInStrategy(AccountsStrategy strategy);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsStrategyMapper.java

@@ -31,7 +31,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface AccountsStrategyMapper extends IJpaMapper<AccountsStrategy> {
+public  interface AccountsStrategyMapper extends IJpaMapper<AccountsStrategy,String> {
 
     public List<Roles> queryDynamicGroups(Roles groups);
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsAdaptersMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface AppsAdaptersMapper extends IJpaMapper<AppsAdapters> {
+public  interface AppsAdaptersMapper extends IJpaMapper<AppsAdapters,String> {
     
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsCasDetailsMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface AppsCasDetailsMapper extends IJpaMapper<AppsCasDetails> {
+public  interface AppsCasDetailsMapper extends IJpaMapper<AppsCasDetails,String> {
     
     public  AppsCasDetails  getAppDetails(String id) ;
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface AppsFormBasedDetailsMapper extends IJpaMapper<AppsFormBasedDetails> {
+public  interface AppsFormBasedDetailsMapper extends IJpaMapper<AppsFormBasedDetails,String> {
     
     public  AppsFormBasedDetails  getAppDetails(String id) ;
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsJwtDetailsMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface AppsJwtDetailsMapper extends IJpaMapper<AppsJwtDetails> {
+public  interface AppsJwtDetailsMapper extends IJpaMapper<AppsJwtDetails,String> {
     
     public  AppsJwtDetails  getAppDetails(String id);
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsMapper.java

@@ -31,7 +31,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface AppsMapper extends IJpaMapper<Apps> {
+public  interface AppsMapper extends IJpaMapper<Apps,String> {
     
     public int insertApp(Apps app);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface AppsSaml20DetailsMapper extends IJpaMapper<AppsSAML20Details> {
+public  interface AppsSaml20DetailsMapper extends IJpaMapper<AppsSAML20Details,String> {
     
     public  AppsSAML20Details  getAppDetails(String id);
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface AppsTokenBasedDetailsMapper extends IJpaMapper<AppsTokenBasedDetails> {
+public  interface AppsTokenBasedDetailsMapper extends IJpaMapper<AppsTokenBasedDetails,String> {
     
     public  AppsTokenBasedDetails  getAppDetails(String id);
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AuthzResourceMapper.java

@@ -30,7 +30,7 @@ import org.dromara.maxkey.entity.permissions.Resources;
 import org.dromara.maxkey.entity.permissions.Roles;
 import org.dromara.mybatis.jpa.IJpaMapper;
 
-public  interface AuthzResourceMapper extends IJpaMapper<UserInfo> {
+public  interface AuthzResourceMapper extends IJpaMapper<UserInfo,String> {
     
     public List<Resources> queryResourcesByGroupId(QueryAppResourceDto dto) ;
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/CnfEmailSendersMapper.java

@@ -19,6 +19,6 @@ package org.dromara.maxkey.persistence.mapper;
 import org.dromara.maxkey.entity.cnf.CnfEmailSenders;
 import org.dromara.mybatis.jpa.IJpaMapper;
 
-public interface CnfEmailSendersMapper extends IJpaMapper<CnfEmailSenders> {
+public interface CnfEmailSendersMapper extends IJpaMapper<CnfEmailSenders,String> {
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/CnfLdapContextMapper.java

@@ -19,6 +19,6 @@ package org.dromara.maxkey.persistence.mapper;
 import org.dromara.maxkey.entity.cnf.CnfLdapContext;
 import org.dromara.mybatis.jpa.IJpaMapper;
 
-public interface CnfLdapContextMapper extends IJpaMapper<CnfLdapContext> {
+public interface CnfLdapContextMapper extends IJpaMapper<CnfLdapContext,String> {
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/CnfPasswordPolicyMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface CnfPasswordPolicyMapper extends IJpaMapper<CnfPasswordPolicy> {
+public  interface CnfPasswordPolicyMapper extends IJpaMapper<CnfPasswordPolicy,String> {
     
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/CnfSmsProviderMapper.java

@@ -20,6 +20,6 @@ package org.dromara.maxkey.persistence.mapper;
 import org.dromara.maxkey.entity.cnf.CnfSmsProvider;
 import org.dromara.mybatis.jpa.IJpaMapper;
 
-public interface CnfSmsProviderMapper extends IJpaMapper<CnfSmsProvider> {
+public interface CnfSmsProviderMapper extends IJpaMapper<CnfSmsProvider,String> {
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ConnectorsMapper.java

@@ -28,6 +28,6 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface ConnectorsMapper extends IJpaMapper<Connectors> {
+public  interface ConnectorsMapper extends IJpaMapper<Connectors,String> {
     
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/FileUploadMapper.java

@@ -27,6 +27,6 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface FileUploadMapper extends IJpaMapper<FileUpload> {
+public  interface FileUploadMapper extends IJpaMapper<FileUpload,String> {
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/GroupMemberMapper.java

@@ -32,7 +32,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface GroupMemberMapper extends IJpaMapper<GroupMember> {
+public  interface GroupMemberMapper extends IJpaMapper<GroupMember,String> {
     
     public List<GroupMember> memberIn(GroupMember entity);
     public List<GroupMember> memberNotIn(GroupMember entity);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/GroupsMapper.java

@@ -30,7 +30,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface GroupsMapper extends IJpaMapper<Groups> {
+public  interface GroupsMapper extends IJpaMapper<Groups,String> {
 
     public List<Groups> queryDynamic(Groups groups);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryConnectorMapper.java

@@ -25,6 +25,6 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public interface HistoryConnectorMapper extends IJpaMapper<HistoryConnector> {
+public interface HistoryConnectorMapper extends IJpaMapper<HistoryConnector,String> {
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginAppsMapper.java

@@ -24,6 +24,6 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public interface HistoryLoginAppsMapper extends IJpaMapper<HistoryLoginApps> {
+public interface HistoryLoginAppsMapper extends IJpaMapper<HistoryLoginApps,String> {
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public interface HistoryLoginMapper extends IJpaMapper<HistoryLogin> {
+public interface HistoryLoginMapper extends IJpaMapper<HistoryLogin,String> {
     
     public List<HistoryLogin> queryOnlineSession(HistoryLogin historyLogin);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySynchronizerMapper.java

@@ -25,6 +25,6 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public interface HistorySynchronizerMapper extends IJpaMapper<HistorySynchronizer> {
+public interface HistorySynchronizerMapper extends IJpaMapper<HistorySynchronizer,String> {
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySystemLogsMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface HistorySystemLogsMapper extends IJpaMapper<HistorySystemLogs> {
+public  interface HistorySystemLogsMapper extends IJpaMapper<HistorySystemLogs,String> {
     
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/InstitutionsMapper.java

@@ -21,7 +21,7 @@ import org.dromara.maxkey.constants.ConstsStatus;
 import org.dromara.maxkey.entity.Institutions;
 import org.dromara.mybatis.jpa.IJpaMapper;
 
-public interface InstitutionsMapper extends IJpaMapper<Institutions> {
+public interface InstitutionsMapper extends IJpaMapper<Institutions,String> {
 
     @Select("select * from  mxk_institutions where  (id = #{value} or domain = #{value} or consoledomain = #{value} ) and status = " + ConstsStatus.ACTIVE)
     public Institutions findByDomain(String domain);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsCastMapper.java

@@ -22,7 +22,7 @@ import org.dromara.maxkey.entity.OrganizationsCast;
 import org.dromara.maxkey.entity.idm.Organizations;
 import org.dromara.mybatis.jpa.IJpaMapper;
 
-public interface OrganizationsCastMapper extends IJpaMapper<OrganizationsCast> {
+public interface OrganizationsCastMapper extends IJpaMapper<OrganizationsCast,String> {
 
     public List<Organizations> queryOrgs(Organizations organization);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsMapper.java

@@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.Update;
 import org.dromara.maxkey.entity.idm.Organizations;
 import org.dromara.mybatis.jpa.IJpaMapper;
 
-public interface OrganizationsMapper extends IJpaMapper<Organizations> {
+public interface OrganizationsMapper extends IJpaMapper<Organizations,String> {
 
     public List<Organizations> queryOrgs(Organizations organization);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/PasskeyChallengeMapper.java

@@ -30,7 +30,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * 
  * @author MaxKey Team
  */
-public interface PasskeyChallengeMapper extends IJpaMapper<PasskeyChallenge> {
+public interface PasskeyChallengeMapper extends IJpaMapper<PasskeyChallenge,String> {
     
     /**
      * 根据挑战ID查询挑战数据

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/PermissionMapper.java

@@ -30,7 +30,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface PermissionMapper extends IJpaMapper<Permission> {
+public  interface PermissionMapper extends IJpaMapper<Permission,String> {
     
     public int insertGroupPrivileges(List<Permission> groupPrivilegesList);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/PermissionRoleMapper.java

@@ -28,7 +28,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface PermissionRoleMapper extends IJpaMapper<PermissionRole> {
+public  interface PermissionRoleMapper extends IJpaMapper<PermissionRole,String> {
     
     public int insertPermissionRoles(List<PermissionRole> permissionRolesList);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RegisterMapper.java

@@ -31,7 +31,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface RegisterMapper extends IJpaMapper<Register> {
+public  interface RegisterMapper extends IJpaMapper<Register,String> {
     
 
     public List<UserInfo> findByEmail(String email);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java

@@ -32,7 +32,7 @@ import org.dromara.mybatis.jpa.entity.JpaEntity;
  * @author Crystal.sea
  *
  */
-public  interface ReportMapper extends IJpaMapper<JpaEntity> {
+public  interface ReportMapper extends IJpaMapper<JpaEntity,String> {
     
     public Integer analysisDay(HashMap<String,Object> reportParameter);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ResourcesMapper.java

@@ -28,6 +28,6 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface ResourcesMapper extends IJpaMapper<Resources> {
+public  interface ResourcesMapper extends IJpaMapper<Resources,String> {
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RoleMemberMapper.java

@@ -29,7 +29,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface RoleMemberMapper extends IJpaMapper<RoleMember> {
+public  interface RoleMemberMapper extends IJpaMapper<RoleMember,String> {
     
     public List<RoleMember> memberInRole(RoleMember entity);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolesMapper.java

@@ -27,7 +27,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface RolesMapper extends IJpaMapper<Roles> {
+public  interface RolesMapper extends IJpaMapper<Roles,String> {
 
     public List<Roles> queryDynamicRoles(Roles groups);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsAssociateMapper.java

@@ -22,7 +22,7 @@ import org.dromara.maxkey.entity.SocialsAssociate;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.mybatis.jpa.IJpaMapper;
 
-public interface SocialsAssociateMapper extends IJpaMapper<SocialsAssociate> {
+public interface SocialsAssociateMapper extends IJpaMapper<SocialsAssociate,String> {
 
     public List<SocialsAssociate> queryByUser(UserInfo user);
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsProviderMapper.java

@@ -25,7 +25,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.Sea
  *
  */
-public interface SocialsProviderMapper  extends IJpaMapper<SocialsProvider>{
+public interface SocialsProviderMapper  extends IJpaMapper<SocialsProvider,String>{
 
     
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SyncJobConfigFieldMapper.java

@@ -24,7 +24,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
 import java.util.List;
 
 
-public interface SyncJobConfigFieldMapper extends IJpaMapper<SyncJobConfigField> {
+public interface SyncJobConfigFieldMapper extends IJpaMapper<SyncJobConfigField,String> {
     /*@Select("SELECT * FROM sync_job_config_field WHERE job_id = #{jobId} AND object_type = #{objectType}")*/
     public List<SyncJobConfigField> findByJobIdAndObjectType(@Param("jobId") Long jobId, @Param("objectType") String objectType);
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchroRelatedMapper.java

@@ -28,7 +28,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.sea
  *
  */
-public  interface SynchroRelatedMapper extends IJpaMapper<SynchroRelated> {
+public  interface SynchroRelatedMapper extends IJpaMapper<SynchroRelated,String> {
     @Update("update mxk_synchro_related set synctime = #{syncTime} where id= #{id} ")
     public int updateSyncTime(SynchroRelated synchroRelated);
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchronizersMapper.java

@@ -28,6 +28,6 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  *
  */
 
-public  interface SynchronizersMapper extends IJpaMapper<Synchronizers> {
+public  interface SynchronizersMapper extends IJpaMapper<Synchronizers,String> {
     
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoMapper.java

@@ -32,7 +32,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * @author Crystal.Sea
  *
  */
-public interface UserInfoMapper  extends IJpaMapper<UserInfo>{
+public interface UserInfoMapper  extends IJpaMapper<UserInfo,String>{
     
     //login query
     public UserInfo findByAppIdAndUsername(UserInfo userInfo);

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserPasskeyMapper.java

@@ -33,7 +33,7 @@ import org.dromara.mybatis.jpa.IJpaMapper;
  * 
  * @author MaxKey Team
  */
-public interface UserPasskeyMapper extends IJpaMapper<UserPasskey> {
+public interface UserPasskeyMapper extends IJpaMapper<UserPasskey,String> {
     
     /**
      * 根据用户ID查询所有Passkey凭据

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccessService.java

@@ -21,6 +21,6 @@ import org.dromara.maxkey.entity.Access;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
 
-public interface AccessService  extends IJpaService<Access>{
+public interface AccessService  extends IJpaService<Access,String>{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java

@@ -24,7 +24,7 @@ import org.dromara.maxkey.entity.AccountsStrategy;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AccountsService  extends IJpaService<Accounts>{
+public interface AccountsService  extends IJpaService<Accounts,String>{
 
    public boolean updateStatus(Accounts accounts) ;
    

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java

@@ -23,7 +23,7 @@ import org.dromara.maxkey.entity.AccountsStrategy;
 import org.dromara.maxkey.entity.permissions.Roles;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AccountsStrategyService  extends IJpaService<AccountsStrategy> {
+public interface AccountsStrategyService  extends IJpaService<AccountsStrategy,String> {
 
     public List<Roles> queryDynamicGroups(Roles groups);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsAdaptersService.java

@@ -20,6 +20,6 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.apps.AppsAdapters;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AppsAdaptersService  extends IJpaService<AppsAdapters>{
+public interface AppsAdaptersService  extends IJpaService<AppsAdapters,String>{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.apps.AppsCasDetails;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AppsCasDetailsService  extends IJpaService<AppsCasDetails>{
+public interface AppsCasDetailsService  extends IJpaService<AppsCasDetails,String>{
 
     public  AppsCasDetails  get(String id , boolean cached) ;
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.apps.AppsFormBasedDetails;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AppsFormBasedDetailsService  extends IJpaService<AppsFormBasedDetails>{
+public interface AppsFormBasedDetailsService  extends IJpaService<AppsFormBasedDetails,String>{
 
     public  AppsFormBasedDetails  get(String id,boolean cached) ;
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.apps.AppsJwtDetails;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AppsJwtDetailsService  extends IJpaService<AppsJwtDetails>{
+public interface AppsJwtDetailsService  extends IJpaService<AppsJwtDetails,String>{
 
     public  AppsJwtDetails  get(String id , boolean cached) ;
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.apps.AppsSAML20Details;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AppsSaml20DetailsService  extends IJpaService<AppsSAML20Details>{
+public interface AppsSaml20DetailsService  extends IJpaService<AppsSAML20Details,String>{
 
     public  AppsSAML20Details  get(String id , boolean cached);
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java

@@ -22,7 +22,7 @@ import org.dromara.maxkey.entity.apps.Apps;
 import org.dromara.maxkey.entity.apps.UserApps;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AppsService extends IJpaService<Apps>{
+public interface AppsService extends IJpaService<Apps,String>{
     
     public boolean insertApp(Apps app) ;
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AppsTokenBasedDetailsService  extends IJpaService<AppsTokenBasedDetails>{
+public interface AppsTokenBasedDetailsService  extends IJpaService<AppsTokenBasedDetails,String>{
 
     public  AppsTokenBasedDetails  get(String id , boolean cached) ;
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AuthzResourceService.java

@@ -28,7 +28,7 @@ import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.maxkey.entity.permissions.Resources;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface AuthzResourceService   extends IJpaService<UserInfo>{
+public interface AuthzResourceService   extends IJpaService<UserInfo,String>{
     
     /**
      * 根据主体获取用户对应得应用资源清单

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfEmailSendersService.java

@@ -21,7 +21,7 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.cnf.CnfEmailSenders;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface CnfEmailSendersService  extends IJpaService<CnfEmailSenders>{
+public interface CnfEmailSendersService  extends IJpaService<CnfEmailSenders,String>{
 
      
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfLdapContextService.java

@@ -21,6 +21,6 @@ import org.dromara.maxkey.entity.cnf.CnfLdapContext;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
 
-public interface CnfLdapContextService  extends IJpaService<CnfLdapContext>{
+public interface CnfLdapContextService  extends IJpaService<CnfLdapContext,String>{
  
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfPasswordPolicyService.java

@@ -23,7 +23,7 @@ import org.dromara.maxkey.entity.cnf.CnfPasswordPolicy;
 import org.dromara.mybatis.jpa.service.IJpaService;
 import org.passay.Rule;
 
-public interface CnfPasswordPolicyService  extends IJpaService<CnfPasswordPolicy>{
+public interface CnfPasswordPolicyService  extends IJpaService<CnfPasswordPolicy,String>{
     
     public CnfPasswordPolicy getPasswordPolicy();
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/CnfSmsProviderService.java

@@ -21,6 +21,6 @@ import org.dromara.maxkey.entity.cnf.CnfSmsProvider;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
 
-public interface CnfSmsProviderService  extends IJpaService<CnfSmsProvider>{ 
+public interface CnfSmsProviderService  extends IJpaService<CnfSmsProvider,String>{ 
     
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java

@@ -20,6 +20,6 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.Connectors;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface ConnectorsService  extends IJpaService<Connectors>{
+public interface ConnectorsService  extends IJpaService<Connectors,String>{
  
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/FileUploadService.java

@@ -20,6 +20,6 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.FileUpload;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface FileUploadService  extends IJpaService<FileUpload>{
+public interface FileUploadService  extends IJpaService<FileUpload,String>{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupMemberService.java

@@ -25,7 +25,7 @@ import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.mybatis.jpa.service.IJpaService;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
 
-public interface GroupMemberService  extends IJpaService<GroupMember>{
+public interface GroupMemberService  extends IJpaService<GroupMember,String>{
 
     public int addDynamicMember(Groups dynamicGroup) ;
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/GroupsService.java

@@ -22,7 +22,7 @@ import java.util.List;
 import org.dromara.maxkey.entity.idm.Groups;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface GroupsService  extends IJpaService<Groups>{
+public interface GroupsService  extends IJpaService<Groups,String>{
 
     public List<Groups> queryDynamicGroups(Groups groups);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryConnectorService.java

@@ -20,6 +20,6 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.history.HistoryConnector;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface HistoryConnectorService  extends IJpaService<HistoryConnector>{
+public interface HistoryConnectorService  extends IJpaService<HistoryConnector,String>{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginAppsService.java

@@ -20,6 +20,6 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.history.HistoryLoginApps;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface HistoryLoginAppsService  extends IJpaService<HistoryLoginApps>{
+public interface HistoryLoginAppsService  extends IJpaService<HistoryLoginApps,String>{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java

@@ -21,7 +21,7 @@ import org.dromara.maxkey.entity.history.HistoryLogin;
 import org.dromara.mybatis.jpa.service.IJpaService;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
 
-public interface HistoryLoginService  extends IJpaService<HistoryLogin>{
+public interface HistoryLoginService  extends IJpaService<HistoryLogin,String>{
 
     public JpaPageResults<HistoryLogin> queryOnlineSession(HistoryLogin historyLogin);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySynchronizerService.java

@@ -20,6 +20,6 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.history.HistorySynchronizer;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface HistorySynchronizerService  extends IJpaService<HistorySynchronizer>{
+public interface HistorySynchronizerService  extends IJpaService<HistorySynchronizer,String>{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySystemLogsService.java

@@ -21,7 +21,7 @@ import org.dromara.maxkey.entity.history.HistorySystemLogs;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface HistorySystemLogsService  extends IJpaService<HistorySystemLogs>{
+public interface HistorySystemLogsService  extends IJpaService<HistorySystemLogs,String>{
     
     public void insert(String topic,Object entity,String action,String result,UserInfo operator) ;
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.Institutions;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface InstitutionsService  extends IJpaService<Institutions>{
+public interface InstitutionsService  extends IJpaService<Institutions,String>{
 
      public Institutions findByDomain(String domain) ;
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java

@@ -20,7 +20,7 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.OrganizationsCast;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface OrganizationsCastService  extends IJpaService<OrganizationsCast>{
+public interface OrganizationsCastService  extends IJpaService<OrganizationsCast,String>{
 
     public boolean updateCast(OrganizationsCast organizationsCast) ;
 

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java

@@ -23,7 +23,7 @@ import org.dromara.maxkey.entity.idm.Organizations;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
 
-public interface OrganizationsService  extends IJpaService<Organizations>{
+public interface OrganizationsService  extends IJpaService<Organizations,String>{
 
      public void saveOrUpdate(Organizations organization) ;
      

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PasskeyChallengeService.java

@@ -25,7 +25,7 @@ import org.dromara.mybatis.jpa.service.IJpaService;
  * 
  * @author MaxKey Team
  */
-public interface PasskeyChallengeService extends IJpaService<PasskeyChallenge> {
+public interface PasskeyChallengeService extends IJpaService<PasskeyChallenge,String> {
     
     /**
      * 根据挑战ID查询挑战数据

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PermissionRoleService.java

@@ -23,7 +23,7 @@ import java.util.List;
 import org.dromara.maxkey.entity.permissions.PermissionRole;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface PermissionRoleService  extends IJpaService<PermissionRole>{
+public interface PermissionRoleService  extends IJpaService<PermissionRole,String>{
 
     public boolean insertPermissionRoles(List<PermissionRole> permissionRolesList);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PermissionService.java

@@ -22,7 +22,7 @@ import java.util.List;
 import org.dromara.maxkey.entity.permissions.Permission;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface PermissionService  extends IJpaService<Permission>{
+public interface PermissionService  extends IJpaService<Permission,String>{
 
     public boolean insertGroupPrivileges(List<Permission> rolePermissionsList) ;
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RegisterService.java

@@ -21,7 +21,7 @@ import org.dromara.maxkey.entity.Register;
 import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface RegisterService  extends IJpaService<Register>{
+public interface RegisterService  extends IJpaService<Register,String>{
 
     public UserInfo findByEmail(String email);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import org.dromara.mybatis.jpa.service.IJpaService;
 import org.dromara.mybatis.jpa.entity.JpaEntity;
 
-public interface ReportService  extends IJpaService<JpaEntity>{
+public interface ReportService  extends IJpaService<JpaEntity,String>{
 
     public Integer analysisDay(HashMap<String,Object> reportParameter) ;
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ResourcesService.java

@@ -22,7 +22,7 @@ import java.util.List;
 import org.dromara.maxkey.entity.permissions.Resources;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface ResourcesService  extends IJpaService<Resources>{
+public interface ResourcesService  extends IJpaService<Resources,String>{
     
     public List<Resources> queryResourcesTree(Resources resource);
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java

@@ -26,7 +26,7 @@ import org.dromara.maxkey.entity.permissions.Roles;
 import org.dromara.mybatis.jpa.service.IJpaService;
 import org.dromara.mybatis.jpa.entity.JpaPageResults;
 
-public interface RoleMemberService  extends IJpaService<RoleMember>{
+public interface RoleMemberService  extends IJpaService<RoleMember,String>{
 
     public int addDynamicRoleMember(Roles dynamicGroup);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolesService.java

@@ -24,7 +24,7 @@ import java.util.List;
 import org.dromara.maxkey.entity.permissions.Roles;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface RolesService  extends IJpaService<Roles> {
+public interface RolesService  extends IJpaService<Roles,String> {
 
     public List<Roles> queryDynamicRoles(Roles groups);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsAssociatesService.java

@@ -24,7 +24,7 @@ import org.dromara.maxkey.entity.idm.UserInfo;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
 
-public interface SocialsAssociatesService  extends IJpaService<SocialsAssociate>{
+public interface SocialsAssociatesService  extends IJpaService<SocialsAssociate,String>{
 
     public List<SocialsAssociate>  queryByUser(UserInfo user);
      

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java

@@ -20,6 +20,6 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.SocialsProvider;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface SocialsProviderService  extends IJpaService<SocialsProvider>{
+public interface SocialsProviderService  extends IJpaService<SocialsProvider,String>{
 
 }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchroRelatedService.java

@@ -23,7 +23,7 @@ import org.dromara.maxkey.entity.SynchroRelated;
 import org.dromara.maxkey.entity.Synchronizers;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface SynchroRelatedService  extends IJpaService<SynchroRelated>{
+public interface SynchroRelatedService  extends IJpaService<SynchroRelated,String>{
 
     public int updateSyncTime(SynchroRelated synchroRelated);
     

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java

@@ -20,6 +20,6 @@ package org.dromara.maxkey.persistence.service;
 import org.dromara.maxkey.entity.Synchronizers;
 import org.dromara.mybatis.jpa.service.IJpaService;
 
-public interface SynchronizersService  extends IJpaService<Synchronizers>{
+public interface SynchronizersService  extends IJpaService<Synchronizers,String>{
     
 }