MySQL 8.0.21 Support

MySQL 8.0.21 Support

build.gradle

@@ -262,7 +262,7 @@ subprojects {
          //quartz
          compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2'
 		 //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-spring-boot-starter', version: '1.1.21'
          compile group: 'redis.clients', name: 'jedis', version: '3.2.0'

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

@@ -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 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 = ?";
 

maxkey-identitys/maxkey-identity-kafka/.classpath

@@ -27,10 +27,6 @@
 		</attributes>
 	</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.buildship.core.gradleclasspathcontainer">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

maxkey-identitys/maxkey-identity-kafka/.project

@@ -11,7 +11,7 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -21,11 +21,6 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
 			<arguments>
 			</arguments>
@@ -33,9 +28,6 @@
 	</buildSpec>
 	<natures>
 		<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>
 	</natures>
 </projectDescription>

maxkey-identitys/maxkey-identity-scim/.classpath

@@ -27,10 +27,6 @@
 		</attributes>
 	</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.buildship.core.gradleclasspathcontainer">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

maxkey-identitys/maxkey-identity-scim/.project

@@ -11,17 +11,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

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

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

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

@@ -17,7 +17,7 @@
 		SELECT
 			*
 		FROM
-			GROUPS
+			`GROUPS`
 		WHERE
 			 (1=1)	
 		<include refid="where_statement"/>
@@ -25,7 +25,7 @@
 	
 	
 	<update id="logisticDelete" parameterType="Groups" >
-    	UPDATE GROUPS SET
+    	UPDATE `GROUPS` SET
     		STATUS	=	'2'  
     	WHERE	1	=	1
     	<if test="id != null">
@@ -38,7 +38,7 @@
     
     
     <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=")">
 				#{item}
     		</foreach>

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

@@ -17,12 +17,13 @@ spring.servlet.multipart.max-file-size=4194304
 #datasource
 spring.datasource.username=root
 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.type=com.alibaba.druid.pool.DruidDataSource
 #mybatis
 mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps,
 mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml
+mybatis.table-column-escape=true
 #redis
 spring.redis.host=127.0.0.1
 spring.redis.port=6379

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

@@ -25,12 +25,13 @@ spring.servlet.multipart.max-file-size=4194304
 #datasource
 spring.datasource.username=root
 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.type=com.alibaba.druid.pool.DruidDataSource
 #mybatis
 mybatis.type-aliases-package=org.maxkey.domain,org.maxkey.domain.apps,
 mybatis.mapper-locations=classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml
+mybatis.table-column-escape=true
 #redis
 spring.redis.host=127.0.0.1
 spring.redis.port=6379