diff --git a/build.gradle b/build.gradle index c53e00692..5f6e95d94 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,7 @@ ext { def libjarsmapper=[ 'maxkey-authentication-captcha' :'lib', 'maxkey-authentication-core' :'lib', + 'maxkey-authentication-ip2region' :'lib', 'maxkey-authentication-otp' :'lib', 'maxkey-authentication-provider' :'lib', 'maxkey-authentication-sms' :'lib', @@ -47,15 +48,15 @@ def libjarsmapper=[ 'maxkey-authentication-social' :'maxkey', 'maxkey-web-maxkey' :'maxkey', 'maxkey-web-mgt' :'maxkey_mgt', - 'maxkey-synchronizer' :'maxkey_mgt', 'maxkey-synchronizer-activedirectory' :'maxkey_mgt', + 'maxkey-synchronizer-common' :'maxkey_mgt', + 'maxkey-synchronizer-jdbc' :'maxkey_mgt', 'maxkey-synchronizer-ldap' :'maxkey_mgt', 'maxkey-synchronizer-dingtalk' :'maxkey_mgt', - 'maxkey-synchronizer-jdbc' :'maxkey_mgt', 'maxkey-synchronizer-workweixin' :'maxkey_mgt', - 'maxkey-synchronizer-reorgdept' :'maxkey_mgt', - 'maxkey-web-openapi' :'maxkey_openapi', - 'maxkey-web-api-rest' :'maxkey_openapi', + 'maxkey-synchronizer-reorgdept' :'maxkey_mgt', + 'maxkey-web-openapi' :'maxkey_openapi', + 'maxkey-web-api-rest' :'maxkey_openapi', 'maxkey-web-api-scim' :'maxkey_openapi', ] @@ -76,8 +77,8 @@ allprojects { transitive = false// 为本依赖关闭依赖传递特性 } //java Version - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = 17 + targetCompatibility = 17 compileJava.options.encoding = 'UTF-8' eclipse { @@ -89,8 +90,7 @@ allprojects { prefs.append('encoding/=UTF-8') //use UTF-8 } } - } - + } } buildscript { @@ -114,16 +114,7 @@ dependencies { subprojects { - /* - eclipse { - 第一次时请注释这段eclipse设置，可能报错，设置工程字符集 - jdt { - File f = file('.settings/org.eclipse.core.resources.prefs') - f.write('eclipse.preferences.version=1\n') - f.append('encoding/=UTF-8') //use UTF-8 - } - } - */ + processResources { from ('src/main/resources') { include 'src/main/resources/*.*' @@ -160,16 +151,11 @@ 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}" testImplementation group: 'xmlunit', name: 'xmlunit', version: "${xmlunitVersion}" - // https://projectlombok.org - compileOnly 'org.projectlombok:lombok:1.18.4' - annotationProcessor 'org.projectlombok:lombok:1.18.4' - //apache implementation group: 'commons-beanutils', name: 'commons-beanutils', version: "${commonsbeanutilsVersion}" implementation group: 'commons-codec', name: 'commons-codec', version: "${commonscodecVersion}" @@ -178,9 +164,9 @@ subprojects { //implementation group: 'org.apache.commons', name: 'commons-csv', version: "${commonscsvVersion}" implementation group: 'org.apache.commons', name: 'commons-text', version: "${commonstextVersion}" implementation group: 'org.apache.commons', name: 'commons-dbcp2', version: "${commonsdbcp2Version}" - implementation group: 'commons-dbutils', name: 'commons-dbutils', version: "${commonsdbutilsVersion}" - implementation group: 'org.apache.commons', name: 'commons-digester3', version: "${commonsdigester3Version}" - implementation group: 'commons-digester', name: 'commons-digester', version: "${commonsdigesterVersion}" + //implementation group: 'commons-dbutils', name: 'commons-dbutils', version: "${commonsdbutilsVersion}" + //implementation group: 'org.apache.commons', name: 'commons-digester3', version: "${commonsdigester3Version}" + //implementation group: 'commons-digester', name: 'commons-digester', version: "${commonsdigesterVersion}" implementation group: 'commons-io', name: 'commons-io', version: "${commonsioVersion}" implementation group: 'commons-lang', name: 'commons-lang', version: "${commonslangVersion}" implementation group: 'org.apache.commons', name: 'commons-lang3', version: "${commonslang3Version}" @@ -188,15 +174,20 @@ subprojects { implementation group: 'org.apache.commons', name: 'commons-pool2', version: "${commonspool2Version}" implementation group: 'commons-httpclient', name: 'commons-httpclient', version: "${commonshttpclientVersion}" implementation group: 'commons-fileupload', name: 'commons-fileupload', version: "${commonsfileuploadVersion}" - implementation group: 'org.apache.commons', name: 'commons-email', version: "${commonsemailVersion}" implementation group: 'commons-validator', name: 'commons-validator', version: "${commonsvalidatorVersion}" + //httpcomponents v4 implementation group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: "${httpasyncclientVersion}" - implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: "${httpcomponentsVersion}" implementation group: 'org.apache.httpcomponents', name: 'fluent-hc', version: "${httpcomponentsVersion}" implementation group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: "${httpcomponentsVersion}" implementation group: 'org.apache.httpcomponents', name: 'httpmime', version: "${httpcomponentsVersion}" + implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: "${httpcomponentsVersion}" implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: "${httpcoreVersion}" implementation group: 'org.apache.httpcomponents', name: 'httpcore-nio', version: "${httpcoreVersion}" + //httpcomponents v5 + implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5', version: "${httpcomponentscore5Version}" + implementation group: 'org.apache.httpcomponents.core5', name: 'httpcore5-h2', version: "${httpcomponentscore5Version}" + implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: "${httpcomponentscore5Version}" + implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5-fluent', version: "${httpcomponentscore5Version}" implementation group: 'org.apache.velocity', name: 'velocity', version: "${velocityVersion}" implementation group: 'velocity', name: 'velocity-dep', version: "${velocitydepVersion}" implementation group: 'org.freemarker', name: 'freemarker', version: "${freemarkerVersion}" @@ -212,16 +203,17 @@ subprojects { implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: "${tomcatVersion}" implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-el', version: "${tomcatVersion}" implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: "${tomcatVersion}" - //apache logs + //apache log4j implementation group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: "${log4jVersion}" implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}" implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}" implementation group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: "${log4jVersion}" 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-slf4j2-impl', version: "${log4jVersion}" implementation group: 'org.apache.logging.log4j', name: 'log4j-web', version: "${log4jVersion}" - //logs + //slf4j implementation group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}" + //jboss-logging implementation group: 'org.jboss.logging', name: 'jboss-logging', version: "${jbossloggingVersion}" //spring implementation group: 'org.springframework', name: 'spring-aop', version: "${springVersion}" @@ -247,7 +239,6 @@ subprojects { // 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}" - //spring-security implementation group: 'org.springframework.security', name: 'spring-security-core', version: "${springSecurityVersion}" implementation group: 'org.springframework.security', name: 'spring-security-web', version: "${springSecurityVersion}" @@ -267,10 +258,9 @@ 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-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}" //spring-boot-admin implementation group: 'de.codecentric', name: 'spring-boot-admin-client', version: "${springbootadminVersion}" @@ -279,7 +269,6 @@ subprojects { 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 @@ -292,11 +281,24 @@ subprojects { 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}" - - //Message Queue Removed - + //Message Queue + //kafka support + // https://mvnrepository.com/artifact/org.apache.kafka/kafka-clients + implementation group: 'org.apache.kafka', name: 'kafka-clients', version: "${kafkaclientsVersion}" + // https://mvnrepository.com/artifact/org.springframework.kafka/spring-kafka + implementation group: 'org.springframework.kafka', name: 'spring-kafka', version: "${springkafkaVersion}" + //rocketmq + implementation group: 'org.apache.rocketmq', name: 'rocketmq-common', version: "${rocketmqclientVersion}" + implementation group: 'org.apache.rocketmq', name: 'rocketmq-remoting', version: "${rocketmqclientVersion}" + implementation group: 'io.github.aliyunmq', name: 'rocketmq-slf4j-api', version: '1.0.1' + implementation group: 'org.apache.rocketmq', name: 'rocketmq-client', version: "${rocketmqclientVersion}" + // https://mvnrepository.com/artifact/org.apache.rocketmq/rocketmq-spring-boot + implementation group: 'org.apache.rocketmq', name: 'rocketmq-spring-boot', version: "${rocketmqspringbootVersion}" + implementation group: 'org.apache.rocketmq', name: 'rocketmq-spring-boot-starter', version: "${rocketmqspringbootVersion}" //saml see maxkey-lib //implementation group: 'org.opensaml', name: 'opensaml', version: "${opensamlVersion}" //implementation group: 'org.opensaml', name: 'openws', version: "${openwsVersion}" @@ -304,7 +306,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: 'net.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 @@ -313,97 +315,32 @@ subprojects { //common implementation group: 'org.javassist', name: 'javassist', version: "${javassistVersion}" implementation group: 'org.owasp.esapi', name: 'esapi', version: "${esapiVersion}" - implementation group: 'com.sun.mail', name: 'javax.mail', version: "${javaxmailVersion}" - // 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: "${jakartapersistenceapiVersion}" + //jakarta + implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: "${jakartaactivationVersion}" implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: "${jakartaannotationVersion}" + implementation group: 'jakarta.mail', name: 'jakarta.mail-api', version: "${jakartamailapiVersion}" + implementation group: 'jakarta.persistence', name: 'jakarta.persistence-api', version: "${jakartapersistenceapiVersion}" + implementation group: 'jakarta.transaction', name: 'jakarta.transaction-api', version: "${jakartatransactionapiVersion}" implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: "${jakartavalidationapiVersion}" - implementation group: 'javax.activation', name: 'activation', version: "${activationVersion}" - implementation group: 'javax.annotation', name: 'javax.annotation-api', version: "${javaxannotationapiVersion}" - implementation group: 'javax.transaction', name: 'jta', version: "${jtaVersion}" - implementation group: 'javax.transaction', name: 'javax.transaction-api', version: "${javaxtransactionapiVersion}" - implementation group: 'javax.validation', name: 'validation-api', version: "${validationapiVersion}" - implementation group: 'javax.xml', name: 'jsr173', version: "${jsr173Version}" - implementation group: 'javax.xml.bind', name: 'jaxb-api', version: "${jaxbapiVersion}" - implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: "${jaxbcoreVersion}" - implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: "${jaxbimplVersion}" - implementation group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: "${jaxbxjcVersion}" + implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: "${jakartaxmlbindapiVersion}" + //mail + implementation group: 'org.eclipse.angus', name: 'jakarta.mail', version: "${angusjakartamailVersion}" + implementation group: 'org.eclipse.angus', name: 'angus-activation', version: "${angusactivationVersion}" + //sun.xml.bind + implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: "${xmlbindjaxbcoreVersion}" + 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-jdk15on', version: "${bouncycastleVersion}" - implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "${bouncycastleVersion}" - implementation group: 'org.bouncycastle', name: 'bcprov-ext-jdk15on', version: "${bouncycastleVersion}" + implementation group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}" + implementation group: 'org.bouncycastle', name: 'bcprov-ext-jdk18on', version: "${bouncycastleVersion}" //google implementation group: 'com.google.crypto.tink', name: 'tink', version: "${tinkVersion}" //kaptcha implementation group: 'com.jhlabs', name: 'filters', version: "${jhlabsfiltersVersion}" implementation group: 'com.github.penggle', name: 'kaptcha', version: "${kaptchaVersion}" - //json + //json-gson implementation group: 'com.google.code.gson', name: 'gson', version: "${gsonVersion}" - //reactive - implementation group: 'org.reactivestreams', name: 'reactive-streams', version: "${reactivestreamsVersion}" - implementation group: 'io.projectreactor', name: 'reactor-core', version: "${reactorcoreVersion}" - implementation group: 'eu.tekul', name: 'szxcvbn_2.9.2', version: "${szxcvbnVersion}" - //quartz - 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: '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}" - //implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.3.5' - 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}" - //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}" - //usefull - implementation group: 'joda-time', name: 'joda-time', version: "${jodatimeVersion}" - implementation group: 'org.yaml', name: 'snakeyaml', version: "${snakeyamlVersion}" - implementation group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: "${nekohtmlVersion}" - implementation group: 'org.jdom', name: 'jdom', version: "${jdomVersion}" - implementation group: 'com.google.zxing', name: 'core', version: "${zxingcoreVersion}" - implementation group: 'com.google.guava', name: 'guava', version: "${guavaVersion}" - implementation group: 'ognl', name: 'ognl', version: "${ognlVersion}" - implementation group: 'cglib', name: 'cglib', version: "${cglibVersion}" - implementation group: 'org.ow2.asm', name: 'asm', version: "${asmVersion}" - implementation group: 'aopalliance', name: 'aopalliance', version: "${aopallianceVersion}" - implementation group: 'org.aspectj', name: 'aspectjtools', version: "${aspectjtoolsVersion}" - implementation group: 'dom4j', name: 'dom4j', version: "${dom4jVersion}" - implementation group: 'xalan', name: 'serializer', version: "${serializerVersion}" - implementation group: 'xml-resolver', name: 'xml-resolver', version: "${xmlresolverVersion}" - implementation group: 'org.apache.santuario', name: 'xmlsec', version: "${xmlsecVersion}" - implementation group: 'org.ogce', name: 'xpp3', version: "${xpp3Version}" - 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}" - implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}" - implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}" - implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}" - implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}" - 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 + //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}" @@ -416,25 +353,94 @@ subprojects { 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-fastjson implementation group: 'com.alibaba', name: 'fastjson', version: "${fastjsonVersion}" - implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}" + //reactive + implementation group: 'org.reactivestreams', name: 'reactive-streams', version: "${reactivestreamsVersion}" + implementation group: 'io.projectreactor', name: 'reactor-core', version: "${reactorcoreVersion}" + implementation group: 'eu.tekul', name: 'szxcvbn_2.9.2', version: "${szxcvbnVersion}" + //database + implementation group: 'com.mysql', name: 'mysql-connector-j', version: "${mysqlconnectorjavaVersion}" + //implementation group: 'org.postgresql', name: 'postgresql', version: "${postgresqlVersion}" + //implementation group: 'com.dameng', name: 'DmJdbcDriver18', version: "${dm8JdbcDriverVersion}" + //implementation group: 'com.highgo', name: 'HgdbJdbc', version: '6.2.3' + //implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.3.5' + 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}" + 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-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}" + //usefull + implementation group: 'io.netty', name: 'netty-all', version: "${nettyVersion}" + 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}" + implementation group: 'org.yaml', name: 'snakeyaml', version: "${snakeyamlVersion}" + implementation group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: "${nekohtmlVersion}" + implementation group: 'org.dom4j', name: 'dom4j', version: "${dom4jVersion}" + implementation group: 'org.jdom', name: 'jdom2', version: "${jdom2Version}" + implementation group: 'com.google.zxing', name: 'core', version: "${zxingcoreVersion}" + implementation group: 'com.google.guava', name: 'guava', version: "${guavaVersion}" + implementation group: 'ognl', name: 'ognl', version: "${ognlVersion}" + implementation group: 'cglib', name: 'cglib', version: "${cglibVersion}" + implementation group: 'org.ow2.asm', name: 'asm', version: "${asmVersion}" + implementation group: 'aopalliance', name: 'aopalliance', version: "${aopallianceVersion}" + implementation group: 'org.aspectj', name: 'aspectjtools', version: "${aspectjtoolsVersion}" + implementation group: 'xalan', name: 'serializer', version: "${serializerVersion}" + implementation group: 'xml-resolver', name: 'xml-resolver', version: "${xmlresolverVersion}" + implementation group: 'org.apache.santuario', name: 'xmlsec', version: "${xmlsecVersion}" + //implementation group: 'org.ogce', name: 'xpp3', version: "${xpp3Version}" + implementation group: 'com.thoughtworks.xstream', name: 'xstream', version: "${xstreamVersion}" + implementation group: 'org.passay', name: 'passay', version: "${passayVersion}" + implementation group: 'org.quartz-scheduler', name: 'quartz', version: "${quartzVersion}" + //ip offline + implementation group: 'org.lionsoul', name: 'ip2region', version: "${ip2regionVersion}" + implementation group: 'com.maxmind.db', name: 'maxmind-db', version: "${maxminddbVersion}" + implementation group: 'com.maxmind.geoip2', name: 'geoip2', version: "${maxmindgeoip2Version}" + //micrometer + implementation group: 'io.micrometer', name: 'micrometer-commons', version: "${micrometercoreVersion}" + implementation group: 'io.micrometer', name: 'micrometer-core', version: "${micrometercoreVersion}" + implementation group: 'io.micrometer', name: 'micrometer-observation', 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}" + //prometheus + implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}" + implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}" + //阿里云 + implementation group: 'com.aliyun', name: 'aliyun-java-sdk-core', version: "${aliyunjavasdkcoreVersion}" + //腾讯云 + implementation group: 'com.tencentcloudapi', name: 'tencentcloud-sdk-java', version: "${tencentcloudsdkjavaVersion}" //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}" + implementation group: 'org.mapstruct', name: 'mapstruct', version: "${mapstructVersion}" + implementation group: 'io.swagger.core.v3', name: 'swagger-annotations-jakarta', version: "${swaggerV3Version}" + implementation group: 'io.swagger.core.v3', name: 'swagger-core-jakarta', version: "${swaggerV3Version}" + implementation group: 'io.swagger.core.v3', name: 'swagger-models-jakarta', version: "${swaggerV3Version}" //springdoc 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.springdoc', name: 'springdoc-openapi-starter-common', version: "${springdocVersion}" + implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-api', version: "${springdocVersion}" + implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: "${springdocVersion}" + //webjars 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}" + implementation group: 'com.github.xiaoymin', name: 'knife4j-openapi3-jakarta-spring-boot-starter', version: "${knife4jVersion}" //local jars implementation fileTree(dir: "${rootDir}/maxkey-lib/", include: '*.jar') } diff --git a/gradle.properties b/gradle.properties index 62393c86f..0ee354e90 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,36 +15,40 @@ # */ #maxkey properties group =org.dromara.maxkey -version =3.5.19 +version =4.0.0 vendor =https://www.maxkey.top author =MaxKeyTop #docker jib image -jibFromImage =adoptopenjdk:8-jre -jibToImage =maxkeytop -jibToAuthUsername =maxkeytop -jibToAuthPassword =docker registry credential +jibFromImage =eclipse-temurin:17-jre +jibToImage =maxkeytop +jibToAuthUsername =maxkeytop +jibToAuthPassword =docker registry credential #maxkey used jars version #spring -springVersion =5.3.29 -springBootVersion =2.7.14 -springSecurityVersion =5.7.10 -springDataVersion =2.7.8 -springkafkaVersion =2.9.0 +springVersion =6.0.11 +springBootVersion =3.1.2 +springSecurityVersion =6.1.2 +springDataVersion =3.0.3 +springkafkaVersion =3.0.6 springretryVersion =1.3.3 -springplugincoreVersion =2.0.0.RELEASE -springpluginmetadataVersion =2.0.0.RELEASE -springcloudVersion =3.1.4 -springcloudalibabaVersion =2021.1 +#spring plugin +springplugincoreVersion =3.0.0 +springpluginmetadataVersion =3.0.0 +#spring cloud +springcloudVersion =4.0.4 +#spring cloud alibaba +springcloudalibabaVersion =2022.0.0.0 springcloudalibabaspringVersion =1.0.11 springcloudalibabacsplVersion =1.8.5 -alibabanacosclientVersion =2.0.4 -#Apache +alibabanacosclientVersion =2.2.3 +#Apache commons commonsbeanutilsVersion =1.9.4 commonscodecVersion =1.15 commonscollectionsVersion =3.2.2 commonscollections4Version =4.4 +commonscompressVersion =1.21 commonscsvVersion =1.7 commonstextVersion =1.9 commonsdbcp2Version =2.9.0 @@ -53,141 +57,150 @@ commonsdigester3Version =3.2 commonsdigesterVersion =2.1 commonsioVersion =2.8.0 commonslangVersion =2.6 -commonslang3Version =3.11 +commonslang3Version =3.12.0 commonsloggingVersion =1.2 commonspool2Version =2.11.1 commonshttpclientVersion =3.1 commonsfileuploadVersion =1.5 -commonsemailVersion =1.5 commonsvalidatorVersion =1.7 +#Apache Http +#v4 httpcomponentsVersion =4.5.14 -httpcoreVersion =4.4.16 +httpcoreVersion =4.4.6 httpasyncclientVersion =4.1.5 +#v5 +httpcomponentscore5Version =5.2.1 +#Libs velocityVersion =1.7 velocitydepVersion =1.4 freemarkerVersion =2.3.32 xmlbeansVersion =5.0.2 -commonscompressVersion =1.21 poiVersion =5.2.3 -#apache mq -kafkaclientsVersion =2.8.9 -rocketmqclientVersion =4.9.4 -rocketmqspringbootVersion =2.2.2 -#apache tomcat -tomcatVersion =9.0.78 +#tomcat +tomcatVersion =10.1.11 #logs log4jVersion =2.20.0 -slf4jVersion =1.7.36 -jbossloggingVersion =3.4.3.Final +slf4jVersion =2.0.7 +jbossloggingVersion =3.5.0.Final +#Messaging Kafka & RocketMQ +kafkaclientsVersion =3.4.0 +rocketmqclientVersion =5.1.0 +rocketmqspringbootVersion =2.2.3 #google jibGradlePluginVersion =3.2.0 jhlabsfiltersVersion =2.0.235-1 kaptchaVersion =2.3.2 guavaVersion =31.1-jre -tinkVersion =1.7.0 +tinkVersion =1.8.0 zxingcoreVersion =3.5.1 concurrentlinkedhashmaplruVersion =1.4.2 #json -gsonVersion =2.10.1 -jacksonVersion =2.14.1 +gsonVersion =2.9.1 +jacksonVersion =2.15.0 fastjsonVersion =1.2.83 +minidevjsonsmartVersion =2.4.5 #database -postgresqlVersion =42.4.1 mysqlconnectorjavaVersion =8.0.32 -hibernateVersion =6.2.5.Final +dm8JdbcDriverVersion =8.1.2.192 +postgresqlVersion =42.4.1 druidVersion =1.2.16 druidspringbootstarterVersion =1.2.16 -jedisVersion =4.2.3 -caffeineVersion =2.9.3 -hazelcastVersion =4.2.2 +jedisVersion =4.3.2 +caffeineVersion =3.1.5 +hibernateVersion =7.0.5.Final mybatisVersion =3.5.12 -mybatisspringVersion =2.0.7 +mybatisspringVersion =3.0.1 +mybatisjpaextraVersion =3.2 #saml opensamlVersion =2.6.6 openwsVersion =1.5.6 xmltoolingVersion =1.4.6 -javasupportVersion =7.5.1 -#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 +javasupportVersion =8.0.0 #jakarta -jakartaannotationVersion =2.0.0 -jakartavalidationapiVersion =3.0.0 +jakartaannotationVersion =2.1.1 +jakartaactivationVersion =2.1.1 +jakartamailapiVersion =2.1.1 jakartapersistenceapiVersion =3.0.0 +jakartatransactionapiVersion =2.0.1 +jakartavalidationapiVersion =3.0.2 +jakartaxmlbindapiVersion =3.0.1 +#mail +angusjakartamailVersion =2.0.1 +angusactivationVersion =2.0.0 +#xml +xmlbindjaxbcoreVersion =3.0.2 +xmlbindjaxbimplVersion =3.0.2 +xmlbindjaxbxjcVersion =3.0.2 +#jwt +nimbusjosejwtVersion =9.31 +jcipannotationsVersion =1.0-1 +#others +thymeleafVersion =3.0.15.RELEASE +nettyVersion =4.1.65.Final +hazelcastVersion =4.2.2 attoparserVersion =2.0.5.RELEASE unbescapeVersion =1.1.6.RELEASE woodstoxVersion =6.2.8 -bouncycastleVersion =1.69 +bouncycastleVersion =1.71 junitVersion =4.11 -mockitoallVersion =1.10.19 xmlunitVersion =1.6 -nimbusjosejwtVersion =9.25 -jcipannotationsVersion =1.0 -minidevjsonsmartVersion =2.4.5 +mockitoallVersion =1.10.19 minidevasmVersion =1.0.2 javassistVersion =3.29.0-GA esapiVersion =2.2.0.0 -#javax -javaxmailVersion =1.6.2 -javaxpersistenceVersion =2.2.1 -javaxtransactionapiVersion =1.3 -javaxannotationapiVersion =1.3.2 -activationVersion =1.1.1 jtaVersion =1.1 validationapiVersion =2.0.1.Final jsr173Version =1.0 jaxbapiVersion =2.3.1 -jaxbcoreVersion =3.0.2 -jaxbimplVersion =3.0.2 -jaxbxjcVersion =3.0.2 -classmateVersion =1.5.0 +classmateVersion =1.5.1 reactivestreamsVersion =1.0.4 -reactorcoreVersion =3.4.21 -reactornettyVersion =1.0.21 -reactorextraVersion =3.4.8 +reactorcoreVersion =3.5.3 +reactornettyVersion =1.1.4 +reactorextraVersion =3.5.0 szxcvbnVersion =0.2 -jodatimeVersion =2.12.1 -snakeyamlVersion =1.32 nekohtmlVersion =1.9.22 ognlVersion =3.3.3 cglibVersion =3.3.0 -asmVersion =9.3 +asmVersion =9.4 aopallianceVersion =1.0 -aspectjtoolsVersion =1.9.4 +aspectjtoolsVersion =1.9.9.1 evictorVersion =1.0.0 lettuceVersion =6.1.9.RELEASE reflectionsVersion =0.10.2 -thymeleafVersion =3.0.15.RELEASE -nettyVersion =4.1.65.Final #xml -jdomVersion =2.0.2 -dom4jVersion =1.6.1 +jdom2Version =2.0.6.1 +dom4jVersion =2.1.4 serializerVersion =2.7.2 xmlresolverVersion =1.2 xmlsecVersion =2.1.7 xpp3Version =1.1.6 xstreamVersion =1.4.19 -#others -quartzVersion =2.3.2 passayVersion =1.6.2 LatencyUtilsVersion =2.0.3 stax2apiVersion =4.2.1 -mapstructVersion =1.4.1.Final -opentracingVersion =0.33.0 -ip2regionVersion =2.6.5 -pinyin4jVersion =2.5.1 -simplehttpVersion =1.0.5 -JustAuthVersion =1.16.5 -jsoupVersion =1.15.3 -#monitor +#tools +quartzVersion =2.3.2 springbootadminVersion =2.7.3 -micrometercoreVersion =1.9.10 +jodatimeVersion =2.12.2 +snakeyamlVersion =2.0 +ip2regionVersion =2.7.0 +maxminddbVersion =3.0.0 +maxmindgeoip2Version =4.0.1 +pinyin4jVersion =2.5.1 +jsoupVersion =1.15.4 +micrometercoreVersion =1.10.5 prometheusVersion =0.16.0 +mapstructVersion =1.5.3.Final +JustAuthVersion =1.16.5 +simplehttpVersion =1.0.5 +#doc +swaggerV3Version =2.2.8 +classgraphVersion =4.8.149 +webjarslocatorcoreVersion =0.52 +webjarslocatorVersion =0.46 +swaggeruiVersion =4.18.1 +springdocVersion =2.0.2 +knife4jVersion =4.0.0 #sdk aliyunjavasdkcoreVersion =4.5.1 tencentcloudsdkjavaVersion =3.1.33 diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java index e3319bea4..1090ba2bb 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthTokenRefreshPoint.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.authn.web; -import javax.servlet.http.HttpServletRequest; - import org.dromara.maxkey.authn.jwt.AuthJwt; import org.dromara.maxkey.authn.jwt.AuthRefreshTokenService; import org.dromara.maxkey.authn.jwt.AuthTokenService; @@ -37,6 +35,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import jakarta.servlet.http.HttpServletRequest; + @Controller @RequestMapping(value = "/auth") public class AuthTokenRefreshPoint { diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java index 87de83a8e..bab2c6305 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/AuthorizationUtils.java @@ -19,8 +19,6 @@ package org.dromara.maxkey.authn.web; import java.text.ParseException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authn.jwt.AuthTokenService; @@ -34,6 +32,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; + public class AuthorizationUtils { private static final Logger _logger = LoggerFactory.getLogger(AuthorizationUtils.class); diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java index 0d0f5bbe3..4d7e10c30 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/FileUploadEndpoint.java @@ -19,9 +19,6 @@ package org.dromara.maxkey.authn.web; import java.io.IOException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.FileUpload; import org.dromara.maxkey.entity.Message; @@ -36,6 +33,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Controller public class FileUploadEndpoint { diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/HttpSessionListenerAdapter.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/HttpSessionListenerAdapter.java index de2c133ef..5b85bd829 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/HttpSessionListenerAdapter.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/HttpSessionListenerAdapter.java @@ -17,10 +17,6 @@ package org.dromara.maxkey.authn.web; import java.util.Date; -import javax.servlet.annotation.WebListener; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.util.DateUtils; @@ -30,6 +26,11 @@ import org.slf4j.LoggerFactory; import org.springframework.security.core.Authentication; import org.springframework.security.core.userdetails.User; +import jakarta.servlet.annotation.WebListener; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; + @WebListener public class HttpSessionListenerAdapter implements HttpSessionListener { private static final Logger _logger = LoggerFactory.getLogger(HttpSessionListenerAdapter.class); diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java index 70b466a4f..e8a01dab4 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/InstitutionEndpoint.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.authn.web; -import javax.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.entity.Institutions; @@ -33,6 +31,8 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; +import jakarta.servlet.http.HttpServletRequest; + @Controller @RequestMapping(value = "/inst") public class InstitutionEndpoint { diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java index 86b225778..03b6c7849 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/SavedRequestAwareAuthenticationSuccessHandler.java @@ -18,9 +18,6 @@ package org.dromara.maxkey.authn.web; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.web.WebConstants; import org.dromara.maxkey.web.WebContext; @@ -33,6 +30,10 @@ import org.springframework.security.web.savedrequest.RequestCache; import org.springframework.security.web.savedrequest.SavedRequest; import org.springframework.util.StringUtils; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * An authentication success strategy which can make use of the * {@link DefaultSavedRequest} which may have been stored in the session by the diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/UnauthorizedEntryPoint.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/UnauthorizedEntryPoint.java index 02d6c7135..bac263776 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/UnauthorizedEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/UnauthorizedEntryPoint.java @@ -21,8 +21,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,6 +32,9 @@ import com.fasterxml.jackson.core.exc.StreamWriteException; import com.fasterxml.jackson.databind.DatabindException; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Controller @RequestMapping(value = "/auth") public class UnauthorizedEntryPoint { diff --git a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/interceptor/PermissionInterceptor.java b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/interceptor/PermissionInterceptor.java index fb5aa9760..99573d18f 100644 --- a/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/interceptor/PermissionInterceptor.java +++ b/maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/web/interceptor/PermissionInterceptor.java @@ -17,9 +17,6 @@ package org.dromara.maxkey.authn.web.interceptor; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authn.jwt.AuthTokenService; @@ -31,6 +28,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.servlet.AsyncHandlerInterceptor; + +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * 权限Interceptor处理 * @author Crystal.Sea diff --git a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java index df1141f4c..da906a27d 100644 --- a/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java +++ b/maxkey-authentications/maxkey-authentication-otp/src/main/java/org/dromara/maxkey/password/onetimepwd/impl/MailOtpAuthn.java @@ -18,14 +18,16 @@ package org.dromara.maxkey.password.onetimepwd.impl; import java.text.MessageFormat; -import org.apache.commons.mail.DefaultAuthenticator; -import org.apache.commons.mail.Email; -import org.apache.commons.mail.HtmlEmail; +import java.util.Properties; + import org.dromara.maxkey.configuration.EmailConfig; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.password.onetimepwd.AbstractOtpAuthn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.mail.SimpleMailMessage; +import org.springframework.mail.javamail.JavaMailSenderImpl; + public class MailOtpAuthn extends AbstractOtpAuthn { private static final Logger _logger = LoggerFactory.getLogger(MailOtpAuthn.class); @@ -57,26 +59,28 @@ public class MailOtpAuthn extends AbstractOtpAuthn { public boolean produce(UserInfo userInfo) { try { String token = this.genToken(userInfo); - Email email = new HtmlEmail(); - email.setCharset(this.defaultEncoding); - email.setHostName(emailConfig.getSmtpHost()); - email.setSmtpPort(emailConfig.getPort()); - email.setSSLOnConnect(emailConfig.isSsl()); - email.setAuthenticator( - new DefaultAuthenticator(emailConfig.getUsername(), emailConfig.getPassword())); - email.setFrom(emailConfig.getSender()); - email.setSubject(subject); - email.setMsg( - MessageFormat.format( - messageTemplate,userInfo.getUsername(),token,(interval / 60))); + //Sender + JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl(); + javaMailSender.setUsername(emailConfig.getUsername()); + javaMailSender.setPassword(emailConfig.getPassword()); + Properties properties = new Properties(); + properties.put("mail.smtp.auth","true"); + javaMailSender.setJavaMailProperties(properties); + javaMailSender.setHost(emailConfig.getSmtpHost()); + javaMailSender.setPort(emailConfig.getPort()); + + //MailMessage + SimpleMailMessage mailMessage = new SimpleMailMessage(); + mailMessage.setFrom(emailConfig.getSender()); + mailMessage.setTo(userInfo.getEmail()); + mailMessage.setSubject(subject); + mailMessage.setText( + MessageFormat.format( + messageTemplate,userInfo.getUsername(),token,(interval / 60))); + + javaMailSender.send(mailMessage); - email.addTo(userInfo.getEmail()); - try { - email.send(); - }catch (Exception e){ - e.printStackTrace(); - } _logger.debug( "token " + token + " send to user " + userInfo.getUsername() + ", email " + userInfo.getEmail()); @@ -120,3 +124,4 @@ public class MailOtpAuthn extends AbstractOtpAuthn { } + diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java index 292524c6e..99eb68f8e 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java @@ -19,9 +19,6 @@ package org.dromara.maxkey.authn.realm.ldap; import java.util.List; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - import org.dromara.maxkey.authn.realm.AbstractAuthenticationRealm; import org.dromara.maxkey.authn.realm.IAuthenticationServer; import org.dromara.maxkey.entity.UserInfo; @@ -29,6 +26,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + public class LdapAuthenticationRealm extends AbstractAuthenticationRealm{ private final static Logger _logger = LoggerFactory.getLogger(LdapAuthenticationRealm.class); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java index 96937390b..8dda15e9a 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/basic/BasicEntryPoint.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.authn.support.basic; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.LoginCredential; import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; @@ -33,6 +31,9 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.servlet.AsyncHandlerInterceptor; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class BasicEntryPoint implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(BasicEntryPoint.class); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/certs/HttpCertsEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/certs/HttpCertsEntryPoint.java index c1521ad66..9aa57a2f1 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/certs/HttpCertsEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/certs/HttpCertsEntryPoint.java @@ -19,9 +19,6 @@ package org.dromara.maxkey.authn.support.certs; import java.security.cert.X509Certificate; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; import org.dromara.maxkey.authn.support.httpheader.HttpHeaderEntryPoint; import org.slf4j.Logger; @@ -30,6 +27,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.servlet.AsyncHandlerInterceptor; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class HttpCertsEntryPoint implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(HttpHeaderEntryPoint.class); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java index 7c9550402..854d593fd 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/httpheader/HttpHeaderEntryPoint.java @@ -17,9 +17,6 @@ package org.dromara.maxkey.authn.support.httpheader; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authn.LoginCredential; import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; import org.dromara.maxkey.constants.ConstsLoginType; @@ -31,6 +28,9 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.servlet.AsyncHandlerInterceptor; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class HttpHeaderEntryPoint implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(HttpHeaderEntryPoint.class); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java index 560535dc0..eed6fcfd5 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/kerberos/HttpKerberosEntryPoint.java @@ -17,9 +17,6 @@ package org.dromara.maxkey.authn.support.kerberos; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authn.LoginCredential; import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; import org.dromara.maxkey.authn.web.AuthorizationUtils; @@ -34,6 +31,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.AsyncHandlerInterceptor; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class HttpKerberosEntryPoint implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(HttpKerberosEntryPoint.class); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java index 5a5c544ef..4e21f3eb6 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/rememberme/AbstractRemeberMeManager.java @@ -19,8 +19,6 @@ package org.dromara.maxkey.authn.support.rememberme; import java.text.ParseException; import java.util.Date; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authn.jwt.AuthTokenService; @@ -36,6 +34,9 @@ import org.springframework.security.core.Authentication; import com.nimbusds.jwt.JWTClaimsSet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public abstract class AbstractRemeberMeManager { private static final Logger _logger = LoggerFactory.getLogger(AbstractRemeberMeManager.class); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java index 7ccdf5333..49807afad 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/HttpWsFederationEntryPoint.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.authn.support.wsfederation; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.LoginCredential; import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; @@ -31,6 +29,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.AsyncHandlerInterceptor; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class HttpWsFederationEntryPoint implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(HttpWsFederationEntryPoint.class); diff --git a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConfiguration.java b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConfiguration.java index 3cddc24d1..c2f81e508 100644 --- a/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConfiguration.java +++ b/maxkey-authentications/maxkey-authentication-provider/src/main/java/org/dromara/maxkey/authn/support/wsfederation/WsFederationConfiguration.java @@ -21,7 +21,8 @@ package org.dromara.maxkey.authn.support.wsfederation; import org.opensaml.xml.security.x509.BasicX509Credential; import org.springframework.core.io.Resource; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; + import java.util.ArrayList; import java.util.List; diff --git a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java index 47b2f70df..9f7981e80 100644 --- a/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java +++ b/maxkey-authentications/maxkey-authentication-social/src/main/java/org/dromara/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java @@ -20,8 +20,6 @@ */ package org.dromara.maxkey.authn.support.socialsignon; -import javax.servlet.http.HttpServletRequest; - import me.zhyd.oauth.request.AuthMaxkeyRequest; import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.LoginCredential; @@ -40,6 +38,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; + +import jakarta.servlet.http.HttpServletRequest; import me.zhyd.oauth.request.AuthRequest; import java.util.Map; diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java index a3e7d213a..a86105db3 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/encryption/service/impl/DefaultJwtEncryptionAndDecryptionService.java @@ -24,7 +24,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.annotation.PostConstruct; import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.dromara.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService; @@ -46,6 +45,8 @@ import com.nimbusds.jose.jwk.JWK; import com.nimbusds.jose.jwk.OctetSequenceKey; import com.nimbusds.jose.jwk.RSAKey; +import jakarta.annotation.PostConstruct; + /** * @author wkim * diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java index 73be776f2..c955a4a59 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/crypto/jwt/signer/service/impl/JWKSetCacheService.java @@ -22,8 +22,6 @@ package org.dromara.maxkey.crypto.jwt.signer.service.impl; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.HttpClientBuilder; import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; import org.dromara.maxkey.crypto.jwt.encryption.service.JwtEncryptionAndDecryptionService; import org.dromara.maxkey.crypto.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; @@ -105,8 +103,9 @@ public class JWKSetCacheService { * */ private class JWKSetVerifierFetcher extends CacheLoader { - private HttpClient httpClient = HttpClientBuilder.create().useSystemProperties().build(); - private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); + //private HttpClient httpClient = HttpClientBuilder.create().useSystemProperties().build(); + //private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); + private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(); private RestTemplate restTemplate = new RestTemplate(httpFactory); /** @@ -133,8 +132,9 @@ public class JWKSetCacheService { * */ private class JWKSetEncryptorFetcher extends CacheLoader { - private HttpClient httpClient = HttpClientBuilder.create().useSystemProperties().build(); - private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); + //private HttpClient httpClient = HttpClientBuilder.create().useSystemProperties().build(); + //private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); + private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(); private RestTemplate restTemplate = new RestTemplate(httpFactory); /* (non-Javadoc) * @see com.google.common.cache.CacheLoader#load(java.lang.Object) diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java index f974ff7e1..dfa29bdac 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/AuthorizationHeaderUtils.java @@ -17,10 +17,10 @@ package org.dromara.maxkey.util; -import javax.servlet.http.HttpServletRequest; - import org.dromara.maxkey.crypto.Base64Utils; +import jakarta.servlet.http.HttpServletRequest; + /** * @author Crystal.Sea * diff --git a/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java b/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java index b07abd3fd..ee0e92fa6 100644 --- a/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java +++ b/maxkey-common/src/main/java/org/dromara/maxkey/util/RequestTokenUtils.java @@ -1,9 +1,10 @@ package org.dromara.maxkey.util; -import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; +import jakarta.servlet.http.HttpServletRequest; + /** * 从请求中解析token令牌信息,优先级顺序如下 *

diff --git a/maxkey-common/src/test/java/org/maxkey/mail/MailTest.java b/maxkey-common/src/test/java/org/maxkey/mail/MailTest.java index e5ce9718f..8dd7d9cda 100644 --- a/maxkey-common/src/test/java/org/maxkey/mail/MailTest.java +++ b/maxkey-common/src/test/java/org/maxkey/mail/MailTest.java @@ -17,9 +17,6 @@ package org.maxkey.mail; -import org.apache.commons.mail.DefaultAuthenticator; -import org.apache.commons.mail.Email; -import org.apache.commons.mail.SimpleEmail; public class MailTest { @@ -31,7 +28,7 @@ public class MailTest { int port=465; boolean ssl=true; String senderMail="test@connsec.com"; - + /* Email email = new SimpleEmail(); email.setHostName(smtpHost); email.setSmtpPort(port); @@ -42,5 +39,6 @@ public class MailTest { email.setMsg("You Token is "+111+" , it validity in "+5 +" minutes"); email.addTo("shimingxy@qq.com"); email.send(); + */ } } diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java index b9ff0934c..1e0aa111d 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/ApplicationAutoConfiguration.java @@ -90,11 +90,11 @@ public class ApplicationAutoConfiguration implements InitializingBean { @Bean public PasswordEncoder passwordEncoder( @Value("${maxkey.crypto.password.encoder:bcrypt}") String idForEncode) { - Map encoders = new HashMap(); + Map encoders = new HashMap(); encoders.put("bcrypt", new BCryptPasswordEncoder()); encoders.put("plain", NoOpPasswordEncoder.getInstance()); - encoders.put("pbkdf2", new Pbkdf2PasswordEncoder()); - encoders.put("scrypt", new SCryptPasswordEncoder()); + encoders.put("pbkdf2", Pbkdf2PasswordEncoder.defaultsForSpringSecurity_v5_8()); + encoders.put("scrypt", SCryptPasswordEncoder.defaultsForSpringSecurity_v5_8()); //md encoders.put("md4", new Md4PasswordEncoder()); encoders.put("md5", new MessageDigestPasswordEncoder("MD5")); diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java index 074c6a7e4..263816bda 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/MvcAutoConfiguration.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.servlet.Filter; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.constants.ConstsTimeInterval; @@ -53,7 +52,6 @@ import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; import org.springframework.web.filter.DelegatingFilterProxy; -import org.springframework.web.multipart.commons.CommonsMultipartResolver; import org.springframework.web.servlet.LocaleResolver; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.CookieLocaleResolver; @@ -61,6 +59,8 @@ import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; +import jakarta.servlet.Filter; + @AutoConfiguration public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer { @@ -102,6 +102,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer * upload file support . * @return multipartResolver */ + /* @Bean (name = "multipartResolver") public CommonsMultipartResolver commonsMultipartResolver( @Value("${spring.servlet.multipart.max-file-size:0}") int maxUploadSize) { @@ -110,7 +111,7 @@ public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer new CommonsMultipartResolver(); multipartResolver.setMaxUploadSize(maxUploadSize); return multipartResolver; - } + }*/ /** * handlerMapping . diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java index c0aa57b3a..d1d8a872c 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerConfig.java @@ -5,8 +5,8 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springdoc.core.GroupedOpenApi; import org.springdoc.core.customizers.GlobalOpenApiCustomizer; +import org.springdoc.core.models.GroupedOpenApi; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java index f28ec851f..b67580d1b 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Accounts.java @@ -21,17 +21,17 @@ import java.io.Serializable; import java.util.HashMap; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; import org.hibernate.validator.constraints.Length; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + /* ID varchar(40) not null, UID varchar(40) null, @@ -43,14 +43,14 @@ import com.fasterxml.jackson.annotation.JsonIgnore; */ @Entity @Table(name = "MXK_ACCOUNTS") -public class Accounts extends JpaBaseEntity implements Serializable { +public class Accounts extends JpaEntity implements Serializable { private static final long serialVersionUID = 6829592256223630307L; public static final String DEFAULT_PASSWORD_SUFFIX = UserInfo.DEFAULT_PASSWORD_SUFFIX; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue private String id; @Column private String userId; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java index 1555d63f0..9a9e4536d 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/AccountsStrategy.java @@ -20,17 +20,18 @@ package org.dromara.maxkey.entity; import java.io.Serializable; import java.util.Base64; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + @Entity @Table(name = "MXK_ACCOUNTS_STRATEGY") -public class AccountsStrategy extends JpaBaseEntity implements Serializable { +public class AccountsStrategy extends JpaEntity implements Serializable { /** * @@ -38,7 +39,7 @@ public class AccountsStrategy extends JpaBaseEntity implements Serializable { private static final long serialVersionUID = -8743329570694948718L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid") + @GeneratedValue private String id; @Column private String name; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java index 96fd67aee..8584ea52d 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ChangePassword.java @@ -17,9 +17,9 @@ package org.dromara.maxkey.entity; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; -public class ChangePassword extends JpaBaseEntity{ +public class ChangePassword extends JpaEntity{ /** * diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java index d72369d41..e86aae15c 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Connectors.java @@ -17,23 +17,23 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; import org.dromara.maxkey.pretty.impl.JsonPretty; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_CONNECTORS") -public class Connectors extends JpaBaseEntity implements Serializable { +public class Connectors extends JpaEntity implements Serializable { private static final long serialVersionUID = 4660258495864814777L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Column String connName; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/EmailSenders.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/EmailSenders.java index 58a33e572..5c5ea01ea 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/EmailSenders.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/EmailSenders.java @@ -17,18 +17,19 @@ package org.dromara.maxkey.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; + +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_EMAIL_SENDERS") -public class EmailSenders extends JpaBaseEntity{ +public class EmailSenders extends JpaEntity{ /** * @@ -37,7 +38,7 @@ public class EmailSenders extends JpaBaseEntity{ @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue private String id; @Column diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java index 7ea3a3403..982a13f89 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/ExcelImport.java @@ -19,17 +19,17 @@ package org.dromara.maxkey.entity; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; + import java.io.IOException; import java.io.InputStream; -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.dromara.mybatis.jpa.entity.JpaEntity; import org.springframework.web.multipart.MultipartFile; /** @@ -37,7 +37,7 @@ import org.springframework.web.multipart.MultipartFile; * @author Crystal.Sea * */ -public class ExcelImport extends JpaBaseEntity { +public class ExcelImport extends JpaEntity { /** * @@ -46,7 +46,7 @@ public class ExcelImport extends JpaBaseEntity { @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @JsonIgnore diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java index 9aac27e5e..012b56de6 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/FileUpload.java @@ -17,26 +17,26 @@ package org.dromara.maxkey.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; import org.springframework.web.multipart.MultipartFile; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + @Entity @Table(name = "MXK_FILE_UPLOAD") -public class FileUpload extends JpaBaseEntity { +public class FileUpload extends JpaEntity { private static final long serialVersionUID = -4338400992411166457L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Column diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryConnector.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryConnector.java index 54061f465..2e874abc5 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryConnector.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryConnector.java @@ -18,18 +18,18 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; @Entity @Table(name = "MXK_HISTORY_CONNECTOR") -public class HistoryConnector extends JpaBaseEntity implements Serializable { +public class HistoryConnector extends JpaEntity implements Serializable { /** * @@ -38,7 +38,7 @@ public class HistoryConnector extends JpaBaseEntity implements Serializable { @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Column diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLogin.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLogin.java index ad2c67eb5..76c7802a2 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLogin.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLogin.java @@ -19,14 +19,14 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; /** @@ -35,7 +35,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity; */ @Entity @Table(name = "MXK_HISTORY_LOGIN") -public class HistoryLogin extends JpaBaseEntity implements Serializable{ +public class HistoryLogin extends JpaEntity implements Serializable{ /** * @@ -43,7 +43,7 @@ public class HistoryLogin extends JpaBaseEntity implements Serializable{ private static final long serialVersionUID = -1321470643357719383L; @Id @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + @GeneratedValue String id; @Column String sessionId; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLoginApps.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLoginApps.java index 05a02e824..0a0314b62 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLoginApps.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistoryLoginApps.java @@ -17,14 +17,13 @@ package org.dromara.maxkey.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Crystal.Sea @@ -32,12 +31,12 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity; */ @Entity @Table(name = "MXK_HISTORY_LOGIN_APPS") -public class HistoryLoginApps extends JpaBaseEntity { +public class HistoryLoginApps extends JpaEntity { private static final long serialVersionUID = 5085201575292304749L; @Id @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + @GeneratedValue String id; @Column private String sessionId; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySynchronizer.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySynchronizer.java index 910879186..a0d3fb783 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySynchronizer.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySynchronizer.java @@ -19,18 +19,18 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; @Entity @Table(name = "MXK_HISTORY_SYNCHRONIZER") -public class HistorySynchronizer extends JpaBaseEntity implements Serializable{ +public class HistorySynchronizer extends JpaEntity implements Serializable{ /** * @@ -38,7 +38,7 @@ public class HistorySynchronizer extends JpaBaseEntity implements Serializable private static final long serialVersionUID = -1184644499009162756L; @Id @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + @GeneratedValue String id; @Column String syncId; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySystemLogs.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySystemLogs.java index 2fb5e359d..31fce6182 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySystemLogs.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/HistorySystemLogs.java @@ -18,13 +18,14 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; + +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * . @@ -33,11 +34,11 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity; */ @Entity @Table(name = "MXK_HISTORY_SYSTEM_LOGS") -public class HistorySystemLogs extends JpaBaseEntity implements Serializable { +public class HistorySystemLogs extends JpaEntity implements Serializable { private static final long serialVersionUID = 6560201093784960493L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Column String topic; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java index 1e276f5a4..e7f83520b 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Institutions.java @@ -17,23 +17,23 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; @Entity @Table(name = "MXK_INSTITUTIONS") -public class Institutions extends JpaBaseEntity implements Serializable { +public class Institutions extends JpaEntity implements Serializable { private static final long serialVersionUID = -2375872012431214098L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue private String id; @Column private String name; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/LdapContext.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/LdapContext.java index 32606179e..37adb99b4 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/LdapContext.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/LdapContext.java @@ -18,17 +18,18 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; + +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_LDAP_CONTEXT") -public class LdapContext extends JpaBaseEntity implements Serializable { +public class LdapContext extends JpaEntity implements Serializable { /** @@ -37,7 +38,7 @@ public class LdapContext extends JpaBaseEntity implements Serializable { private static final long serialVersionUID = -4595539647817265938L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Column String product; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Localization.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Localization.java index 4a44ff060..7b0153708 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Localization.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Localization.java @@ -19,18 +19,17 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_LOCALIZATION") -public class Localization extends JpaBaseEntity implements Serializable { +public class Localization extends JpaEntity implements Serializable { /** * @@ -38,7 +37,7 @@ public class Localization extends JpaBaseEntity implements Serializable { private static final long serialVersionUID = -142504964446659847L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue private String id; @Column diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Organizations.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Organizations.java index c23ae06e3..15a76ed76 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Organizations.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Organizations.java @@ -18,13 +18,13 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * root organization node,
id = instId or id = parentId or parentId = -1 or parentId = 0 @@ -34,7 +34,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity; @Entity @Table(name = "MXK_ORGANIZATIONS") -public class Organizations extends JpaBaseEntity implements Serializable { +public class Organizations extends JpaEntity implements Serializable { private static final long serialVersionUID = 5085413816404119803L; @@ -43,7 +43,7 @@ public class Organizations extends JpaBaseEntity implements Serializable { @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue private String id; @Column private String orgCode; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java index 3b0876a84..3a9c16849 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/OrganizationsCast.java @@ -18,16 +18,17 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + @Entity @Table(name = "MXK_ORGANIZATIONS_CAST") -public class OrganizationsCast extends JpaBaseEntity implements Serializable { +public class OrganizationsCast extends JpaEntity implements Serializable { /** @@ -36,7 +37,7 @@ public class OrganizationsCast extends JpaBaseEntity implements Serializable { private static final long serialVersionUID = 5166920258761620856L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue private String id; @Column private String code; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/PasswordPolicy.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/PasswordPolicy.java index ac33ceefb..c66f8bd37 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/PasswordPolicy.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/PasswordPolicy.java @@ -17,14 +17,15 @@ package org.dromara.maxkey.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; + import org.dromara.maxkey.constants.ConstsServiceMessage; import org.dromara.maxkey.exception.PasswordPolicyException; import org.dromara.maxkey.web.WebContext; @@ -39,12 +40,12 @@ import java.util.List; @Entity @Table(name = "MXK_PASSWORD_POLICY") -public class PasswordPolicy extends JpaBaseEntity implements java.io.Serializable { +public class PasswordPolicy extends JpaEntity implements java.io.Serializable { private static final long serialVersionUID = -4797776994287829182L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; /** * minimum password lengths diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java index bc171ec81..7a205be3f 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Register.java @@ -17,18 +17,17 @@ package org.dromara.maxkey.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_REGISTER") -public class Register extends JpaBaseEntity{ +public class Register extends JpaEntity{ /** * @@ -36,7 +35,7 @@ public class Register extends JpaBaseEntity{ private static final long serialVersionUID = -4021412077583763378L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue private String id; @Column private String displayName; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Resources.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Resources.java index 867f3243c..633f253d7 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Resources.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Resources.java @@ -18,21 +18,22 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; + +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_RESOURCES") -public class Resources extends JpaBaseEntity implements Serializable { +public class Resources extends JpaEntity implements Serializable { private static final long serialVersionUID = 2567171742999638608L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid") + @GeneratedValue String id; @Column String resourceName; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/RoleMember.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RoleMember.java index 6fd8f626f..e6d765ab6 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/RoleMember.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RoleMember.java @@ -19,12 +19,13 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /* @@ -43,7 +44,7 @@ public class RoleMember extends UserInfo implements Serializable{ private static final long serialVersionUID = -8059639972590554760L; @Id @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + @GeneratedValue String id; @Column private String roleId; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePermissions.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePermissions.java index fe105955d..54638bb94 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePermissions.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePermissions.java @@ -19,12 +19,13 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.dromara.maxkey.entity.apps.Apps; @@ -45,7 +46,7 @@ public class RolePermissions extends Apps implements Serializable{ private static final long serialVersionUID = 8634166407201007340L; @Id @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + @GeneratedValue String id; @Column private String roleId; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePrivileges.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePrivileges.java index 137484398..20db3915f 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePrivileges.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/RolePrivileges.java @@ -18,24 +18,24 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.dromara.maxkey.constants.ConstsStatus; import org.dromara.maxkey.web.WebContext; @Entity @Table(name = "MXK_ROLE_PRIVILEGES") -public class RolePrivileges extends JpaBaseEntity implements Serializable { +public class RolePrivileges extends JpaEntity implements Serializable { private static final long serialVersionUID = -8783585691243853899L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Column String appId; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Roles.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Roles.java index 69c52ecb0..09cb6ff58 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Roles.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Roles.java @@ -18,17 +18,18 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.validator.constraints.Length; + @Entity @Table(name = "MXK_ROLES") -public class Roles extends JpaBaseEntity implements Serializable { +public class Roles extends JpaEntity implements Serializable { private static final long serialVersionUID = 4660258495864814777L; @@ -43,7 +44,7 @@ public class Roles extends JpaBaseEntity implements Serializable { @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Length(max = 60) diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java index 04041d29d..945ec39a4 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Saml20Metadata.java @@ -18,14 +18,20 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Saml20Metadata. * @author Crystal.Sea * */ -public class Saml20Metadata extends JpaBaseEntity implements Serializable { +public class Saml20Metadata extends JpaEntity implements Serializable { private static final long serialVersionUID = -403743150268165622L; public static final class ContactPersonType { diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SmsProvider.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SmsProvider.java index af0fb43f6..aeac8be63 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SmsProvider.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SmsProvider.java @@ -18,17 +18,17 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_SMS_PROVIDER") -public class SmsProvider extends JpaBaseEntity implements Serializable { +public class SmsProvider extends JpaEntity implements Serializable { /** @@ -37,7 +37,7 @@ public class SmsProvider extends JpaBaseEntity implements Serializable { private static final long serialVersionUID = -4595539647817265938L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Column String provider; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java index 7841a69fe..ce75fe147 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsAssociate.java @@ -17,14 +17,13 @@ package org.dromara.maxkey.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @@ -32,7 +31,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity; */ @Entity @Table(name = "MXK_SOCIALS_ASSOCIATE") -public class SocialsAssociate extends JpaBaseEntity { +public class SocialsAssociate extends JpaEntity { /** * @@ -40,7 +39,7 @@ public class SocialsAssociate extends JpaBaseEntity { private static final long serialVersionUID = 2151179554190800162L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid") + @GeneratedValue private String id; @Column private String provider; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java index a67e97c68..9e799dddd 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SocialsProvider.java @@ -19,14 +19,13 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Crystal.Sea @@ -34,14 +33,14 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity; */ @Entity @Table(name = "MXK_SOCIALS_PROVIDER") -public class SocialsProvider extends JpaBaseEntity implements Serializable { +public class SocialsProvider extends JpaEntity implements Serializable { /** * */ private static final long serialVersionUID = 1636727203025187769L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO,generator = "snowflakeid") + @GeneratedValue private String id; @Column private String provider; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java index 04be92022..ec345975f 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/SynchroRelated.java @@ -19,13 +19,13 @@ package org.dromara.maxkey.entity; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.dromara.maxkey.util.DateUtils; /** @@ -36,12 +36,12 @@ import org.dromara.maxkey.util.DateUtils; @Entity @Table(name = "MXK_SYNCHRO_RELATED") -public class SynchroRelated extends JpaBaseEntity { +public class SynchroRelated extends JpaEntity { private static final long serialVersionUID = 6993697309055585706L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Column protected String objectId; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java index c0180a26c..d5f65fee2 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/Synchronizers.java @@ -17,25 +17,25 @@ package org.dromara.maxkey.entity; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.hibernate.validator.constraints.Length; @Entity @Table(name = "MXK_SYNCHRONIZERS") -public class Synchronizers extends JpaBaseEntity implements Serializable { +public class Synchronizers extends JpaEntity implements Serializable { private static final long serialVersionUID = 4660258495864814777L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Length(max = 60) diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfo.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfo.java index ad22cc3ae..f48aea4c4 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfo.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfo.java @@ -21,13 +21,13 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.HashMap; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.dromara.maxkey.crypto.Base64Utils; import org.dromara.maxkey.util.StringUtils; @@ -39,7 +39,7 @@ import org.dromara.maxkey.util.StringUtils; @Entity @Table(name = "MXK_USERINFO") -public class UserInfo extends JpaBaseEntity { +public class UserInfo extends JpaEntity { private static final long serialVersionUID = 6402443942083382236L; public static final String CLASS_TYPE = "UserInfo"; @@ -51,7 +51,7 @@ public class UserInfo extends JpaBaseEntity { // @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; @Column protected String username; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfoAdjoint.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfoAdjoint.java index c3a7de36c..08c3277e1 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfoAdjoint.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/UserInfoAdjoint.java @@ -17,18 +17,17 @@ package org.dromara.maxkey.entity; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_USERINFO_ADJUNCT") -public class UserInfoAdjoint extends JpaBaseEntity { +public class UserInfoAdjoint extends JpaEntity { /** * @@ -37,7 +36,7 @@ public class UserInfoAdjoint extends JpaBaseEntity { @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue String id; protected String displayName; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java index abcbdbad0..13302ffa5 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/Apps.java @@ -19,14 +19,13 @@ package org.dromara.maxkey.entity.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.dromara.maxkey.constants.ConstsBoolean; import org.dromara.maxkey.crypto.Base64Utils; @@ -34,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; @Entity @Table(name = "MXK_APPS") -public class Apps extends JpaBaseEntity implements Serializable { +public class Apps extends JpaEntity implements Serializable { /** * @@ -57,7 +56,7 @@ public class Apps extends JpaBaseEntity implements Serializable { @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue protected String id; /** * diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java index 43df85a66..7e58b83ce 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsAdapters.java @@ -18,17 +18,17 @@ package org.dromara.maxkey.entity.apps; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_APPS_ADAPTERS") -public class AppsAdapters extends JpaBaseEntity implements Serializable { +public class AppsAdapters extends JpaEntity implements Serializable { /** * @@ -37,7 +37,7 @@ public class AppsAdapters extends JpaBaseEntity implements Serializable { @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue protected String id; /** * diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java index ebae8c39b..500ba6c3c 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsCasDetails.java @@ -17,12 +17,13 @@ package org.dromara.maxkey.entity.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_APPS_CAS_DETAILS") @@ -34,7 +35,7 @@ public class AppsCasDetails extends Apps { private static final long serialVersionUID = -4272290765948322084L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue private String id; @Column private String service; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java index 0f1ababc0..25cbf6353 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsExtendApiDetails.java @@ -17,8 +17,13 @@ package org.dromara.maxkey.entity.apps; -import javax.persistence.Entity; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "MXK_APPS_EXTENDAPI_DETAILS") diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java index 251c768da..f2ec09eb7 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsFormBasedDetails.java @@ -17,12 +17,13 @@ package org.dromara.maxkey.entity.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Crystal.Sea @@ -37,7 +38,7 @@ public class AppsFormBasedDetails extends Apps { private static final long serialVersionUID = 563313247706861431L; @Id @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + @GeneratedValue protected String id; @Column diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java index 550be8793..2d39c2852 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsJwtDetails.java @@ -20,12 +20,13 @@ */ package org.dromara.maxkey.entity.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Crystal.Sea @@ -42,7 +43,7 @@ public class AppsJwtDetails extends Apps { @Id @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + @GeneratedValue protected String id; @Column diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java index 2487cc200..cc2fc9609 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsOAuth20Details.java @@ -17,8 +17,13 @@ package org.dromara.maxkey.entity.apps; -import javax.persistence.Entity; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.dromara.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails; import org.springframework.util.StringUtils; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java index 1433dfc1b..0235b42ce 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsSAML20Details.java @@ -19,12 +19,13 @@ package org.dromara.maxkey.entity.apps; import java.security.cert.X509Certificate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Crystal.Sea @@ -40,7 +41,7 @@ public class AppsSAML20Details extends Apps { private static final long serialVersionUID = -291159876339333345L; @Id @Column - @GeneratedValue(strategy = GenerationType.AUTO, generator = "snowflakeid") + @GeneratedValue protected String id; @Column private String certIssuer; diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java index 3c9eb2526..3ee031ee9 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/apps/AppsTokenBasedDetails.java @@ -20,12 +20,13 @@ */ package org.dromara.maxkey.entity.apps; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import org.dromara.mybatis.jpa.entity.JpaEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * @author Crystal.Sea @@ -42,7 +43,7 @@ public class AppsTokenBasedDetails extends Apps { @Id @Column - @GeneratedValue(strategy=GenerationType.AUTO,generator="snowflakeid") + @GeneratedValue protected String id; /** * diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java index 9a0d2b226..66280ab1a 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java @@ -17,9 +17,9 @@ package org.dromara.maxkey.entity.xml; -import javax.xml.bind.annotation.XmlRootElement; +import org.dromara.mybatis.jpa.entity.JpaEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import jakarta.xml.bind.annotation.XmlRootElement; /** * xml can not include array , MultipartFile @@ -27,7 +27,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseEntity; * */ @XmlRootElement -public class UserInfoXML extends JpaBaseEntity { +public class UserInfoXML extends JpaEntity { /** * diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java index f3d2f5e29..b8ad97523 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/ConfigurerFreeMarker.java @@ -20,7 +20,6 @@ package org.dromara.maxkey.web; import java.io.IOException; import java.util.Map; -import javax.annotation.PostConstruct; import org.dromara.maxkey.web.tag.FreemarkerTag; import org.slf4j.Logger; @@ -33,6 +32,7 @@ import org.springframework.stereotype.Component; import freemarker.template.Configuration; import freemarker.template.TemplateException; +import jakarta.annotation.PostConstruct; @Component public class ConfigurerFreeMarker implements ApplicationContextAware { diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java index e7bbea23d..9a55ddf86 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/ExceptionEndpoint.java @@ -17,14 +17,15 @@ package org.dromara.maxkey.web; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Exception. * diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java index f0adaf2af..09687403a 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/HttpResponseAdapter.java @@ -18,12 +18,12 @@ package org.dromara.maxkey.web; import java.io.IOException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.constants.ContentType; import org.springframework.stereotype.Component; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; + @Component public class HttpResponseAdapter { diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java index 6e72589c6..b797db329 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/InitializeContext.java @@ -20,10 +20,10 @@ package org.dromara.maxkey.web; import org.apache.commons.lang.SystemUtils; import org.apache.commons.lang3.ArchUtils; import org.apache.commons.lang3.arch.Processor; -import org.apache.mybatis.jpa.util.JpaWebContext; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.crypto.Md5Sum; import org.dromara.maxkey.util.PathUtils; +import org.dromara.mybatis.jpa.spring.MybatisJpaContext; import org.joda.time.DateTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,9 +35,10 @@ import org.springframework.core.env.PropertySource; import org.springframework.core.env.StandardEnvironment; import org.springframework.web.context.support.WebApplicationContextUtils; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; + import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; @@ -69,7 +70,7 @@ public class InitializeContext extends HttpServlet { WebContext.applicationContext = applicationContext; - JpaWebContext.applicationContext = applicationContext; + MybatisJpaContext.init(applicationContext); // List Environment Variables listEnvVars(); @@ -178,7 +179,6 @@ public class InitializeContext extends HttpServlet { _logger.debug("propertySource {}" , it.next()); } - JpaWebContext.properties = WebContext.properties; _logger.trace("-----------------------------------------------------------"); } } diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java index be123ae52..8240cf1de 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/MetadataEndpoint.java @@ -17,22 +17,21 @@ package org.dromara.maxkey.web; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.mybatis.jpa.util.JpaWebContext; import org.dromara.maxkey.constants.ContentType; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Controller public class MetadataEndpoint { @RequestMapping(value = "/metadata/version",produces = ContentType.TEXT_PLAIN_UTF8, method={RequestMethod.GET}) @ResponseBody public String metadata(HttpServletRequest request,HttpServletResponse response) { - return JpaWebContext.version(); + return "";//WebContext.version(); } } diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java index 074c8787e..65ed8e04f 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebContext.java @@ -24,10 +24,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.commons.logging.LogFactory; import org.dromara.maxkey.configuration.ApplicationConfig; @@ -47,6 +43,11 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.i18n.CookieLocaleResolver; import org.springframework.web.servlet.support.RequestContextUtils; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + /** * Application is common class for Web Application Context. * diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java index e24264544..2cbf7dc77 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebInstRequestFilter.java @@ -19,11 +19,6 @@ package org.dromara.maxkey.web; import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.configuration.ApplicationConfig; @@ -33,6 +28,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.filter.GenericFilterBean; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; + public class WebInstRequestFilter extends GenericFilterBean { final static Logger _logger = LoggerFactory.getLogger(GenericFilterBean.class); diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java index 9e427f945..ad9d813e5 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/WebXssRequestFilter.java @@ -21,17 +21,18 @@ import java.io.IOException; import java.util.Enumeration; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; import org.apache.commons.text.StringEscapeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.filter.GenericFilterBean; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; + public class WebXssRequestFilter extends GenericFilterBean { final static Logger _logger = LoggerFactory.getLogger(GenericFilterBean.class); diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java index eebe4144c..9770eea2e 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BasePathTagDirective.java @@ -20,7 +20,6 @@ package org.dromara.maxkey.web.tag; import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletRequest; import org.dromara.maxkey.web.WebContext; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +29,7 @@ import freemarker.template.TemplateDirectiveBody; import freemarker.template.TemplateDirectiveModel; import freemarker.template.TemplateException; import freemarker.template.TemplateModel; +import jakarta.servlet.http.HttpServletRequest; /** * <@basePath/> diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java index 17c51f250..43c106bcb 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BaseTagDirective.java @@ -20,8 +20,6 @@ package org.dromara.maxkey.web.tag; import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.springframework.beans.factory.annotation.Autowired; import freemarker.core.Environment; @@ -29,6 +27,7 @@ import freemarker.template.TemplateDirectiveBody; import freemarker.template.TemplateDirectiveModel; import freemarker.template.TemplateException; import freemarker.template.TemplateModel; +import jakarta.servlet.http.HttpServletRequest; /** * 获取应用上下文标签 * <@base/> diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java index b1bac94a4..9f9c0cbed 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/BrowserTagDirective.java @@ -20,8 +20,6 @@ package org.dromara.maxkey.web.tag; import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.springframework.beans.factory.annotation.Autowired; import freemarker.core.Environment; @@ -29,6 +27,7 @@ import freemarker.template.TemplateDirectiveBody; import freemarker.template.TemplateDirectiveModel; import freemarker.template.TemplateException; import freemarker.template.TemplateModel; +import jakarta.servlet.http.HttpServletRequest; /** * 获取应用上下文标签 * <@browser name=""> diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java index 729231d0d..88f90dd07 100644 --- a/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java +++ b/maxkey-core/src/main/java/org/dromara/maxkey/web/tag/LocaleTagDirective.java @@ -22,9 +22,10 @@ import freemarker.template.TemplateDirectiveBody; import freemarker.template.TemplateDirectiveModel; import freemarker.template.TemplateException; import freemarker.template.TemplateModel; +import jakarta.servlet.http.HttpServletRequest; + import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletRequest; import org.dromara.maxkey.persistence.repository.LocalizationRepository; import org.dromara.maxkey.web.WebContext; diff --git a/maxkey-lib/kingbase8-8.6.0.jar b/maxkey-lib/kingbase8-8.6.0.jar new file mode 100644 index 000000000..43087395e Binary files /dev/null and b/maxkey-lib/kingbase8-8.6.0.jar differ diff --git a/maxkey-lib/mybatis-jpa-extra-2.8.jar b/maxkey-lib/mybatis-jpa-extra-2.8.jar deleted file mode 100644 index 014db9018..000000000 Binary files a/maxkey-lib/mybatis-jpa-extra-2.8.jar and /dev/null differ diff --git a/maxkey-lib/mybatis-jpa-extra-3.2.jar b/maxkey-lib/mybatis-jpa-extra-3.2.jar new file mode 100644 index 000000000..8c33c983f Binary files /dev/null and b/maxkey-lib/mybatis-jpa-extra-3.2.jar differ diff --git a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.8.jar b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.8.jar deleted file mode 100644 index dccffde44..000000000 Binary files a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.8.jar and /dev/null differ diff --git a/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.2.jar b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.2.jar new file mode 100644 index 000000000..865cae2ed Binary files /dev/null and b/maxkey-lib/mybatis-jpa-extra-spring-boot-starter-3.2.jar differ diff --git a/maxkey-lib/opensaml-2.6.6.jar b/maxkey-lib/opensaml-2.6.6.jar deleted file mode 100644 index 34ae4e3fd..000000000 Binary files a/maxkey-lib/opensaml-2.6.6.jar and /dev/null differ diff --git a/maxkey-lib/opensaml-2.6.7.jar b/maxkey-lib/opensaml-2.6.7.jar new file mode 100644 index 000000000..a93b8747e Binary files /dev/null and b/maxkey-lib/opensaml-2.6.7.jar differ diff --git a/maxkey-lib/openws-1.5.6.jar b/maxkey-lib/openws-1.5.6.jar deleted file mode 100644 index 563b0f94d..000000000 Binary files a/maxkey-lib/openws-1.5.6.jar and /dev/null differ diff --git a/maxkey-lib/openws-2.0.0.jar b/maxkey-lib/openws-2.0.0.jar new file mode 100644 index 000000000..ffd3e0c9a Binary files /dev/null and b/maxkey-lib/openws-2.0.0.jar differ diff --git a/maxkey-lib/xmltooling-1.4.6.jar b/maxkey-lib/xmltooling-1.4.6.jar deleted file mode 100644 index 6bf1f4f13..000000000 Binary files a/maxkey-lib/xmltooling-1.4.6.jar and /dev/null differ diff --git a/maxkey-lib/xmltooling-1.4.7.jar b/maxkey-lib/xmltooling-1.4.7.jar new file mode 100644 index 000000000..0d370a656 Binary files /dev/null and b/maxkey-lib/xmltooling-1.4.7.jar differ diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsMapper.java index ac7e9035a..23c7d53ea 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsMapper.java @@ -25,16 +25,16 @@ import java.util.List; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.Accounts; import org.dromara.maxkey.entity.AccountsStrategy; import org.dromara.maxkey.entity.UserInfo; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface AccountsMapper extends IJpaBaseMapper { +public interface AccountsMapper extends IJpaMapper { public List queryUserNotInStrategy(AccountsStrategy strategy); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsStrategyMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsStrategyMapper.java index 198719ed1..bda68d574 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsStrategyMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AccountsStrategyMapper.java @@ -22,16 +22,16 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.AccountsStrategy; import org.dromara.maxkey.entity.Roles; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface AccountsStrategyMapper extends IJpaBaseMapper { +public interface AccountsStrategyMapper extends IJpaMapper { public List queryDynamicGroups(Roles groups); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsAdaptersMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsAdaptersMapper.java index 62edaa5a1..9ef377fea 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsAdaptersMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsAdaptersMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.apps.AppsAdapters; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface AppsAdaptersMapper extends IJpaBaseMapper { +public interface AppsAdaptersMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsCasDetailsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsCasDetailsMapper.java index a842b0339..baaa06763 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsCasDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsCasDetailsMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.apps.AppsCasDetails; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface AppsCasDetailsMapper extends IJpaBaseMapper { +public interface AppsCasDetailsMapper extends IJpaMapper { public AppsCasDetails getAppDetails(String id) ; } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java index f5b8f18ef..0a3d7ec2d 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.apps.AppsFormBasedDetails; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface AppsFormBasedDetailsMapper extends IJpaBaseMapper { +public interface AppsFormBasedDetailsMapper extends IJpaMapper { public AppsFormBasedDetails getAppDetails(String id) ; } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsJwtDetailsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsJwtDetailsMapper.java index 594a123ea..1d667d8d4 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsJwtDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsJwtDetailsMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.apps.AppsJwtDetails; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface AppsJwtDetailsMapper extends IJpaBaseMapper { +public interface AppsJwtDetailsMapper extends IJpaMapper { public AppsJwtDetails getAppDetails(String id); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsMapper.java index cec074105..f2550a819 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsMapper.java @@ -23,15 +23,15 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; import org.apache.ibatis.annotations.Update; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.apps.Apps; import org.dromara.maxkey.entity.apps.UserApps; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface AppsMapper extends IJpaBaseMapper { +public interface AppsMapper extends IJpaMapper { public int insertApp(Apps app); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java index b918ade22..d1931b164 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.apps.AppsSAML20Details; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface AppsSaml20DetailsMapper extends IJpaBaseMapper { +public interface AppsSaml20DetailsMapper extends IJpaMapper { public AppsSAML20Details getAppDetails(String id); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java index 363db9c6b..ab5d4a644 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface AppsTokenBasedDetailsMapper extends IJpaBaseMapper { +public interface AppsTokenBasedDetailsMapper extends IJpaMapper { public AppsTokenBasedDetails getAppDetails(String id); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ConnectorsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ConnectorsMapper.java index 25c9cab99..946f4fa01 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ConnectorsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ConnectorsMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.Connectors; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface ConnectorsMapper extends IJpaBaseMapper { +public interface ConnectorsMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/EmailSendersMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/EmailSendersMapper.java index 3d23f1726..cb0a60a7c 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/EmailSendersMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/EmailSendersMapper.java @@ -16,9 +16,9 @@ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.EmailSenders; +import org.dromara.mybatis.jpa.IJpaMapper; -public interface EmailSendersMapper extends IJpaBaseMapper { +public interface EmailSendersMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/FileUploadMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/FileUploadMapper.java index c7614a0cd..b05003b05 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/FileUploadMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/FileUploadMapper.java @@ -20,13 +20,13 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.FileUpload; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface FileUploadMapper extends IJpaBaseMapper { +public interface FileUploadMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryConnectorMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryConnectorMapper.java index 371da20db..25ef39199 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryConnectorMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryConnectorMapper.java @@ -18,13 +18,13 @@ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.HistoryConnector; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface HistoryConnectorMapper extends IJpaBaseMapper { +public interface HistoryConnectorMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginAppsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginAppsMapper.java index 80e1d5da4..adb084cba 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginAppsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginAppsMapper.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.HistoryLoginApps; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface HistoryLoginAppsMapper extends IJpaBaseMapper { +public interface HistoryLoginAppsMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginMapper.java index 06e9b696d..2245c6d41 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistoryLoginMapper.java @@ -20,14 +20,14 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.HistoryLogin; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface HistoryLoginMapper extends IJpaBaseMapper { +public interface HistoryLoginMapper extends IJpaMapper { public List queryOnlineSession(HistoryLogin historyLogin); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySynchronizerMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySynchronizerMapper.java index 0be3a9e59..bfbc677ad 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySynchronizerMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySynchronizerMapper.java @@ -18,13 +18,13 @@ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.HistorySynchronizer; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface HistorySynchronizerMapper extends IJpaBaseMapper { +public interface HistorySynchronizerMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySystemLogsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySystemLogsMapper.java index e5c726753..e8338db46 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySystemLogsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/HistorySystemLogsMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.HistorySystemLogs; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface HistorySystemLogsMapper extends IJpaBaseMapper { +public interface HistorySystemLogsMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/InstitutionsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/InstitutionsMapper.java index 1c7984aef..86ed997ea 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/InstitutionsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/InstitutionsMapper.java @@ -17,11 +17,11 @@ package org.dromara.maxkey.persistence.mapper; import org.apache.ibatis.annotations.Select; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.constants.ConstsStatus; import org.dromara.maxkey.entity.Institutions; +import org.dromara.mybatis.jpa.IJpaMapper; -public interface InstitutionsMapper extends IJpaBaseMapper { +public interface InstitutionsMapper extends IJpaMapper { @Select("select * from mxk_institutions where domain = #{value} and status = " + ConstsStatus.ACTIVE) public Institutions findByDomain(String domain); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/LdapContextMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/LdapContextMapper.java index 27940bb02..297e25dbe 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/LdapContextMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/LdapContextMapper.java @@ -16,9 +16,9 @@ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.LdapContext; +import org.dromara.mybatis.jpa.IJpaMapper; -public interface LdapContextMapper extends IJpaBaseMapper { +public interface LdapContextMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsCastMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsCastMapper.java index a9d11d2da..fbebc5d86 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsCastMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsCastMapper.java @@ -18,11 +18,11 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.Organizations; import org.dromara.maxkey.entity.OrganizationsCast; +import org.dromara.mybatis.jpa.IJpaMapper; -public interface OrganizationsCastMapper extends IJpaBaseMapper { +public interface OrganizationsCastMapper extends IJpaMapper { public List queryOrgs(Organizations organization); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsMapper.java index 063dde541..b45a39b60 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/OrganizationsMapper.java @@ -18,10 +18,11 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.dromara.maxkey.entity.Organizations; -public interface OrganizationsMapper extends IJpaBaseMapper { +import org.dromara.maxkey.entity.Organizations; +import org.dromara.mybatis.jpa.IJpaMapper; + +public interface OrganizationsMapper extends IJpaMapper { public List queryOrgs(Organizations organization); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/PasswordPolicyMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/PasswordPolicyMapper.java index f2b5d4e38..9e0365235 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/PasswordPolicyMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/PasswordPolicyMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.PasswordPolicy; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface PasswordPolicyMapper extends IJpaBaseMapper { +public interface PasswordPolicyMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RegisterMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RegisterMapper.java index c60de7fe0..1a4a57547 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RegisterMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RegisterMapper.java @@ -22,16 +22,16 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.Register; import org.dromara.maxkey.entity.UserInfo; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface RegisterMapper extends IJpaBaseMapper { +public interface RegisterMapper extends IJpaMapper { public List findByEmail(String email); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java index 7b1764ccb..1ae3bded2 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ReportMapper.java @@ -24,15 +24,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; +import org.dromara.mybatis.jpa.IJpaMapper; +import org.dromara.mybatis.jpa.entity.JpaEntity; /** * @author Crystal.sea * */ -public interface ReportMapper extends IJpaBaseMapper { +public interface ReportMapper extends IJpaMapper { public Integer analysisDay(HashMap reportParameter); public Integer analysisNewUsers(HashMap reportParameter); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ResourcesMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ResourcesMapper.java index 81500f707..23494df48 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ResourcesMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/ResourcesMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.Resources; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface ResourcesMapper extends IJpaBaseMapper { +public interface ResourcesMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RoleMemberMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RoleMemberMapper.java index 38d016709..d511f9ec2 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RoleMemberMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RoleMemberMapper.java @@ -22,17 +22,17 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.RoleMember; import org.dromara.maxkey.entity.Roles; import org.dromara.maxkey.entity.UserInfo; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface RoleMemberMapper extends IJpaBaseMapper { +public interface RoleMemberMapper extends IJpaMapper { public List memberInRole(RoleMember entity); public List memberNotInRole(RoleMember entity); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePermissionsMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePermissionsMapper.java index 9a6f8eb8a..967036859 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePermissionsMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePermissionsMapper.java @@ -22,15 +22,15 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.RolePermissions; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface RolePermissionsMapper extends IJpaBaseMapper { +public interface RolePermissionsMapper extends IJpaMapper { public ListappsInRole(RolePermissions entity); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePrivilegesMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePrivilegesMapper.java index f707e09f2..ad272e2b5 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePrivilegesMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolePrivilegesMapper.java @@ -22,15 +22,15 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.RolePrivileges; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface RolePrivilegesMapper extends IJpaBaseMapper { +public interface RolePrivilegesMapper extends IJpaMapper { public int insertRolePrivileges(List rolePermissionsList); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolesMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolesMapper.java index f40b03ef2..74a2cc193 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolesMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/RolesMapper.java @@ -22,15 +22,15 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.Roles; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface RolesMapper extends IJpaBaseMapper { +public interface RolesMapper extends IJpaMapper { public List queryDynamicRoles(Roles groups); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SmsProviderMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SmsProviderMapper.java index 98e485e6d..c8c1dad9e 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SmsProviderMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SmsProviderMapper.java @@ -16,9 +16,10 @@ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; -import org.dromara.maxkey.entity.SmsProvider; -public interface SmsProviderMapper extends IJpaBaseMapper { +import org.dromara.maxkey.entity.SmsProvider; +import org.dromara.mybatis.jpa.IJpaMapper; + +public interface SmsProviderMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsAssociateMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsAssociateMapper.java index 43487e3f9..e689fcc8e 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsAssociateMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsAssociateMapper.java @@ -18,11 +18,11 @@ package org.dromara.maxkey.persistence.mapper; import java.util.List; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.SocialsAssociate; import org.dromara.maxkey.entity.UserInfo; +import org.dromara.mybatis.jpa.IJpaMapper; -public interface SocialsAssociateMapper extends IJpaBaseMapper { +public interface SocialsAssociateMapper extends IJpaMapper { public List queryByUser(UserInfo user); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsProviderMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsProviderMapper.java index 080fce14f..80d7a0eb2 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsProviderMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SocialsProviderMapper.java @@ -17,15 +17,15 @@ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.SocialsProvider; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.Sea * */ -public interface SocialsProviderMapper extends IJpaBaseMapper{ +public interface SocialsProviderMapper extends IJpaMapper{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchroRelatedMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchroRelatedMapper.java index aa816421b..a8a188e41 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchroRelatedMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchroRelatedMapper.java @@ -21,14 +21,14 @@ package org.dromara.maxkey.persistence.mapper; import org.apache.ibatis.annotations.Update; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.SynchroRelated; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface SynchroRelatedMapper extends IJpaBaseMapper { +public interface SynchroRelatedMapper extends IJpaMapper { @Update("update mxk_synchro_related set synctime = #{syncTime} where id= #{id} ") public int updateSyncTime(SynchroRelated synchroRelated); } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchronizersMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchronizersMapper.java index e6580776e..796fa4257 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchronizersMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/SynchronizersMapper.java @@ -20,14 +20,14 @@ */ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.Synchronizers; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.sea * */ -public interface SynchronizersMapper extends IJpaBaseMapper { +public interface SynchronizersMapper extends IJpaMapper { } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoAdjointMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoAdjointMapper.java index 289daf85c..8b893c858 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoAdjointMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoAdjointMapper.java @@ -17,15 +17,15 @@ package org.dromara.maxkey.persistence.mapper; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.entity.UserInfoAdjoint; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.Sea * */ -public interface UserInfoAdjointMapper extends IJpaBaseMapper{ +public interface UserInfoAdjointMapper extends IJpaMapper{ } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoMapper.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoMapper.java index 26af4db50..fdb87b8de 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoMapper.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/mapper/UserInfoMapper.java @@ -21,19 +21,19 @@ import java.util.List; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; -import org.apache.mybatis.jpa.persistence.IJpaBaseMapper; import org.dromara.maxkey.constants.ConstsStatus; import org.dromara.maxkey.entity.ChangePassword; import org.dromara.maxkey.entity.Organizations; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.entity.UserInfoAdjoint; +import org.dromara.mybatis.jpa.IJpaMapper; /** * @author Crystal.Sea * */ -public interface UserInfoMapper extends IJpaBaseMapper{ +public interface UserInfoMapper extends IJpaMapper{ //login query public UserInfo findByAppIdAndUsername(UserInfo userInfo); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java index cebc78a96..6e0420156 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsService.java @@ -19,7 +19,6 @@ package org.dromara.maxkey.persistence.service; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.constants.ConstsStatus; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.Accounts; @@ -31,6 +30,7 @@ import org.dromara.maxkey.provision.ProvisionAction; import org.dromara.maxkey.provision.ProvisionService; import org.dromara.maxkey.provision.ProvisionTopic; import org.dromara.maxkey.util.StringUtils; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -42,7 +42,7 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType; import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; @Repository -public class AccountsService extends JpaBaseService{ +public class AccountsService extends JpaService{ @Autowired ProvisionService provisionService; diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java index 91298f399..aa57e5f4d 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AccountsStrategyService.java @@ -20,16 +20,16 @@ package org.dromara.maxkey.persistence.service; import java.io.Serializable; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.AccountsStrategy; import org.dromara.maxkey.entity.Roles; import org.dromara.maxkey.persistence.mapper.AccountsStrategyMapper; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository -public class AccountsStrategyService extends JpaBaseService implements Serializable { +public class AccountsStrategyService extends JpaService implements Serializable { /** * */ diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsAdaptersService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsAdaptersService.java index 62d18ea6a..28145ba5b 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsAdaptersService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsAdaptersService.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.apps.AppsAdapters; import org.dromara.maxkey.persistence.mapper.AppsAdaptersMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class AppsAdaptersService extends JpaBaseService{ +public class AppsAdaptersService extends JpaService{ public AppsAdaptersService() { super(AppsAdaptersMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java index 61cd861b0..a0fc9d495 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsCasDetailsService.java @@ -19,16 +19,16 @@ package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.apps.AppsCasDetails; import org.dromara.maxkey.persistence.mapper.AppsCasDetailsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @Repository -public class AppsCasDetailsService extends JpaBaseService{ +public class AppsCasDetailsService extends JpaService{ protected final static Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java index 6a8d51637..8a4292746 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsFormBasedDetailsService.java @@ -19,16 +19,16 @@ package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.apps.AppsFormBasedDetails; import org.dromara.maxkey.persistence.mapper.AppsFormBasedDetailsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @Repository -public class AppsFormBasedDetailsService extends JpaBaseService{ +public class AppsFormBasedDetailsService extends JpaService{ protected final static Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java index 7724b780d..0ae2ef83d 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsJwtDetailsService.java @@ -19,16 +19,16 @@ package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.apps.AppsJwtDetails; import org.dromara.maxkey.persistence.mapper.AppsJwtDetailsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @Repository -public class AppsJwtDetailsService extends JpaBaseService{ +public class AppsJwtDetailsService extends JpaService{ protected final static Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java index b42a1fa10..8f24888dc 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsSaml20DetailsService.java @@ -19,16 +19,16 @@ package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.apps.AppsSAML20Details; import org.dromara.maxkey.persistence.mapper.AppsSaml20DetailsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @Repository -public class AppsSaml20DetailsService extends JpaBaseService{ +public class AppsSaml20DetailsService extends JpaService{ protected final static Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java index da8a94a29..125f50076 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsService.java @@ -20,17 +20,17 @@ package org.dromara.maxkey.persistence.service; import java.util.List; import java.util.concurrent.TimeUnit; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.apps.Apps; import org.dromara.maxkey.entity.apps.UserApps; import org.dromara.maxkey.persistence.mapper.AppsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @Repository -public class AppsService extends JpaBaseService{ +public class AppsService extends JpaService{ //maxkey-mgt public final static String MGT_APP_ID = "622076759805923328"; diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java index bf621bf61..0888a5147 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/AppsTokenBasedDetailsService.java @@ -19,16 +19,16 @@ package org.dromara.maxkey.persistence.service; import java.util.concurrent.TimeUnit; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.apps.AppsTokenBasedDetails; import org.dromara.maxkey.persistence.mapper.AppsTokenBasedDetailsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @Repository -public class AppsTokenBasedDetailsService extends JpaBaseService{ +public class AppsTokenBasedDetailsService extends JpaService{ protected final static Cache detailsCache = Caffeine.newBuilder() diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java index 408e9545c..110806fc5 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ConnectorsService.java @@ -17,15 +17,15 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.Connectors; import org.dromara.maxkey.persistence.mapper.ConnectorsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository -public class ConnectorsService extends JpaBaseService{ +public class ConnectorsService extends JpaService{ final static Logger _logger = LoggerFactory.getLogger(ConnectorsService.class); public ConnectorsService() { diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/EmailSendersService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/EmailSendersService.java index aee410603..ffd0a94a7 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/EmailSendersService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/EmailSendersService.java @@ -17,14 +17,15 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; + import org.dromara.maxkey.entity.EmailSenders; import org.dromara.maxkey.persistence.mapper.EmailSendersMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class EmailSendersService extends JpaBaseService{ +public class EmailSendersService extends JpaService{ public EmailSendersService() { super(EmailSendersMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/FileUploadService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/FileUploadService.java index d249812c0..cb740cc09 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/FileUploadService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/FileUploadService.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.FileUpload; import org.dromara.maxkey.persistence.mapper.FileUploadMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class FileUploadService extends JpaBaseService{ +public class FileUploadService extends JpaService{ public FileUploadService() { super(FileUploadMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryConnectorService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryConnectorService.java index 531043076..2ca0add80 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryConnectorService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryConnectorService.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.HistoryConnector; import org.dromara.maxkey.persistence.mapper.HistoryConnectorMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class HistoryConnectorService extends JpaBaseService{ +public class HistoryConnectorService extends JpaService{ public HistoryConnectorService() { super(HistoryConnectorMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginAppsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginAppsService.java index 0d0dd241c..ed9beb025 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginAppsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginAppsService.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.HistoryLoginApps; import org.dromara.maxkey.persistence.mapper.HistoryLoginAppsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class HistoryLoginAppsService extends JpaBaseService{ +public class HistoryLoginAppsService extends JpaService{ public HistoryLoginAppsService() { super(HistoryLoginAppsMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java index 6c186ae58..f6cd36aa8 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistoryLoginService.java @@ -17,14 +17,14 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.entity.HistoryLogin; import org.dromara.maxkey.persistence.mapper.HistoryLoginMapper; +import org.dromara.mybatis.jpa.JpaService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.springframework.stereotype.Repository; @Repository -public class HistoryLoginService extends JpaBaseService{ +public class HistoryLoginService extends JpaService{ public HistoryLoginService() { super(HistoryLoginMapper.class); @@ -39,6 +39,6 @@ public class HistoryLoginService extends JpaBaseService{ } public JpaPageResults queryOnlineSession(HistoryLogin historyLogin) { - return this.queryPageResults("queryOnlineSession",historyLogin); + return this.fetchPageResults("queryOnlineSession",historyLogin); } } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySynchronizerService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySynchronizerService.java index ce03a241a..7071998e0 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySynchronizerService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySynchronizerService.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.HistorySynchronizer; import org.dromara.maxkey.persistence.mapper.HistorySynchronizerMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class HistorySynchronizerService extends JpaBaseService{ +public class HistorySynchronizerService extends JpaService{ public HistorySynchronizerService() { super(HistorySynchronizerMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySystemLogsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySystemLogsService.java index e480c09be..3667f612e 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySystemLogsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/HistorySystemLogsService.java @@ -17,7 +17,6 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.Accounts; import org.dromara.maxkey.entity.ChangePassword; import org.dromara.maxkey.entity.HistorySystemLogs; @@ -32,12 +31,13 @@ import org.dromara.maxkey.entity.Synchronizers; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.mapper.HistorySystemLogsMapper; import org.dromara.maxkey.util.JsonUtils; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository -public class HistorySystemLogsService extends JpaBaseService{ +public class HistorySystemLogsService extends JpaService{ final static Logger _logger = LoggerFactory.getLogger(HistorySystemLogsService.class); public HistorySystemLogsService() { diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java index 85e5686ff..4042fbbf0 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/InstitutionsService.java @@ -17,14 +17,14 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.Institutions; import org.dromara.maxkey.persistence.mapper.InstitutionsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class InstitutionsService extends JpaBaseService{ +public class InstitutionsService extends JpaService{ public InstitutionsService() { super(InstitutionsMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/LdapContextService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/LdapContextService.java index d49edd013..d0e508b7a 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/LdapContextService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/LdapContextService.java @@ -17,14 +17,14 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.LdapContext; import org.dromara.maxkey.persistence.mapper.LdapContextMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class LdapContextService extends JpaBaseService{ +public class LdapContextService extends JpaService{ public LdapContextService() { super(LdapContextMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java index 9a057dfed..373ceab06 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsCastService.java @@ -17,16 +17,16 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.OrganizationsCast; import org.dromara.maxkey.persistence.mapper.OrganizationsCastMapper; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository -public class OrganizationsCastService extends JpaBaseService{ +public class OrganizationsCastService extends JpaService{ final static Logger _logger = LoggerFactory.getLogger(OrganizationsCastService.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java index d978c86d2..27b63c325 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/OrganizationsService.java @@ -19,7 +19,6 @@ package org.dromara.maxkey.persistence.service; import java.sql.Types; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.dromara.maxkey.entity.Organizations; @@ -27,12 +26,13 @@ import org.dromara.maxkey.persistence.mapper.OrganizationsMapper; import org.dromara.maxkey.provision.ProvisionAction; import org.dromara.maxkey.provision.ProvisionService; import org.dromara.maxkey.provision.ProvisionTopic; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @Repository -public class OrganizationsService extends JpaBaseService{ +public class OrganizationsService extends JpaService{ @Autowired ProvisionService provisionService; diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PasswordPolicyService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PasswordPolicyService.java index 4cc5635f1..c86366fb3 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PasswordPolicyService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/PasswordPolicyService.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.PasswordPolicy; import org.dromara.maxkey.persistence.mapper.PasswordPolicyMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class PasswordPolicyService extends JpaBaseService{ +public class PasswordPolicyService extends JpaService{ public PasswordPolicyService() { super(PasswordPolicyMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RegisterService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RegisterService.java index 9a957c47f..ebc547dde 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RegisterService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RegisterService.java @@ -19,14 +19,14 @@ package org.dromara.maxkey.persistence.service; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.Register; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.mapper.RegisterMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class RegisterService extends JpaBaseService{ +public class RegisterService extends JpaService{ public RegisterService() { super(RegisterMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java index 826b820a3..39921f396 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ReportService.java @@ -20,14 +20,13 @@ package org.dromara.maxkey.persistence.service; import java.util.HashMap; import java.util.List; import java.util.Map; - -import org.apache.mybatis.jpa.persistence.JpaBaseEntity; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.persistence.mapper.ReportMapper; +import org.dromara.mybatis.jpa.JpaService; +import org.dromara.mybatis.jpa.entity.JpaEntity; import org.springframework.stereotype.Repository; @Repository -public class ReportService extends JpaBaseService{ +public class ReportService extends JpaService{ public Integer analysisDay(HashMap reportParameter) { return getMapper().analysisDay(reportParameter); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ResourcesService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ResourcesService.java index c9acd01a1..cea20a687 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ResourcesService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/ResourcesService.java @@ -19,13 +19,13 @@ package org.dromara.maxkey.persistence.service; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.Resources; import org.dromara.maxkey.persistence.mapper.ResourcesMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class ResourcesService extends JpaBaseService{ +public class ResourcesService extends JpaService{ public ResourcesService() { super(ResourcesMapper.class); @@ -40,6 +40,6 @@ public class ResourcesService extends JpaBaseService{ } public List queryResourcesTree(Resources resource){ - return getMapper().queryPageResults(resource); + return getMapper().fetchPageResults(resource); } } diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java index ca2b963b8..171558fcd 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RoleMemberService.java @@ -19,18 +19,18 @@ package org.dromara.maxkey.persistence.service; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.entity.RoleMember; import org.dromara.maxkey.entity.Roles; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.mapper.RoleMemberMapper; +import org.dromara.mybatis.jpa.JpaService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository -public class RoleMemberService extends JpaBaseService{ +public class RoleMemberService extends JpaService{ final static Logger _logger = LoggerFactory.getLogger(RoleMemberService.class); public RoleMemberService() { @@ -80,7 +80,7 @@ public class RoleMemberService extends JpaBaseService{ if(entity.getPageNumber() == 1 && totalPage < entity.getPageSize()) { totalCount = totalPage; }else { - totalCount = parseCount(getMapper().queryPageResultsCount(entity)); + totalCount = parseCount(getMapper().fetchPageResults(entity)); } return new JpaPageResults(entity.getPageNumber(),entity.getPageSize(),totalPage,totalCount,resultslist); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePermissionssService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePermissionssService.java index 503829ed2..be61dcfb4 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePermissionssService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePermissionssService.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.RolePermissions; import org.dromara.maxkey.persistence.mapper.RolePermissionsMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class RolePermissionssService extends JpaBaseService{ +public class RolePermissionssService extends JpaService{ public RolePermissionssService() { super(RolePermissionsMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePrivilegesService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePrivilegesService.java index 948d0b1cd..a55cf4c0d 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePrivilegesService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolePrivilegesService.java @@ -19,15 +19,15 @@ package org.dromara.maxkey.persistence.service; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.RolePrivileges; import org.dromara.maxkey.persistence.mapper.RolePrivilegesMapper; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository -public class RolePrivilegesService extends JpaBaseService{ +public class RolePrivilegesService extends JpaService{ final static Logger _logger = LoggerFactory.getLogger(RolePrivilegesService.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolesService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolesService.java index 28c4731b1..f5c199afe 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolesService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/RolesService.java @@ -23,12 +23,12 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.constants.ConstsStatus; import org.dromara.maxkey.entity.Institutions; import org.dromara.maxkey.entity.Roles; import org.dromara.maxkey.persistence.mapper.RolesMapper; import org.dromara.maxkey.util.StringUtils; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +37,7 @@ import org.springframework.stereotype.Repository; import com.fasterxml.jackson.annotation.JsonIgnore; @Repository -public class RolesService extends JpaBaseService implements Serializable { +public class RolesService extends JpaService implements Serializable { /** * */ diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SmsProviderService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SmsProviderService.java index e18d70521..f2116ad0f 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SmsProviderService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SmsProviderService.java @@ -17,14 +17,14 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.SmsProvider; import org.dromara.maxkey.persistence.mapper.SmsProviderMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class SmsProviderService extends JpaBaseService{ +public class SmsProviderService extends JpaService{ public SmsProviderService() { super(SmsProviderMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsAssociatesService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsAssociatesService.java index ee2b8f3ff..b592cb94f 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsAssociatesService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsAssociatesService.java @@ -19,15 +19,15 @@ package org.dromara.maxkey.persistence.service; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.SocialsAssociate; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.mapper.SocialsAssociateMapper; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class SocialsAssociatesService extends JpaBaseService{ +public class SocialsAssociatesService extends JpaService{ public SocialsAssociatesService() { super(SocialsAssociateMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java index 2d9977c84..4f9abc6f9 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SocialsProviderService.java @@ -17,15 +17,15 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.SocialsProvider; import org.dromara.maxkey.persistence.mapper.SocialsProviderMapper; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository -public class SocialsProviderService extends JpaBaseService{ +public class SocialsProviderService extends JpaService{ final static Logger _logger = LoggerFactory.getLogger(SocialsProviderService.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchroRelatedService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchroRelatedService.java index 719eaa1b1..fedaa856f 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchroRelatedService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchroRelatedService.java @@ -21,16 +21,16 @@ import java.sql.Types; import java.util.Date; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.Organizations; import org.dromara.maxkey.entity.SynchroRelated; import org.dromara.maxkey.entity.Synchronizers; import org.dromara.maxkey.persistence.mapper.SynchroRelatedMapper; import org.dromara.maxkey.util.DateUtils; +import org.dromara.mybatis.jpa.JpaService; import org.springframework.stereotype.Repository; @Repository -public class SynchroRelatedService extends JpaBaseService{ +public class SynchroRelatedService extends JpaService{ public SynchroRelatedService() { super(SynchroRelatedMapper.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java index 528405ebf..43d06bd06 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/SynchronizersService.java @@ -17,15 +17,15 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.Synchronizers; import org.dromara.maxkey.persistence.mapper.SynchronizersMapper; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository -public class SynchronizersService extends JpaBaseService{ +public class SynchronizersService extends JpaService{ final static Logger _logger = LoggerFactory.getLogger(SynchronizersService.class); public SynchronizersService() { diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoAdjointService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoAdjointService.java index 8a9d6687b..d772523c5 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoAdjointService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoAdjointService.java @@ -17,15 +17,15 @@ package org.dromara.maxkey.persistence.service; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.entity.UserInfoAdjoint; import org.dromara.maxkey.persistence.mapper.UserInfoAdjointMapper; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository -public class UserInfoAdjointService extends JpaBaseService{ +public class UserInfoAdjointService extends JpaService{ final static Logger _logger = LoggerFactory.getLogger(UserInfoAdjointService.class); diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java index 12f4ee1fa..379da97a0 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/UserInfoService.java @@ -20,7 +20,6 @@ package org.dromara.maxkey.persistence.service; import java.sql.Types; -import org.apache.mybatis.jpa.persistence.JpaBaseService; import org.dromara.maxkey.constants.ConstsStatus; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.Accounts; @@ -34,6 +33,7 @@ import org.dromara.maxkey.provision.ProvisionTopic; import org.dromara.maxkey.util.DateUtils; import org.dromara.maxkey.util.StringUtils; import org.dromara.maxkey.web.WebContext; +import org.dromara.mybatis.jpa.JpaService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -46,7 +46,7 @@ import org.springframework.stereotype.Repository; * */ @Repository -public class UserInfoService extends JpaBaseService { +public class UserInfoService extends JpaService { final static Logger _logger = LoggerFactory.getLogger(UserInfoService.class); @Autowired diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java index 62b67b61c..894f62a6b 100644 --- a/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java +++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/provision/thread/ProvisioningRunner.java @@ -21,7 +21,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import org.apache.mybatis.jpa.query.Query; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.ChangePassword; import org.dromara.maxkey.entity.Connectors; @@ -37,6 +36,7 @@ import org.dromara.maxkey.util.JsonUtils; import org.dromara.maxkey.util.ObjectTransformer; import org.dromara.maxkey.web.HttpRequestAdapter; import org.dromara.maxkey.web.WebContext; +import org.dromara.mybatis.jpa.query.Query; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java index c293b0669..cbc77ff30 100644 --- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java +++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java @@ -19,9 +19,9 @@ package org.apache.mybatis.jpa.test; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.util.JpaWebContext; import org.dromara.maxkey.entity.Accounts; import org.dromara.maxkey.persistence.service.AccountsService; +import org.dromara.mybatis.jpa.spring.MybatisJpaContext; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; @@ -38,7 +38,7 @@ public class AccountsServiceTest { public static AccountsService service; public AccountsService getservice() { - service=(AccountsService)JpaWebContext.getBean("accountsService"); + service=(AccountsService)MybatisJpaContext.getBean("accountsService"); return service; } @@ -56,7 +56,7 @@ public class AccountsServiceTest { public void load() throws Exception{ _logger.info("get..."); Accounts queryAccounts=new Accounts("7BF5315CA1004CDB8E614B0361C4D46B","fe86db85-5475-4494-b5aa-dbd3b886ff64"); - Accounts accounts=service.load(queryAccounts); + Accounts accounts=service.query(queryAccounts).get(0); _logger.info("accounts "+accounts); @@ -93,7 +93,7 @@ public class AccountsServiceTest { _logger.info("Application dir "+System.getProperty("user.dir")); context = new ClassPathXmlApplicationContext(new String[] {"spring/applicationContext.xml"}); - JpaWebContext.applicationContext=context; + MybatisJpaContext.init(context); getservice(); System.out.println("init ..."); diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java index f98f738cd..aa5c98410 100644 --- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java +++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java @@ -19,9 +19,9 @@ package org.apache.mybatis.jpa.test; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.util.JpaWebContext; import org.dromara.maxkey.entity.apps.Apps; import org.dromara.maxkey.persistence.service.AppsService; +import org.dromara.mybatis.jpa.spring.MybatisJpaContext; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; @@ -38,7 +38,7 @@ public class AppsServiceTest { public static AppsService service; public AppsService getservice() { - service=(AppsService)JpaWebContext.getBean("appsService"); + service=(AppsService)MybatisJpaContext.getBean("appsService"); return service; } @@ -50,7 +50,7 @@ public class AppsServiceTest { a.setPageNumber(2); a.setPageSize(10); ; - getservice().queryPageResults(a); + getservice().fetchPageResults(a); // _logger.info("apps "+); } @@ -81,7 +81,7 @@ public class AppsServiceTest { _logger.info("Application dir "+System.getProperty("user.dir")); context = new ClassPathXmlApplicationContext(new String[] {"spring/applicationContext.xml"}); - JpaWebContext.applicationContext=context; + MybatisJpaContext.init(context); getservice(); System.out.println("init ..."); diff --git a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java index bd4a46a5c..2d03582d7 100644 --- a/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java +++ b/maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.apache.mybatis.jpa.util.JpaWebContext; import org.dromara.maxkey.entity.apps.AppsFormBasedDetails; import org.dromara.maxkey.persistence.service.AppsFormBasedDetailsService; +import org.dromara.mybatis.jpa.spring.MybatisJpaContext; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; @@ -41,7 +41,7 @@ public class FormBasedDetailsServiceTest { public static AppsFormBasedDetailsService service; public AppsFormBasedDetailsService getservice() { - service=(AppsFormBasedDetailsService)JpaWebContext.getBean("appsFormBasedDetailsService"); + service=(AppsFormBasedDetailsService)MybatisJpaContext.getBean("appsFormBasedDetailsService"); return service; } @@ -95,7 +95,7 @@ public class FormBasedDetailsServiceTest { _logger.info("queryPageResults..."); AppsFormBasedDetails formBasedDetails=new AppsFormBasedDetails(); formBasedDetails.setPageNumber(2); - _logger.info("queryPageResults "+service.queryPageResults(formBasedDetails)); + _logger.info("queryPageResults "+service.fetchPageResults(formBasedDetails)); } @Test @@ -106,7 +106,7 @@ public class FormBasedDetailsServiceTest { formBasedDetails.setPageNumber(2); - _logger.info("queryPageResults by mapperId "+service.queryPageResults("queryPageResults1",formBasedDetails)); + _logger.info("queryPageResults by mapperId "+service.fetchPageResults("queryPageResults1",formBasedDetails)); } @@ -142,7 +142,7 @@ public class FormBasedDetailsServiceTest { _logger.info("Application dir "+System.getProperty("user.dir")); context = new ClassPathXmlApplicationContext(new String[] {"spring/applicationContext.xml"}); - JpaWebContext.applicationContext=context; + MybatisJpaContext.init(context); getservice(); System.out.println("init ..."); diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java index 851f1d80f..6725dd31a 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeEndpoint.java @@ -20,7 +20,6 @@ */ package org.dromara.maxkey.authz.endpoint; -import javax.servlet.http.HttpServletRequest; import org.dromara.maxkey.constants.ConstsProtocols; import org.dromara.maxkey.entity.apps.Apps; @@ -37,6 +36,7 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java index fbfc5b40f..b622aae5f 100644 --- a/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-authorize/src/main/java/org/dromara/maxkey/authz/endpoint/AuthorizeProtectedEndpoint.java @@ -20,8 +20,6 @@ */ package org.dromara.maxkey.authz.endpoint; -import javax.servlet.http.HttpServletRequest; - import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.UserInfo; @@ -32,6 +30,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import jakarta.servlet.http.HttpServletRequest; + /** * @author Crystal.Sea * diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java index 07208c4e5..8f14ab901 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas10AuthorizeEndpoint.java @@ -20,8 +20,6 @@ */ package org.dromara.maxkey.authz.cas.endpoint; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authz.cas.endpoint.response.Service10ResponseBuilder; @@ -36,6 +34,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java index 60dcba5b9..e7e1998ed 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas20AuthorizeEndpoint.java @@ -22,9 +22,6 @@ package org.dromara.maxkey.authz.cas.endpoint; import java.lang.reflect.InvocationTargetException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.beanutils.BeanUtils; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder; @@ -48,6 +45,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java index 4c33aa30c..8fb508845 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/Cas30AuthorizeEndpoint.java @@ -22,9 +22,6 @@ package org.dromara.maxkey.authz.cas.endpoint; import java.lang.reflect.InvocationTargetException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.beanutils.BeanUtils; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authz.cas.endpoint.response.ProxyServiceResponseBuilder; @@ -46,6 +43,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java index 1e0f253d9..97e882b18 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasAuthorizeEndpoint.java @@ -23,9 +23,6 @@ package org.dromara.maxkey.authz.cas.endpoint; import java.security.Principal; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.session.Session; import org.dromara.maxkey.authn.web.AuthorizationUtils; @@ -46,6 +43,8 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java index 72e658a73..1e23da8a8 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasLogoutEndpoint.java @@ -20,8 +20,6 @@ */ package org.dromara.maxkey.authz.cas.endpoint; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authz.cas.endpoint.ticket.CasConstants; @@ -35,6 +33,8 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java index a1d24d77e..f8dab452a 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/CasRestV1Endpoint.java @@ -20,8 +20,6 @@ */ package org.dromara.maxkey.authz.cas.endpoint; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.LoginCredential; import org.dromara.maxkey.authn.provider.AbstractAuthenticationProvider; @@ -53,6 +51,8 @@ import org.springframework.web.bind.annotation.RequestParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java index 618b0e557..2eef76f0d 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/AbstractTicket.java @@ -22,8 +22,9 @@ import org.dromara.maxkey.entity.apps.AppsCasDetails; import org.springframework.security.core.Authentication; import org.springframework.util.Assert; -import javax.persistence.Column; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Id; + import java.time.ZoneOffset; import java.time.ZonedDateTime; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java index 674a03ee2..57eb2010e 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/ServiceTicketImpl.java @@ -22,7 +22,8 @@ import org.dromara.maxkey.authz.cas.endpoint.ticket.pgt.ProxyGrantingTicket; import org.dromara.maxkey.entity.apps.AppsCasDetails; import org.springframework.security.core.Authentication; -import javax.persistence.Column; +import jakarta.persistence.Column; + /** * Domain object representing a Service Ticket. A service ticket grants specific diff --git a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java index 4585da054..2ff175130 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/main/java/org/dromara/maxkey/authz/cas/endpoint/ticket/TicketGrantingTicketImpl.java @@ -22,17 +22,18 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + import org.dromara.maxkey.entity.apps.AppsCasDetails; import org.springframework.lang.NonNull; import org.springframework.security.core.Authentication; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Table; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/RestTestClient.java b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/RestTestClient.java index 257770ee9..b0283a23d 100644 --- a/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/RestTestClient.java +++ b/maxkey-protocols/maxkey-protocol-cas/src/test/java/org/maxkey/web/authorize/endpoint/RestTestClient.java @@ -46,7 +46,7 @@ public class RestTestClient { final MockHttpServletRequest request = new MockHttpServletRequest(); final MockHttpServletResponse response = new MockHttpServletResponse(); - final WebContext webContext = new J2EContext(request, response); + final WebContext webContext = null;//new J2EContext(request, response); casConfiguration.init(); UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(username,password); CasRestAuthenticator restAuthenticator = new CasRestAuthenticator(casConfiguration); diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java index 0e86ef0e5..5738b7a13 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiAuthorizeEndpoint.java @@ -20,8 +20,6 @@ */ package org.dromara.maxkey.authz.exapi.endpoint; -import javax.servlet.http.HttpServletRequest; - import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.web.AuthorizationUtils; import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint; @@ -40,6 +38,7 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java index b0a7a8a02..54739e52e 100644 --- a/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java +++ b/maxkey-protocols/maxkey-protocol-extendapi/src/main/java/org/dromara/maxkey/authz/exapi/endpoint/ExtendApiMetadata.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.authz.exapi.endpoint; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authz.exapi.endpoint.adapter.netease.NeteaseRSATool; import org.dromara.maxkey.pretty.impl.JsonPretty; @@ -31,6 +29,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-8-ExtendApi接口文档模块-元数据") @Controller diff --git a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java index 3475784dd..b89d38237 100644 --- a/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/FormBasedAuthorizeEndpoint.java @@ -20,8 +20,6 @@ */ package org.dromara.maxkey.authz.formbased.endpoint; -import javax.servlet.http.HttpServletRequest; - import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.web.AuthorizationUtils; import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint; @@ -44,6 +42,7 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java index ac9180b4c..65dd7ce37 100644 --- a/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-jwt/src/main/java/org/dromara/maxkey/authz/token/endpoint/JwtAuthorizeEndpoint.java @@ -21,12 +21,9 @@ package org.dromara.maxkey.authz.token.endpoint; import java.lang.reflect.InvocationTargetException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.mybatis.jpa.util.JpaWebContext; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.web.AuthorizationUtils; import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint; @@ -54,6 +51,8 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Crystal.Sea diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java index 0679a786f..9a51a52e4 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/BearerTokenExtractor.java @@ -15,7 +15,6 @@ package org.dromara.maxkey.authz.oauth2.provider.authentication; import java.util.Enumeration; -import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,6 +22,8 @@ import org.dromara.maxkey.authz.oauth2.common.OAuth2AccessToken; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken; +import jakarta.servlet.http.HttpServletRequest; + /** * {@link TokenExtractor} that strips the authenticator from a bearer token request (with an Authorization header in the * form "Bearer ", or as a request parameter if that fails). The access token is the principal in diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java index 6143bec24..d0846abc8 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetails.java @@ -16,8 +16,8 @@ package org.dromara.maxkey.authz.oauth2.provider.authentication; import java.io.Serializable; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; /** * A holder of selected HTTP details related to an OAuth2 authentication request. diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java index 565dce996..95001d99a 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/OAuth2AuthenticationDetailsSource.java @@ -14,10 +14,10 @@ package org.dromara.maxkey.authz.oauth2.provider.authentication; -import javax.servlet.http.HttpServletRequest; - import org.springframework.security.authentication.AuthenticationDetailsSource; +import jakarta.servlet.http.HttpServletRequest; + /** * A source for authentication details in an OAuth2 protected Resource. * diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java index 92df726e1..803099fa3 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/authentication/TokenExtractor.java @@ -13,10 +13,11 @@ package org.dromara.maxkey.authz.oauth2.provider.authentication; -import javax.servlet.http.HttpServletRequest; import org.springframework.security.core.Authentication; +import jakarta.servlet.http.HttpServletRequest; + /** * @author Dave Syer * diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java index 018030466..ca3cae3a6 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java @@ -20,8 +20,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.web.AuthorizationUtils; @@ -71,6 +69,8 @@ import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriTemplate; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** *

diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java index 012ec5971..2f17e8de6 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/IntrospectEndpoint.java @@ -17,9 +17,6 @@ package org.dromara.maxkey.authz.oauth2.provider.endpoint; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; @@ -42,6 +39,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java index e01b9fe53..5cdd1d8dd 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/OauthJwksEndpoint.java @@ -17,10 +17,6 @@ package org.dromara.maxkey.authz.oauth2.provider.endpoint; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.mybatis.jpa.util.JpaWebContext; import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; import org.dromara.maxkey.constants.ContentType; import org.dromara.maxkey.crypto.jose.keystore.JWKSetKeyStore; @@ -38,6 +34,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java index 7a37474c5..fd7b19d8b 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/TokenEndpointAuthenticationFilter.java @@ -21,15 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authn.web.AuthorizationUtils; @@ -58,6 +49,16 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFi import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.web.HttpRequestMethodNotSupportedException; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** *

* An optional authentication filter for the {@link TokenEndpoint}. It sits downstream of another filter (usually diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java index aa80ac461..707601717 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoEndpoint.java @@ -20,9 +20,6 @@ package org.dromara.maxkey.authz.oauth2.provider.userinfo.endpoint; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.beanutils.BeanUtils; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter; @@ -51,6 +48,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java index 840c27810..d9da32a8f 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/userinfo/endpoint/UserInfoOIDCEndpoint.java @@ -24,8 +24,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Set; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.SignPrincipal; @@ -68,6 +66,8 @@ import com.nimbusds.jwt.PlainJWT; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.nimbusds.jwt.SignedJWT; diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java index 5cd353f60..dbca3c682 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OauthAuthorizationServerEndpoint.java @@ -20,9 +20,6 @@ package org.dromara.maxkey.authz.oauth2.provider.wellknown.endpoint; import java.util.HashSet; import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; import org.dromara.maxkey.authz.oauth2.provider.endpoint.AbstractEndpoint; import org.dromara.maxkey.authz.oauth2.provider.wellknown.OauthServerConfiguration; @@ -42,6 +39,8 @@ import com.alibaba.cloud.commons.lang.StringUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller public class OauthAuthorizationServerEndpoint extends AbstractEndpoint { diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java index 81ca38edd..c1d449599 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/wellknown/endpoint/OpenidConfigurationEndpoint.java @@ -20,9 +20,6 @@ package org.dromara.maxkey.authz.oauth2.provider.wellknown.endpoint; import java.util.HashSet; import java.util.Set; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; import org.dromara.maxkey.authz.oauth2.provider.endpoint.AbstractEndpoint; import org.dromara.maxkey.authz.oauth2.provider.wellknown.OpenidConfiguration; @@ -42,6 +39,8 @@ import com.alibaba.cloud.commons.lang.StringUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-1-OAuth v2.0 API文档模块") @Controller diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20AutoConfiguration.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20AutoConfiguration.java index 9dd8393ac..06383ff88 100644 --- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20AutoConfiguration.java +++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20AutoConfiguration.java @@ -21,7 +21,6 @@ import java.net.URI; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; -import javax.servlet.Filter; import javax.sql.DataSource; import org.dromara.maxkey.authz.oauth2.common.OAuth2Constants; @@ -63,6 +62,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; import com.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWEAlgorithm; +import jakarta.servlet.Filter; + @AutoConfiguration @ComponentScan(basePackages = { "org.maxkey.authz.oauth2.provider.endpoint", diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/BindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/BindingAdapter.java index ca835d82d..b02913a2c 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/BindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/BindingAdapter.java @@ -18,9 +18,6 @@ package org.dromara.maxkey.authz.saml20.binding; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authz.saml.common.AuthnRequestInfo; import org.dromara.maxkey.entity.apps.AppsSAML20Details; import org.opensaml.common.SignableSAMLObject; @@ -29,6 +26,9 @@ import org.opensaml.ws.message.encoder.MessageEncodingException; import org.opensaml.ws.security.SecurityPolicyResolver; import org.opensaml.xml.security.credential.Credential; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * * Abstracts the SAML Binding used to send/receive messages. diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/ExtractBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/ExtractBindingAdapter.java index 57e872d69..47f2e9bb3 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/ExtractBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/ExtractBindingAdapter.java @@ -20,8 +20,6 @@ package org.dromara.maxkey.authz.saml20.binding; import java.security.KeyStore; -import javax.servlet.http.HttpServletRequest; - import org.dromara.maxkey.crypto.keystore.KeyStoreLoader; import org.dromara.maxkey.entity.apps.AppsSAML20Details; import org.opensaml.common.binding.SAMLMessageContext; @@ -30,6 +28,8 @@ import org.opensaml.ws.security.SecurityPolicyResolver; import org.opensaml.xml.security.SecurityException; import org.opensaml.xml.security.credential.CredentialResolver; +import jakarta.servlet.http.HttpServletRequest; + /** * * Abstracts the SAML Binding used to send/receive messages. diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java index 25628cdd6..279e8ab9e 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/ExtractPostBindingAdapter.java @@ -20,7 +20,6 @@ package org.dromara.maxkey.authz.saml20.binding.impl; import java.security.KeyStore; -import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.dromara.maxkey.authz.saml.common.TrustResolver; import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; @@ -40,6 +39,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; +import jakarta.servlet.http.HttpServletRequest; + public class ExtractPostBindingAdapter implements ExtractBindingAdapter, InitializingBean{ private final static Logger _logger = LoggerFactory.getLogger(ExtractPostBindingAdapter.class); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java index b267feaac..1ad5b9b87 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/binding/impl/PostBindingAdapter.java @@ -19,8 +19,6 @@ package org.dromara.maxkey.authz.saml20.binding.impl; import java.security.KeyStore; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.Validate; import org.apache.velocity.app.VelocityEngine; @@ -52,6 +50,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class PostBindingAdapter implements BindingAdapter, InitializingBean{ private final static Logger logger = LoggerFactory.getLogger(PostBindingAdapter.class); diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java index 7d26a65cc..37313a90e 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/endpoint/ConsumerEndpoint.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; @@ -77,6 +75,9 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Controller public class ConsumerEndpoint { diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java index 50baaf1a7..a9dd4794e 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/consumer/spring/RealAuthenticationFailureHandler.java @@ -20,9 +20,6 @@ package org.dromara.maxkey.authz.saml20.consumer.spring; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.AuthenticationException; @@ -30,6 +27,10 @@ import org.springframework.security.web.authentication.AuthenticationFailureHand import org.springframework.security.web.savedrequest.RequestCache; import org.springframework.security.web.savedrequest.SavedRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Handles authn failures of the SAMLResponseAuthenticationProcessingFilter. * diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java index 1aad9172d..721e1de42 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/metadata/endpoint/SamlMetadataEndpoint.java @@ -17,11 +17,8 @@ package org.dromara.maxkey.authz.saml20.metadata.endpoint; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.Validate; -import org.apache.mybatis.jpa.util.JpaWebContext; import org.dromara.maxkey.authz.saml.common.TrustResolver; import org.dromara.maxkey.authz.saml20.metadata.MetadataGenerator; import org.dromara.maxkey.constants.ContentType; @@ -54,6 +51,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-2-SAML v2.0 API文档模块") @Controller diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java index ea83da72b..e657e0b8c 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/AssertionEndpoint.java @@ -19,8 +19,6 @@ package org.dromara.maxkey.authz.saml20.provider.endpoint; import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.web.AuthorizationUtils; @@ -42,6 +40,9 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Controller public class AssertionEndpoint { diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java index f2b98e63c..efeeaeade 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/IdpInitEndpoint.java @@ -19,9 +19,6 @@ package org.dromara.maxkey.authz.saml20.provider.endpoint; import java.security.KeyStore; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authz.saml.common.AuthnRequestInfo; import org.dromara.maxkey.authz.saml20.binding.BindingAdapter; import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; @@ -43,6 +40,8 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * idp init not need extract SAML request message diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java index 645c9648f..31741671d 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/LogoutSamlEndpoint.java @@ -17,9 +17,6 @@ package org.dromara.maxkey.authz.saml20.provider.endpoint; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; import org.dromara.maxkey.authz.saml20.xml.SAML2ValidatorSuite; @@ -40,6 +37,8 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-2-SAML v2.0 API文档模块") @Controller diff --git a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java index 87ed4db85..34b3a6f3e 100644 --- a/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/dromara/maxkey/authz/saml20/provider/endpoint/SingleSignOnEndpoint.java @@ -19,9 +19,6 @@ package org.dromara.maxkey.authz.saml20.provider.endpoint; import java.security.KeyStore; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authz.saml.common.AuthnRequestInfo; import org.dromara.maxkey.authz.saml20.binding.BindingAdapter; import org.dromara.maxkey.authz.saml20.binding.ExtractBindingAdapter; @@ -48,6 +45,8 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; @Tag(name = "2-2-SAML v2.0 API文档模块") @Controller diff --git a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java index 5afae0d07..a0d4aa4a7 100644 --- a/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java +++ b/maxkey-protocols/maxkey-protocol-tokenbased/src/main/java/org/dromara/maxkey/authz/token/endpoint/TokenBasedAuthorizeEndpoint.java @@ -20,10 +20,6 @@ */ package org.dromara.maxkey.authz.token.endpoint; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.web.AuthorizationUtils; import org.dromara.maxkey.authz.endpoint.AuthorizeBaseEndpoint; @@ -47,6 +43,9 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Crystal.Sea diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java index 0b58e27d9..528737a78 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestOrganizationController.java @@ -20,10 +20,10 @@ package org.dromara.maxkey.web.apis.identity.rest; import java.io.IOException; import org.apache.commons.lang3.StringUtils; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.Organizations; import org.dromara.maxkey.persistence.service.OrganizationsService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -106,6 +106,6 @@ public class RestOrganizationController { } _logger.debug("Organizations {}" , org); return new Message>( - organizationsService.queryPageResults(org)).buildResponse(); + organizationsService.fetchPageResults(org)).buildResponse(); } } diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java index b397bfaad..7322ff031 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/dromara/maxkey/web/apis/identity/rest/RestUserInfoController.java @@ -20,11 +20,11 @@ package org.dromara.maxkey.web.apis.identity.rest; import java.io.IOException; import org.apache.commons.lang3.StringUtils; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.entity.ChangePassword; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -129,7 +129,7 @@ public class RestUserInfoController { userInfo.setInstId("1"); } return new Message>( - userInfoService.queryPageResults(userInfo)).buildResponse(); + userInfoService.fetchPageResults(userInfo)).buildResponse(); } } diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java index 4bc0249dd..321f6cd59 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimGroupController.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.entity.Roles; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.RoleMemberService; @@ -35,6 +34,7 @@ import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMemberRef; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimParameters; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimSearchResult; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -119,7 +119,7 @@ public class ScimGroupController { queryModel.setPageSize(requestParameters.getCount()); queryModel.calculate(requestParameters.getStartIndex()); - JpaPageResults orgResults = rolesService.queryPageResults(queryModel); + JpaPageResults orgResults = rolesService.fetchPageResults(queryModel); List resultList = new ArrayList(); for(Roles group : orgResults.getRows()) { resultList.add(role2ScimGroup(group)); diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java index 07d4ac08a..8736cad13 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimOrganizationController.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.entity.Organizations; import org.dromara.maxkey.persistence.service.OrganizationsService; import org.dromara.maxkey.util.DateUtils; @@ -30,6 +29,7 @@ import org.dromara.maxkey.web.apis.identity.scim.resources.ScimMeta; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimOrganization; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimParameters; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimSearchResult; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -112,7 +112,7 @@ public class ScimOrganizationController { queryModel.setPageSize(requestParameters.getCount()); queryModel.calculate(requestParameters.getStartIndex()); - JpaPageResults orgResults = organizationsService.queryPageResults(queryModel); + JpaPageResults orgResults = organizationsService.fetchPageResults(queryModel); List resultList = new ArrayList(); for(Organizations org : orgResults.getRows()) { resultList.add(org2ScimOrg(org)); diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java index 898a524f1..1761eeab2 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/dromara/maxkey/web/apis/identity/scim/ScimUserController.java @@ -20,7 +20,6 @@ package org.dromara.maxkey.web.apis.identity.scim; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.constants.ConstsStatus; import org.dromara.maxkey.entity.Roles; import org.dromara.maxkey.entity.UserInfo; @@ -38,6 +37,7 @@ import org.dromara.maxkey.web.apis.identity.scim.resources.ScimSearchResult; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUser; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserEmail; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimOrganizationEmail.UserEmailType; import org.dromara.maxkey.web.apis.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType; import org.slf4j.Logger; @@ -124,7 +124,7 @@ public class ScimUserController { queryModel.setPageSize(requestParameters.getCount()); queryModel.calculate(requestParameters.getStartIndex()); - JpaPageResults orgResults = userInfoService.queryPageResults(queryModel); + JpaPageResults orgResults = userInfoService.fetchPageResults(queryModel); List resultList = new ArrayList(); for(UserInfo user : orgResults.getRows()) { resultList.add(userInfo2ScimUser(user)); diff --git a/maxkey-webs/maxkey-gataway/src/main/resources/application.yml b/maxkey-webs/maxkey-gataway/src/main/resources/application.yml index 26566cf9b..8c53388b0 100644 --- a/maxkey-webs/maxkey-gataway/src/main/resources/application.yml +++ b/maxkey-webs/maxkey-gataway/src/main/resources/application.yml @@ -1,7 +1,7 @@ #端口号 application: name: maxkey-gateway-server - formatted-version: v3.5.19 GA + formatted-version: v4.0.0 GA server: port: 9000 spring: diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/MaxKeyApplication.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/MaxKeyApplication.java index 4cc0fdfc6..5f2f0543b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/MaxKeyApplication.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/MaxKeyApplication.java @@ -17,11 +17,10 @@ package org.dromara.maxkey; -import javax.servlet.ServletException; import org.apache.ibatis.io.VFS; -import org.apache.mybatis.jpa.SpringBootVFS; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.web.InitializeContext; +import org.dromara.mybatis.jpa.starter.SpringBootVFS; import org.joda.time.DateTime; import org.mybatis.spring.annotation.MapperScan; import org.slf4j.Logger; @@ -33,6 +32,8 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.ConfigurableApplicationContext; +import jakarta.servlet.ServletException; + @SpringBootApplication @EnableDiscoveryClient @MapperScan("org.maxkey.persistence.mapper,") diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java index 1417d2d28..61b7ad958 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/access/contorller/LoginSessionController.java @@ -19,7 +19,6 @@ package org.dromara.maxkey.web.access.contorller; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.session.SessionManager; import org.dromara.maxkey.entity.HistoryLogin; @@ -28,6 +27,7 @@ import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.util.DateUtils; import org.dromara.maxkey.util.StringUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java index cf4acca23..a86bed315 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LoginEntryPoint.java @@ -21,9 +21,6 @@ import java.text.ParseException; import java.util.HashMap; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.LoginCredential; import org.dromara.maxkey.authn.jwt.AuthJwt; @@ -56,6 +53,8 @@ import org.springframework.web.bind.annotation.RequestParam; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * @author Crystal.Sea diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java index 6f93ea290..6676bdf5e 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java @@ -21,8 +21,6 @@ import java.util.Iterator; import java.util.Set; import java.util.Map.Entry; -import javax.servlet.http.HttpServletRequest; - import org.apache.commons.lang3.StringUtils; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.session.Session; @@ -48,6 +46,7 @@ import org.springframework.web.servlet.ModelAndView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; @Tag(name = "1-3-单点注销接口文档模块") @Controller diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java index 707804bab..ea007964c 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/RegisterController.java @@ -20,7 +20,6 @@ package org.dromara.maxkey.web.contorller; import java.io.IOException; import java.util.regex.Pattern; -import javax.servlet.ServletException; import org.dromara.maxkey.authn.jwt.AuthTokenService; import org.dromara.maxkey.configuration.ApplicationConfig; @@ -45,6 +44,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import jakarta.servlet.ServletException; + @Controller @RequestMapping(value={"/signup"}) diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java index b038f8ebe..765f5ee4a 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/contorller/SafeController.java @@ -17,9 +17,6 @@ package org.dromara.maxkey.web.contorller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsTimeInterval; import org.dromara.maxkey.entity.Message; @@ -37,6 +34,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Controller @RequestMapping(value={"/safe"}) public class SafeController { diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java index d69fef8be..caec8188b 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java @@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.HistoryLoginApps; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.HistoryLoginAppsService; import org.dromara.maxkey.util.DateUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -67,7 +67,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginAppsHistoryController historyLoginApp.setUserId(currentUser.getId()); historyLoginApp.setInstId(currentUser.getInstId()); return new Message>( - historyLoginAppsService.queryPageResults(historyLoginApp) + historyLoginAppsService.fetchPageResults(historyLoginApp) ).buildResponse(); } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java index e028a715e..ca13034df 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java @@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.HistoryLogin; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.util.DateUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -67,7 +67,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginHistoryController.cla historyLogin.setInstId(currentUser.getInstId()); historyLogin.setUserId(currentUser.getId()); return new Message>( - loginHistoryService.queryPageResults(historyLogin) + loginHistoryService.fetchPageResults(historyLogin) ).buildResponse(); } diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java index 0d7062591..d3b965b6a 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/HistorySignOnAppInterceptor.java @@ -17,9 +17,6 @@ package org.dromara.maxkey.web.interceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authn.web.AuthorizationUtils; import org.dromara.maxkey.entity.HistoryLoginApps; @@ -36,6 +33,9 @@ import org.springframework.stereotype.Component; import org.springframework.web.servlet.AsyncHandlerInterceptor; import org.springframework.web.servlet.ModelAndView; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Component public class HistorySignOnAppInterceptor implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(HistorySignOnAppInterceptor.class); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java index 76301593a..0af28fdf0 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java +++ b/maxkey-webs/maxkey-web-maxkey/src/main/java/org/dromara/maxkey/web/interceptor/SingleSignOnInterceptor.java @@ -16,8 +16,6 @@ package org.dromara.maxkey.web.interceptor; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.SignPrincipal; import org.dromara.maxkey.authn.jwt.AuthTokenService; @@ -40,6 +38,9 @@ import org.springframework.security.web.util.UrlUtils; import org.springframework.stereotype.Component; import org.springframework.web.servlet.AsyncHandlerInterceptor; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Component public class SingleSignOnInterceptor implements AsyncHandlerInterceptor { private static final Logger _logger = LoggerFactory.getLogger(SingleSignOnInterceptor.class); diff --git a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties b/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties index ba79c9739..b21732485 100644 --- a/maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties +++ b/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.19 GA +application.formatted-version =v4.0.0 GA #for dynamic service discovery spring.application.name =maxkey ############################################################################ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java index d4ba09c46..0d451c727 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java @@ -17,8 +17,6 @@ package org.dromara.maxkey; -import javax.servlet.ServletException; - import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.web.InitializeContext; import org.joda.time.DateTime; @@ -33,6 +31,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; +import jakarta.servlet.ServletException; + @ComponentScan(basePackages = { "org.maxkey.authn", "org.maxkey.configuration", diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RoleMemberController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RoleMemberController.java index aa57f9428..acf077c09 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RoleMemberController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RoleMemberController.java @@ -17,7 +17,6 @@ package org.dromara.maxkey.web.access.contorller; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.RoleMember; @@ -29,6 +28,7 @@ import org.dromara.maxkey.persistence.service.RolesService; import org.dromara.maxkey.persistence.service.UserInfoService; import org.dromara.maxkey.util.StringUtils; import org.dromara.maxkey.web.WebContext; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -67,7 +67,7 @@ public class RoleMemberController { _logger.debug("fetch "+roleMember); roleMember.setInstId(currentUser.getInstId()); return new Message>( - roleMemberService.queryPageResults(roleMember)).buildResponse(); + roleMemberService.fetchPageResults(roleMember)).buildResponse(); } @RequestMapping(value = { "/memberInRole" }) @@ -76,7 +76,7 @@ public class RoleMemberController { _logger.debug("roleMember : "+roleMember); roleMember.setInstId(currentUser.getInstId()); return new Message>( - roleMemberService.queryPageResults("memberInRole",roleMember)).buildResponse(); + roleMemberService.fetchPageResults("memberInRole",roleMember)).buildResponse(); } @@ -86,7 +86,7 @@ public class RoleMemberController { public ResponseEntity memberNotInRole(@ModelAttribute RoleMember roleMember,@CurrentUser UserInfo currentUser) { roleMember.setInstId(currentUser.getInstId()); return new Message>( - roleMemberService.queryPageResults("memberNotInRole",roleMember)).buildResponse(); + roleMemberService.fetchPageResults("memberNotInRole",roleMember)).buildResponse(); } @RequestMapping(value = { "/rolesNoMember" }) diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolePermissionsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolePermissionsController.java index 4d4752dc5..d536f5c0f 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolePermissionsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolePermissionsController.java @@ -16,7 +16,6 @@ package org.dromara.maxkey.web.access.contorller; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.RolePermissions; @@ -25,6 +24,7 @@ import org.dromara.maxkey.entity.apps.Apps; import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.persistence.service.RolePermissionssService; import org.dromara.maxkey.web.WebContext; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +55,7 @@ public class RolePermissionsController { @CurrentUser UserInfo currentUser) { JpaPageResults rolePermissions; rolePermission.setInstId(currentUser.getInstId()); - rolePermissions= rolePermissionssService.queryPageResults("appsInRole",rolePermission); + rolePermissions= rolePermissionssService.fetchPageResults("appsInRole",rolePermission); if(rolePermissions!=null&&rolePermissions.getRows()!=null){ for (Apps app : rolePermissions.getRows()){ @@ -72,7 +72,7 @@ public class RolePermissionsController { @CurrentUser UserInfo currentUser) { JpaPageResults rolePermissions; rolePermission.setInstId(currentUser.getInstId()); - rolePermissions= rolePermissionssService.queryPageResults("appsNotInRole",rolePermission); + rolePermissions= rolePermissionssService.fetchPageResults("appsNotInRole",rolePermission); if(rolePermissions!=null&&rolePermissions.getRows()!=null){ for (Apps app : rolePermissions.getRows()){ diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolesController.java index ffed4aaba..8e5f2960e 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/RolesController.java @@ -17,7 +17,6 @@ package org.dromara.maxkey.web.access.contorller; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsEntryType; import org.dromara.maxkey.constants.ConstsOperateAction; @@ -28,6 +27,7 @@ import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.persistence.service.RolesService; import org.dromara.maxkey.util.StringUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -61,7 +61,7 @@ public class RolesController { _logger.debug(""+role); role.setInstId(currentUser.getInstId()); return new Message>( - rolesService.queryPageResults(role)).buildResponse(); + rolesService.fetchPageResults(role)).buildResponse(); } @ResponseBody diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java index 8457a2da9..9a4e33f29 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/access/contorller/SessionController.java @@ -19,7 +19,6 @@ package org.dromara.maxkey.web.access.contorller; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.session.SessionManager; import org.dromara.maxkey.entity.HistoryLogin; @@ -29,6 +28,7 @@ import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.util.DateUtils; import org.dromara.maxkey.util.StringUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java index 19792fd08..ae63ed475 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/apps/contorller/ApplicationsController.java @@ -18,13 +18,13 @@ package org.dromara.maxkey.web.apps.contorller; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsProtocols; import org.dromara.maxkey.crypto.ReciprocalUtils; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.entity.apps.Apps; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; @@ -66,7 +66,7 @@ public class ApplicationsController extends BaseAppContorller { @ResponseBody public ResponseEntity fetch(@ModelAttribute Apps apps,@CurrentUser UserInfo currentUser) { apps.setInstId(currentUser.getInstId()); - JpaPageResults appsList =appsService.queryPageResults(apps); + JpaPageResults appsList =appsService.fetchPageResults(apps); for (Apps app : appsList.getRows()){ app.transIconBase64(); app.setSecret(null); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java index b21cd8b01..f60ab3f98 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AccountsStrategyController.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.web.config.contorller; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.AccountsStrategy; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.AccountsService; import org.dromara.maxkey.persistence.service.AccountsStrategyService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -52,7 +52,7 @@ public class AccountsStrategyController { @ResponseBody public ResponseEntity fetch(@ModelAttribute AccountsStrategy accountsStrategy,@CurrentUser UserInfo currentUser) { accountsStrategy.setInstId(currentUser.getInstId()); - JpaPageResults accountsStrategyList =accountsStrategyService.queryPageResults(accountsStrategy); + JpaPageResults accountsStrategyList =accountsStrategyService.fetchPageResults(accountsStrategy); for (AccountsStrategy strategy : accountsStrategyList.getRows()){ strategy.transIconBase64(); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java index d0acf0d82..22d587739 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/AdaptersController.java @@ -17,12 +17,12 @@ package org.dromara.maxkey.web.config.contorller; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.entity.apps.AppsAdapters; import org.dromara.maxkey.persistence.service.AppsAdaptersService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +50,7 @@ public class AdaptersController { public ResponseEntity fetch(@ModelAttribute AppsAdapters appsAdapter) { _logger.debug(""+appsAdapter); return new Message>( - appsAdaptersService.queryPageResults(appsAdapter)).buildResponse(); + appsAdaptersService.fetchPageResults(appsAdapter)).buildResponse(); } @ResponseBody diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java index 294787747..5be4448c8 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/ConnectorsController.java @@ -18,13 +18,13 @@ package org.dromara.maxkey.web.config.contorller; import org.apache.commons.lang3.StringUtils; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.Connectors; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.ConnectorsService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -51,7 +51,7 @@ public class ConnectorsController { _logger.debug(""+connector); connector.setInstId(currentUser.getInstId()); return new Message>( - connectorsService.queryPageResults(connector)).buildResponse(); + connectorsService.fetchPageResults(connector)).buildResponse(); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/PasswordPolicyController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/PasswordPolicyController.java index 98e0a86c1..bdec09325 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/PasswordPolicyController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/PasswordPolicyController.java @@ -17,7 +17,6 @@ package org.dromara.maxkey.web.config.contorller; -import javax.validation.Valid; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.Message; @@ -35,6 +34,8 @@ import org.springframework.validation.FieldError; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import jakarta.validation.Valid; + @Controller @RequestMapping(value={"/config/passwordpolicy"}) public class PasswordPolicyController { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java index 2b45fcb48..5085e1cca 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SocialsProviderController.java @@ -17,13 +17,13 @@ package org.dromara.maxkey.web.config.contorller; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.SocialsProvider; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.SocialsProviderService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -52,7 +52,7 @@ public class SocialsProviderController { _logger.debug(""+socialsProvider); socialsProvider.setInstId(currentUser.getInstId()); return new Message>( - socialsProviderService.queryPageResults(socialsProvider)).buildResponse(); + socialsProviderService.fetchPageResults(socialsProvider)).buildResponse(); } @ResponseBody diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java index 5319d32bf..a2e470bf1 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/config/contorller/SynchronizersController.java @@ -19,7 +19,6 @@ package org.dromara.maxkey.web.config.contorller; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.crypto.password.PasswordReciprocal; import org.dromara.maxkey.entity.Message; @@ -29,6 +28,7 @@ import org.dromara.maxkey.persistence.service.SynchronizersService; import org.dromara.maxkey.synchronizer.ISynchronizerService; import org.dromara.maxkey.util.StringUtils; import org.dromara.maxkey.web.WebContext; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +55,7 @@ public class SynchronizersController { _logger.debug(""+synchronizers); synchronizers.setInstId(currentUser.getInstId()); return new Message>( - synchronizersService.queryPageResults(synchronizers)).buildResponse(); + synchronizersService.fetchPageResults(synchronizers)).buildResponse(); } @RequestMapping(value = { "/get/{id}" }, produces = {MediaType.APPLICATION_JSON_VALUE}) diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java index 80ba72f42..1214390c9 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/AccountsController.java @@ -17,7 +17,6 @@ package org.dromara.maxkey.web.contorller; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsEntryType; import org.dromara.maxkey.constants.ConstsOperateAction; @@ -32,6 +31,7 @@ import org.dromara.maxkey.persistence.service.AccountsStrategyService; import org.dromara.maxkey.persistence.service.AppsService; import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.persistence.service.UserInfoService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -72,7 +72,7 @@ public class AccountsController { _logger.debug(""+accounts); accounts.setInstId(currentUser.getInstId()); return new Message>( - accountsService.queryPageResults(accounts)).buildResponse(); + accountsService.fetchPageResults(accounts)).buildResponse(); } @ResponseBody diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java index 1f7cd8c0c..18c183676 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/LogoutEndpoint.java @@ -17,8 +17,6 @@ package org.dromara.maxkey.web.contorller; -import javax.servlet.http.HttpServletRequest; - import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.authn.session.SessionManager; import org.dromara.maxkey.entity.Message; @@ -31,6 +29,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import jakarta.servlet.http.HttpServletRequest; + @Controller public class LogoutEndpoint { private static Logger _logger = LoggerFactory.getLogger(LogoutEndpoint.class); diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java index f0d3824ee..496782f9d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/OrganizationsController.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.TreeSet; import java.util.stream.Collectors; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -41,6 +40,7 @@ import org.dromara.maxkey.persistence.service.OrganizationsService; import org.dromara.maxkey.util.ExcelUtils; import org.dromara.maxkey.web.component.TreeAttributes; import org.dromara.maxkey.web.component.TreeNode; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -74,7 +74,7 @@ public class OrganizationsController { _logger.debug("fetch {}" , org); org.setInstId(currentUser.getInstId()); return new Message>( - organizationsService.queryPageResults(org)).buildResponse(); + organizationsService.fetchPageResults(org)).buildResponse(); } @ResponseBody diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserAdjointController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserAdjointController.java index 894279ee6..aa9144205 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserAdjointController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserAdjointController.java @@ -17,12 +17,12 @@ package org.dromara.maxkey.web.contorller; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.entity.UserInfoAdjoint; import org.dromara.maxkey.persistence.service.UserInfoAdjointService; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -59,7 +59,7 @@ public class UserAdjointController { @CurrentUser UserInfo currentUser){ _logger.debug(""+userInfoAdjoint); userInfoAdjoint.setInstId(currentUser.getInstId()); - return userInfoAdjointService.queryPageResults(userInfoAdjoint); + return userInfoAdjointService.fetchPageResults(userInfoAdjoint); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserInfoController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserInfoController.java index b086a4c7d..87103eef2 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserInfoController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/contorller/UserInfoController.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.TreeSet; import java.util.stream.Collectors; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -50,6 +49,7 @@ import org.dromara.maxkey.util.ExcelUtils; import org.dromara.maxkey.util.JsonUtils; import org.dromara.maxkey.util.StringUtils; import org.dromara.maxkey.web.WebContext; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -92,7 +92,7 @@ public class UserInfoController { _logger.debug(""+userInfo); userInfo.setInstId(currentUser.getInstId()); return new Message>( - userInfoService.queryPageResults(userInfo)).buildResponse(); + userInfoService.fetchPageResults(userInfo)).buildResponse(); } @ResponseBody diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java index 6f1fc0c55..b0ad77f1d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/ConnectorHistoryController.java @@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.HistoryConnector; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.HistoryConnectorService; import org.dromara.maxkey.util.DateUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -66,7 +66,7 @@ final static Logger _logger = LoggerFactory.getLogger(ConnectorHistoryController _logger.debug("historys/historyConnector/fetch/ {}",historyConnector); historyConnector.setInstId(currentUser.getInstId()); return new Message>( - historyConnectorService.queryPageResults(historyConnector) + historyConnectorService.fetchPageResults(historyConnector) ).buildResponse(); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java index 617d079c7..63f29f2fd 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginAppsHistoryController.java @@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.HistoryLoginApps; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.HistoryLoginAppsService; import org.dromara.maxkey.util.DateUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -66,7 +66,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginAppsHistoryController historyLoginApp.setId(null); historyLoginApp.setInstId(currentUser.getInstId()); return new Message>( - historyLoginAppsService.queryPageResults(historyLoginApp) + historyLoginAppsService.fetchPageResults(historyLoginApp) ).buildResponse(); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java index f62c54fa9..78b1a677d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/LoginHistoryController.java @@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.HistoryLogin; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.HistoryLoginService; import org.dromara.maxkey.util.DateUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -66,7 +66,7 @@ final static Logger _logger = LoggerFactory.getLogger(LoginHistoryController.cla _logger.debug("historys/loginHistory/fetch/ {}",historyLogin); historyLogin.setInstId(currentUser.getInstId()); return new Message>( - loginHistoryService.queryPageResults(historyLogin) + loginHistoryService.fetchPageResults(historyLogin) ).buildResponse(); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java index 94d30f50c..dbdb017e1 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SynchronizerHistoryController.java @@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.HistorySynchronizer; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.HistorySynchronizerService; import org.dromara.maxkey.util.DateUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -65,7 +65,7 @@ final static Logger _logger = LoggerFactory.getLogger(SynchronizerHistoryControl _logger.debug("historys/synchronizerHistory/fetch/ {}",historySynchronizer); historySynchronizer.setInstId(currentUser.getInstId()); return new Message>( - historySynchronizerService.queryPageResults(historySynchronizer) + historySynchronizerService.fetchPageResults(historySynchronizer) ).buildResponse(); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java index 752a3b4f8..c86ad2bf0 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/historys/contorller/SystemLogsController.java @@ -19,13 +19,13 @@ package org.dromara.maxkey.web.historys.contorller; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.entity.HistorySystemLogs; import org.dromara.maxkey.entity.Message; import org.dromara.maxkey.entity.UserInfo; import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.util.DateUtils; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -65,7 +65,7 @@ final static Logger _logger = LoggerFactory.getLogger(SystemLogsController.class _logger.debug("historys/historyLog/fetch {} ",historyLog); historyLog.setInstId(currentUser.getInstId()); return new Message>( - historySystemLogsService.queryPageResults(historyLog) + historySystemLogsService.fetchPageResults(historyLog) ).buildResponse(); } diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java index bc36462ec..f4ab44f94 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/web/permissions/contorller/ResourcesController.java @@ -19,7 +19,6 @@ package org.dromara.maxkey.web.permissions.contorller; import java.util.List; -import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.dromara.maxkey.authn.annotation.CurrentUser; import org.dromara.maxkey.constants.ConstsEntryType; import org.dromara.maxkey.constants.ConstsOperateAction; @@ -31,6 +30,7 @@ import org.dromara.maxkey.persistence.service.HistorySystemLogsService; import org.dromara.maxkey.persistence.service.ResourcesService; import org.dromara.maxkey.web.component.TreeAttributes; import org.dromara.maxkey.web.component.TreeNode; +import org.dromara.mybatis.jpa.entity.JpaPageResults; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -62,7 +62,7 @@ public class ResourcesController { _logger.debug("fetch {}" , resource); resource.setInstId(currentUser.getInstId()); return new Message>( - resourcesService.queryPageResults(resource)).buildResponse(); + resourcesService.fetchPageResults(resource)).buildResponse(); } @ResponseBody diff --git a/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties b/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties index 7e457c05e..2f6760ce2 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties +++ b/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.19 GA +application.formatted-version =v4.0.0 GA #for dynamic service discovery spring.application.name =maxkey-mgt ############################################################################ diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java index a20ee3d27..1185e1f18 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java @@ -17,7 +17,6 @@ package org.dromara.maxkey; -import javax.servlet.ServletException; import org.dromara.maxkey.configuration.ApplicationConfig; import org.dromara.maxkey.web.InitializeContext; @@ -33,6 +32,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; +import jakarta.servlet.ServletException; + @ComponentScan(basePackages = { "org.maxkey.authn", "org.maxkey.configuration", diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java index abc762cd6..d00451c55 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/Oauth20ApiPermissionAdapter.java @@ -19,10 +19,6 @@ package org.dromara.maxkey.web.interceptor; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; import org.dromara.maxkey.authz.oauth2.provider.token.DefaultTokenServices; import org.dromara.maxkey.crypto.password.PasswordReciprocal; @@ -33,6 +29,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.servlet.AsyncHandlerInterceptor; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * OAuth v2.0 accessToken认证Interceptor处理. * @author Crystal.Sea diff --git a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java index 03e989677..9233a6246 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java +++ b/maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/web/interceptor/RestApiPermissionAdapter.java @@ -18,9 +18,6 @@ package org.dromara.maxkey.web.interceptor; import java.util.concurrent.ConcurrentHashMap; -import javax.servlet.RequestDispatcher; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.dromara.maxkey.authn.web.AuthorizationUtils; import org.dromara.maxkey.authz.oauth2.provider.OAuth2Authentication; @@ -37,6 +34,10 @@ import org.springframework.security.core.userdetails.User; import org.springframework.stereotype.Component; import org.springframework.web.servlet.AsyncHandlerInterceptor; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * basic认证Interceptor处理. * @author Crystal.Sea diff --git a/maxkey-webs/maxkey-web-openapi/src/main/resources/application.properties b/maxkey-webs/maxkey-web-openapi/src/main/resources/application.properties index cf94453a9..257aeabf9 100644 --- a/maxkey-webs/maxkey-web-openapi/src/main/resources/application.properties +++ b/maxkey-webs/maxkey-web-openapi/src/main/resources/application.properties @@ -16,7 +16,7 @@ #MaxKey Title and Version # ############################################################################ application.title =MaxKey-OpenApi -application.formatted-version =v3.5.19 GA +application.formatted-version =v4.0.0 GA #for dynamic service discovery spring.application.name =maxkey-openapi ############################################################################