admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 17:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

MySQL 8.0.21 Support

Browse Source 
MySQL 8.0.21 Support
This commit is contained in:
MaxKey 2020-07-18 12:42:57 +08:00
parent 2691e49957
commit 62d63ba77a
12 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -262,7 +262,7 @@ subprojects {
//quartz //quartz
compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2' compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2'
//database //database
compile group: 'mysql', name: 'mysql-connector-java', version: '5.1.48' compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.21'
compile group: 'com.alibaba', name: 'druid', version: '1.1.21' compile group: 'com.alibaba', name: 'druid', version: '1.1.21'
compile group: 'com.alibaba', name: 'druid-spring-boot-starter', version: '1.1.21' compile group: 'com.alibaba', name: 'druid-spring-boot-starter', version: '1.1.21'
compile group: 'redis.clients', name: 'jedis', version: '3.2.0' compile group: 'redis.clients', name: 'jedis', version: '3.2.0'

2
maxkey-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java
View File

@ -76,7 +76,7 @@ public abstract class AbstractAuthenticationRealm {
private static final String HISTORY_LOGOUT_UPDATE_STATEMENT = "UPDATE HISTORY_LOGIN SET LOGOUTTIME = ? WHERE SESSIONID = ?"; private static final String HISTORY_LOGOUT_UPDATE_STATEMENT = "UPDATE HISTORY_LOGIN SET LOGOUTTIME = ? WHERE SESSIONID = ?";
private static final String GROUPS_SELECT_STATEMENT = "SELECT DISTINCT G.ID,G.NAME FROM USERINFO U,GROUPS G,GROUP_MEMBER GM WHERE U.ID = ? AND U.ID=GM.MEMBERID AND GM.GROUPID=G.ID "; private static final String GROUPS_SELECT_STATEMENT = "SELECT DISTINCT G.ID,G.NAME FROM USERINFO U,`GROUPS` G,GROUP_MEMBER GM WHERE U.ID = ? AND U.ID=GM.MEMBERID AND GM.GROUPID=G.ID ";
private static final String DEFAULT_USERINFO_SELECT_STATEMENT = "SELECT * FROM USERINFO WHERE USERNAME = ?"; private static final String DEFAULT_USERINFO_SELECT_STATEMENT = "SELECT * FROM USERINFO WHERE USERNAME = ?";

6
maxkey-identitys/maxkey-identity-kafka/.classpath
View File

@ -27,10 +27,6 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"> <classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<attributes>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin/default"/> <classpathentry kind="output" path="bin/default"/>
</classpath> </classpath>

10
maxkey-identitys/maxkey-identity-kafka/.project
View File

@ -11,7 +11,7 @@
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name> <name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
@ -20,11 +20,6 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name> <name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
<arguments> <arguments>
@ -33,9 +28,6 @@
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature> <nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

6
maxkey-identitys/maxkey-identity-scim/.classpath
View File

@ -27,10 +27,6 @@
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"> <classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<attributes>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin/default"/> <classpathentry kind="output" path="bin/default"/>
</classpath> </classpath>

10
maxkey-identitys/maxkey-identity-scim/.project
View File

@ -10,6 +10,11 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name> <name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments> <arguments>
@ -20,11 +25,6 @@
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand> <buildCommand>
<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name> <name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
<arguments> <arguments>

BIN
maxkey-lib/mybatis-jpa-extra-2.1.jar
View File

Binary file not shown.

BIN
maxkey-lib/mybatis-jpa-extra-spring-boot-starter-2.1.jar
View File

Binary file not shown.

8
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
View File

@ -98,7 +98,7 @@
U.STATUS U.STATUS
FROM FROM
USERINFO U, USERINFO U,
GROUPS G, `GROUPS` G,
GROUP_MEMBER GM GROUP_MEMBER GM
WHERE 1 = 1 WHERE 1 = 1
<if test="groupId != null and groupId != ''"> <if test="groupId != null and groupId != ''">
@ -158,7 +158,7 @@
WHERE WHERE
U.ID NOT IN( U.ID NOT IN(
SELECT GM.MEMBERID SELECT GM.MEMBERID
FROM GROUPS G,GROUP_MEMBER GM FROM `GROUPS` G,GROUP_MEMBER GM
WHERE 1 = 1 WHERE 1 = 1
<if test="groupId != null and groupId != ''"> <if test="groupId != null and groupId != ''">
AND GM.GROUPID = #{groupId} AND GM.GROUPID = #{groupId}
@ -178,8 +178,8 @@
SELECT DISTINCT SELECT DISTINCT
IG.* IG.*
FROM FROM
GROUPS IG, `GROUPS` IG,
GROUPS G, `GROUPS` G,
GROUP_MEMBER GM GROUP_MEMBER GM
WHERE WHERE
1 = 1 1 = 1

6
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupsMapper.xml
View File

@ -17,7 +17,7 @@
SELECT SELECT
* *
FROM FROM
GROUPS `GROUPS`
WHERE WHERE
(1=1) (1=1)
<include refid="where_statement"/> <include refid="where_statement"/>
@ -25,7 +25,7 @@
<update id="logisticDelete" parameterType="Groups" > <update id="logisticDelete" parameterType="Groups" >
UPDATE GROUPS SET UPDATE `GROUPS` SET
STATUS = '2' STATUS = '2'
WHERE 1 = 1 WHERE 1 = 1
<if test="id != null"> <if test="id != null">
@ -38,7 +38,7 @@
<update id="logisticBatchDelete" parameterType="java.util.List"> <update id="logisticBatchDelete" parameterType="java.util.List">
UPDATE GROUPS SET STATUS='2' WHERE ID IN UPDATE `GROUPS` SET STATUS='2' WHERE ID IN
<foreach item="item" collection="list" open="(" separator="," close=")"> <foreach item="item" collection="list" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>

3
maxkey-web-manage/src/main/resources/application.properties
View File

@ -17,12 +17,13 @@ spring.servlet.multipart.max-file-size=4194304
#datasource #datasource
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=maxkey spring.datasource.password=maxkey
spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8 spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8&serverTimezone=UTC
spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
#mybatis #mybatis
mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps, mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps,
mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml
mybatis.table-column-escape=true
#redis #redis
spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379

3
maxkey-web-maxkey/src/main/resources/application.properties
View File

@ -25,12 +25,13 @@ spring.servlet.multipart.max-file-size=4194304
#datasource #datasource
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=maxkey spring.datasource.password=maxkey
spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8 spring.datasource.url=jdbc:mysql://localhost/maxkey?autoReconnect=true&characterEncoding=UTF-8&serverTimezone=UTC
spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
#mybatis #mybatis
mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps, mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps,
mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml
mybatis.table-column-escape=true
#redis #redis
spring.redis.host=127.0.0.1 spring.redis.host=127.0.0.1
spring.redis.port=6379 spring.redis.port=6379