dromara.

maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/postgresql/RegistrationMapper.xml

@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.persistence.mapper.RegistrationMapper">
+<mapper namespace="org.maxkey.persistence.mapper.RegistrationMapper">
-
+
-    <select id="queryUserInfoByEmail" parameterType="string" resultType="UserInfo">
+    <select id="queryUserInfoByEmail" parameterType="string" resultType="UserInfo">
-        select id,
+        select id,
-               email
+               email
-        from userinfo
+        from userinfo
-        where email = #{value}
+        where email = #{value}
-        union
+        union
-        select id,
+        select id,
-               workemail eamil
+               workemail eamil
-        from mxk_registration
+        from mxk_registration
-        where workemail = #{value}
+        where workemail = #{value}
-    </select>
+    </select>
-
+
 </mapper>

maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,17 +1,17 @@
-org.maxkey.autoconfigure.ApplicationAutoConfiguration
+org.dromara.maxkey.autoconfigure.ApplicationAutoConfiguration
-org.maxkey.autoconfigure.MvcAutoConfiguration
+org.dromara.maxkey.autoconfigure.MvcAutoConfiguration
-org.maxkey.autoconfigure.KaptchaAutoConfiguration
+org.dromara.maxkey.autoconfigure.KaptchaAutoConfiguration
-org.maxkey.autoconfigure.RedisAutoConfiguration
+org.dromara.maxkey.autoconfigure.RedisAutoConfiguration
-org.maxkey.autoconfigure.AuthnProviderAutoConfiguration
+org.dromara.maxkey.autoconfigure.AuthnProviderAutoConfiguration
-org.maxkey.autoconfigure.JwtAuthnAutoConfiguration
+org.dromara.maxkey.autoconfigure.JwtAuthnAutoConfiguration
-org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
+org.dromara.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
-org.maxkey.autoconfigure.SmsAutoConfiguration
+org.dromara.maxkey.autoconfigure.SmsAutoConfiguration
-org.maxkey.autoconfigure.SessionAutoConfiguration
+org.dromara.maxkey.autoconfigure.SessionAutoConfiguration
-org.maxkey.autoconfigure.TokenAutoConfiguration
+org.dromara.maxkey.autoconfigure.TokenAutoConfiguration
-org.maxkey.autoconfigure.CasAutoConfiguration
+org.dromara.maxkey.autoconfigure.CasAutoConfiguration
-org.maxkey.autoconfigure.Oauth20AutoConfiguration
+org.dromara.maxkey.autoconfigure.Oauth20AutoConfiguration
-org.maxkey.autoconfigure.Saml20AutoConfiguration
+org.dromara.maxkey.autoconfigure.Saml20AutoConfiguration
-org.maxkey.autoconfigure.SocialSignOnAutoConfiguration
+org.dromara.maxkey.autoconfigure.SocialSignOnAutoConfiguration
-org.maxkey.autoconfigure.SwaggerConfig
+org.dromara.maxkey.autoconfigure.SwaggerConfig
-org.maxkey.autoconfigure.MaxKeyMvcConfig
+org.dromara.maxkey.autoconfigure.MaxKeyMvcConfig
-org.maxkey.autoconfigure.MaxKeyConfig
+org.dromara.maxkey.autoconfigure.MaxKeyConfig

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

@@ -117,8 +117,8 @@ spring.datasource.url                           =jdbc:mysql://${DATABASE_HOST:lo
 #spring.datasource.url=jdbc:postgresql://localhost/maxkey?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 #mybatis
 mybatis.dialect                                 =mysql
-mybatis.type-aliases-package                    =org.maxkey.entity,org.maxkey.entity.apps,
+mybatis.type-aliases-package                    =org.dromara.maxkey.entity,org.dromara.maxkey.entity.apps,
-mybatis.mapper-locations                        =classpath*:/org/maxkey/persistence/mapper/xml/${mybatis.dialect}/*.xml
+mybatis.mapper-locations                        =classpath*:/org/dromara/maxkey/persistence/mapper/xml/${mybatis.dialect}/*.xml
 mybatis.table-column-snowflake-datacenter-id    =1
 mybatis.table-column-snowflake-machine-id       =1
 mybatis.table-column-escape                     =false

maxkey-webs/maxkey-web-mgt/src/main/java/org/dromara/maxkey/MaxKeyMgtApplication.java

@@ -34,28 +34,28 @@ import org.springframework.context.annotation.ComponentScan;
 import jakarta.servlet.ServletException;
 
 @ComponentScan(basePackages = {
-	"org.maxkey.authn",
+	"org.dromara.maxkey.authn",
-	"org.maxkey.configuration",
+	"org.dromara.maxkey.configuration",
-	"org.maxkey.entity",
+	"org.dromara.maxkey.entity",
-    "org.maxkey.entity.apps",
+    "org.dromara.maxkey.entity.apps",
-    "org.maxkey.entity.userinfo",
+    "org.dromara.maxkey.entity.userinfo",
-    "org.maxkey.web.apis.identity.kafka",
+    "org.dromara.maxkey.web.apis.identity.kafka",
-    "org.maxkey.web.apis.identity.rest",
+    "org.dromara.maxkey.web.apis.identity.rest",
-    "org.maxkey.web.apis.identity.scim",
+    "org.dromara.maxkey.web.apis.identity.scim",
-    "org.maxkey.persistence",
+    "org.dromara.maxkey.persistence",
-    "org.maxkey.provision",
+    "org.dromara.maxkey.provision",
-    "org.maxkey.synchronizer",
+    "org.dromara.maxkey.synchronizer",
-    "org.maxkey.web",
+    "org.dromara.maxkey.web",
-    "org.maxkey.web.access.contorller", 
+    "org.dromara.maxkey.web.access.contorller", 
-    "org.maxkey.web.api.endpoint",
+    "org.dromara.maxkey.web.api.endpoint",
-    "org.maxkey.web.apps.contorller",
+    "org.dromara.maxkey.web.apps.contorller",
-    "org.maxkey.web.contorller",
+    "org.dromara.maxkey.web.contorller",
-    "org.maxkey.web.endpoint",
+    "org.dromara.maxkey.web.endpoint",
-    "org.maxkey.web.interceptor",
+    "org.dromara.maxkey.web.interceptor",
-    "org.maxkey.web.permissions.contorller", 
+    "org.dromara.maxkey.web.permissions.contorller", 
-    "org.maxkey.web.tag"
+    "org.dromara.maxkey.web.tag"
 })
-@MapperScan("org.maxkey.persistence.mapper,")
+@MapperScan("org.dromara.maxkey.persistence.mapper,")
 @SpringBootApplication
 @EnableDiscoveryClient
 public class MaxKeyMgtApplication extends SpringBootServletInitializer {

maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,16 +1,16 @@
-org.maxkey.autoconfigure.ApplicationAutoConfiguration
+org.dromara.maxkey.autoconfigure.ApplicationAutoConfiguration
-org.maxkey.autoconfigure.KaptchaAutoConfiguration
+org.dromara.maxkey.autoconfigure.KaptchaAutoConfiguration
-org.maxkey.autoconfigure.MvcAutoConfiguration
+org.dromara.maxkey.autoconfigure.MvcAutoConfiguration
-org.maxkey.autoconfigure.JwtAuthnAutoConfiguration
+org.dromara.maxkey.autoconfigure.JwtAuthnAutoConfiguration
-org.maxkey.autoconfigure.RedisAutoConfiguration
+org.dromara.maxkey.autoconfigure.RedisAutoConfiguration
-org.maxkey.autoconfigure.AuthnProviderAutoConfiguration
+org.dromara.maxkey.autoconfigure.AuthnProviderAutoConfiguration
-org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
+org.dromara.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
-org.maxkey.autoconfigure.SmsAutoConfiguration
+org.dromara.maxkey.autoconfigure.SmsAutoConfiguration
-org.maxkey.autoconfigure.SessionAutoConfiguration
+org.dromara.maxkey.autoconfigure.SessionAutoConfiguration
-org.maxkey.autoconfigure.TokenAutoConfiguration
+org.dromara.maxkey.autoconfigure.TokenAutoConfiguration
-org.maxkey.autoconfigure.SynchronizerAutoConfiguration
+org.dromara.maxkey.autoconfigure.SynchronizerAutoConfiguration
-org.maxkey.autoconfigure.SwaggerConfig
+org.dromara.maxkey.autoconfigure.SwaggerConfig
-org.maxkey.autoconfigure.Oauth20ClientAutoConfiguration
+org.dromara.maxkey.autoconfigure.Oauth20ClientAutoConfiguration
-org.maxkey.autoconfigure.MaxKeyMgtConfig
+org.dromara.maxkey.autoconfigure.MaxKeyMgtConfig
-org.maxkey.autoconfigure.MaxKeyMgtMvcConfig
+org.dromara.maxkey.autoconfigure.MaxKeyMgtMvcConfig
-org.maxkey.autoconfigure.MaxKeyMgtListenerConfig
+org.dromara.maxkey.autoconfigure.MaxKeyMgtListenerConfig

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

@@ -91,8 +91,8 @@ spring.datasource.url                           =jdbc:mysql://${DATABASE_HOST:lo
 #spring.datasource.url=jdbc:postgresql://localhost/maxkey?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 #mybatis
 mybatis.dialect                                 =mysql
-mybatis.type-aliases-package                    =org.maxkey.entity,org.maxkey.entity.apps,
+mybatis.type-aliases-package                    =org.dromara.maxkey.entity,org.dromara.maxkey.entity.apps,
-mybatis.mapper-locations                        =classpath*:/org/maxkey/persistence/mapper/xml/${mybatis.dialect}/*.xml
+mybatis.mapper-locations                        =classpath*:/org/dromara/maxkey/persistence/mapper/xml/${mybatis.dialect}/*.xml
 mybatis.table-column-snowflake-datacenter-id    =1
 mybatis.table-column-snowflake-machine-id       =1
 mybatis.table-column-escape                     =false

maxkey-webs/maxkey-web-openapi/src/main/java/org/dromara/maxkey/MaxKeyOpenApiApplication.java

@@ -35,23 +35,23 @@ import org.springframework.context.annotation.ComponentScan;
 import jakarta.servlet.ServletException;
 
 @ComponentScan(basePackages = {
-	"org.maxkey.authn",
+	"org.dromara.maxkey.authn",
-	"org.maxkey.configuration",
+	"org.dromara.maxkey.configuration",
-	"org.maxkey.entity",
+	"org.dromara.maxkey.entity",
-    "org.maxkey.entity.apps",
+    "org.dromara.maxkey.entity.apps",
-    "org.maxkey.entity.userinfo",
+    "org.dromara.maxkey.entity.userinfo",
-    "org.maxkey.web.apis.identity.kafka",
+    "org.dromara.maxkey.web.apis.identity.kafka",
-    "org.maxkey.web.apis.identity.rest",
+    "org.dromara.maxkey.web.apis.identity.rest",
-    "org.maxkey.web.apis.identity.scim",
+    "org.dromara.maxkey.web.apis.identity.scim",
-    "org.maxkey.persistence",
+    "org.dromara.maxkey.persistence",
-    "org.maxkey.provision",
+    "org.dromara.maxkey.provision",
-    "org.maxkey.web",
+    "org.dromara.maxkey.web",
-    "org.maxkey.web.api.endpoint",
+    "org.dromara.maxkey.web.api.endpoint",
-    "org.maxkey.web.contorller",
+    "org.dromara.maxkey.web.contorller",
-    "org.maxkey.web.endpoint",
+    "org.dromara.maxkey.web.endpoint",
-    "org.maxkey.web.interceptor",
+    "org.dromara.maxkey.web.interceptor",
 })
-@MapperScan("org.maxkey.persistence.mapper,")
+@MapperScan("org.dromara.maxkey.persistence.mapper,")
 @SpringBootApplication
 @EnableDiscoveryClient
 public class MaxKeyOpenApiApplication extends SpringBootServletInitializer {

maxkey-webs/maxkey-web-openapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,14 +1,14 @@
-org.maxkey.autoconfigure.ApplicationAutoConfiguration
+org.dromara.maxkey.autoconfigure.ApplicationAutoConfiguration
-org.maxkey.autoconfigure.KaptchaAutoConfiguration
+org.dromara.maxkey.autoconfigure.KaptchaAutoConfiguration
-org.maxkey.autoconfigure.MvcAutoConfiguration
+org.dromara.maxkey.autoconfigure.MvcAutoConfiguration
-org.maxkey.autoconfigure.JwtAuthnAutoConfiguration
+org.dromara.maxkey.autoconfigure.JwtAuthnAutoConfiguration
-org.maxkey.autoconfigure.RedisAutoConfiguration
+org.dromara.maxkey.autoconfigure.RedisAutoConfiguration
-org.maxkey.autoconfigure.AuthnProviderAutoConfiguration
+org.dromara.maxkey.autoconfigure.AuthnProviderAutoConfiguration
-org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
+org.dromara.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
-org.maxkey.autoconfigure.SmsAutoConfiguration
+org.dromara.maxkey.autoconfigure.SmsAutoConfiguration
-org.maxkey.autoconfigure.SessionAutoConfiguration
+org.dromara.maxkey.autoconfigure.SessionAutoConfiguration
-org.maxkey.autoconfigure.TokenAutoConfiguration
+org.dromara.maxkey.autoconfigure.TokenAutoConfiguration
-org.maxkey.autoconfigure.SwaggerConfig
+org.dromara.maxkey.autoconfigure.SwaggerConfig
-org.maxkey.autoconfigure.Oauth20ClientAutoConfiguration
+org.dromara.maxkey.autoconfigure.Oauth20ClientAutoConfiguration
-org.maxkey.autoconfigure.MaxKeyOpenApiConfig
+org.dromara.maxkey.autoconfigure.MaxKeyOpenApiConfig
-org.maxkey.autoconfigure.MaxKeyOpenApiMvcConfig
+org.dromara.maxkey.autoconfigure.MaxKeyOpenApiMvcConfig

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

@@ -91,8 +91,8 @@ spring.datasource.url                           =jdbc:mysql://${DATABASE_HOST:lo
 #spring.datasource.url=jdbc:postgresql://localhost/maxkey?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 #mybatis
 mybatis.dialect                                 =mysql
-mybatis.type-aliases-package                    =org.maxkey.entity,org.maxkey.entity.apps,
+mybatis.type-aliases-package                    =org.dromara.maxkey.entity,org.dromara.maxkey.entity.apps,
-mybatis.mapper-locations                        =classpath*:/org/maxkey/persistence/mapper/xml/${mybatis.dialect}/*.xml
+mybatis.mapper-locations                        =classpath*:/org/dromara/maxkey/persistence/mapper/xml/${mybatis.dialect}/*.xml
 mybatis.table-column-snowflake-datacenter-id    =1
 mybatis.table-column-snowflake-machine-id       =1
 mybatis.table-column-escape                     =false

setEnvVars.bat

@@ -1,6 +1,6 @@
 echo off
 echo set env
-set JAVA_HOME=D:\IDE\jdk-8.0.312.7
+set JAVA_HOME=D:\IDE\jdk-17.0.2.8
 set GRADLE_HOME=C:\IDE\gradle-8.0.2
 
 call %JAVA_HOME%/bin/java -version