From 045bf14bb648caab50b74966be2b6e9eb2d05d42 Mon Sep 17 00:00:00 2001
From: "Crystal.Sea" <shimingxy@163.com>
Date: Tue, 28 Sep 2021 14:27:43 +0800
Subject: [PATCH] v3.0.0 GA  Integer to Long

---
 .../src/main/java/org/maxkey/util/BeanConvert.java  |  2 +-
 .../src/test/java/org/maxkey/Integer2LongTest.java  | 13 +++++++++++++
 .../token/store/JwtAccessTokenConverter.java        |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java

diff --git a/maxkey-common/src/main/java/org/maxkey/util/BeanConvert.java b/maxkey-common/src/main/java/org/maxkey/util/BeanConvert.java
index 658dbf1d..69c24aec 100644
--- a/maxkey-common/src/main/java/org/maxkey/util/BeanConvert.java
+++ b/maxkey-common/src/main/java/org/maxkey/util/BeanConvert.java
@@ -90,7 +90,7 @@ public class BeanConvert {
             }else if(fieldType.equals("long")){
             	value=Long.parseLong(fillValue);
             }else if(fieldType.equals("java.lang.Long")){
-            	value=new Long(fillValue);
+            	value= Long.parseLong(fillValue);
             }else if(fieldType.equals("double")){
             	value=(double)Double.valueOf(fillValue);
             }else if(fieldType.equals("java.lang.Double")){
diff --git a/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java b/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java
new file mode 100644
index 00000000..1b92db8c
--- /dev/null
+++ b/maxkey-common/src/test/java/org/maxkey/Integer2LongTest.java
@@ -0,0 +1,13 @@
+package org.maxkey;
+
+public class Integer2LongTest {
+
+    public static void main(String[] args) {
+        // TODO Auto-generated method stub
+        Integer intValue =20000;
+        Long v=Integer.toUnsignedLong(intValue);
+        System.out.println(v);
+        System.out.println(v.getClass());
+    }
+
+}
diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java
index 373c6780..2ba1d0c1 100644
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java
+++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/authz/oauth2/provider/token/store/JwtAccessTokenConverter.java
@@ -252,7 +252,7 @@ public class JwtAccessTokenConverter implements TokenEnhancer, AccessTokenConver
             Map<String, Object> map = objectMapper.parseMap(content);
             if (map.containsKey(EXP) && map.get(EXP) instanceof Integer) {
                 Integer intValue = (Integer) map.get(EXP);
-                map.put(EXP, new Long(intValue));
+                map.put(EXP, Integer.toUnsignedLong(intValue));
             }
             return map;
         } catch (Exception e) {