From a9ae5c4a770d66e5e0fd641cbf0273c08e1658c5 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Fri, 20 Aug 2021 18:05:39 +0800
Subject: [PATCH] v2.9.0 GA &jakarta.validation-api &login count

v2.9.0 GA &jakarta.validation-api &login count
---
 build.gradle                                                   | 2 ++
 gradle.properties                                              | 3 ++-
 .../org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml   | 1 -
 maxkey-webs/maxkey-boot-monitor/build.gradle                   | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index c82a69f51..574bd8c00 100644
--- a/build.gradle
+++ b/build.gradle
@@ -267,6 +267,8 @@ subprojects {
          // 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.annotation', name: 'jakarta.annotation-api', version: "${jakartaannotationVersion}"
+         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}"
diff --git a/gradle.properties b/gradle.properties
index ec40a9557..7fb8ea5c8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -83,7 +83,8 @@ thymeleafVersion                =3.0.12.RELEASE
 springbootadminVersion          =2.5.0
 nettyVersion                    =4.1.66.Final
 hazelcastVersion                =4.2.2
-jakartaannotationVersion        =2.0.0
+jakartaannotationVersion        =3.0.0
+jakartavalidationapiVersion     =3.0.0
 attoparserVersion               =2.0.5.RELEASE
 unbescapeVersion                =1.1.6.RELEASE
 jhlabsfiltersVersion            =2.0.235-1
diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml
index 2c3e8bd3a..15cd4d91c 100644
--- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml
+++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml
@@ -24,7 +24,6 @@
 			from mxk_userinfo 
 			where 	online = 1
 				and now() - lastlogintime between 1 and 10000   
-             	and lastlogintime  > lastlogofftime
     </select>
     <!-- 30天活跃用户统计 -->
     <select id="analysisActiveUsers" parameterType="String" resultType="Integer">
diff --git a/maxkey-webs/maxkey-boot-monitor/build.gradle b/maxkey-webs/maxkey-boot-monitor/build.gradle
index 04ca0bae8..9429a63bb 100644
--- a/maxkey-webs/maxkey-boot-monitor/build.gradle
+++ b/maxkey-webs/maxkey-boot-monitor/build.gradle
@@ -24,7 +24,6 @@ dependencies {
    	
    	implementation group: 'io.netty', name: 'netty-all', version: "${nettyVersion}"
    	implementation group: 'com.hazelcast', name: 'hazelcast', version: "${hazelcastVersion}"
-   	implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: "${jakartaannotationVersion}"
    	implementation group: 'org.attoparser', name: 'attoparser', version: "${attoparserVersion}"
    	implementation group: 'org.unbescape', name: 'unbescape', version: "${unbescapeVersion}"
 }
\ No newline at end of file
-- 
GitLab