Update spring-boot 2.4.2 , update config

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.4.RELEASE</version>
+        <version>2.4.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -30,18 +30,6 @@
 
     <dependencies>
 
-        <!-- Provided -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-jasper</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -170,7 +158,7 @@
                             <Implementation-BuildNumber>${project.version}</Implementation-BuildNumber>
                             <Implementation-Title>spring-oauth-server(boot)</Implementation-Title>
                             <Implementation-Version>${project.version}</Implementation-Version>
-                            <Implementation-URL>http://monkeyk.com</Implementation-URL>
+                            <Implementation-URL>https://monkeyk.com</Implementation-URL>
                             <Implementation-Vendor>Not Vendor Yet, Inc.</Implementation-Vendor>
                         </manifestEntries>
                         <manifest>

src/main/java/com/monkeyk/sos/SpringOauthServerServletInitializer.java

@@ -1,31 +0,0 @@
-package com.monkeyk.sos;
-
-import com.monkeyk.sos.web.WebUtils;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-/**
- * 2017-12-05
- *
- * @author Shengzhao Li
- */
-public class SpringOauthServerServletInitializer extends SpringBootServletInitializer {
-
-
-    @Override
-    public void onStartup(ServletContext servletContext) throws ServletException {
-        super.onStartup(servletContext);
-        //主版本号
-        servletContext.setAttribute("mainVersion", WebUtils.VERSION);
-    }
-
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(SpringOauthServerApplication.class);
-    }
-
-}

src/main/resources/application.properties

@@ -11,14 +11,14 @@ spring.datasource.password=andaily
 #Datasource properties
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.maximum-pool-size=20
-spring.datasource.hikari.minimum-idle=2
+#spring.datasource.hikari.minimum-idle=2
 #
 # MVC
 spring.mvc.ignore-default-model-on-redirect=false
-spring.http.encoding.enabled=true
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.force=true
-spring.mvc.locale=zh_CN
+#spring.http.encoding.enabled=true
+#spring.http.encoding.charset=UTF-8
+#spring.http.encoding.force=true
+#spring.mvc.locale=zh_CN
 spring.mvc.view.prefix=/WEB-INF/jsp/
 spring.mvc.view.suffix=.jsp
 #
@@ -44,7 +44,7 @@ spring.main.allow-bean-definition-overriding=true
 #
 # Condition Config
 # @since 2.1.0
-# 配置使用什么类型 TokenStore,支持 jdbc, jwt
+# <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD><EFBFBD>ʲô<EFBFBD><EFBFBD><EFBFBD><EFBFBD> TokenStore,֧<><D6A7> jdbc, jwt
 sos.token.store=jwt
 # jwt key (length >= 16), optional
 #sos.token.store.jwt.key=IH6S2dhCEMwGr7uE4fBakSuDh9SoIrRa

src/test/java/com/monkeyk/sos/ContextTest.java

@@ -1,16 +1,14 @@
 package com.monkeyk.sos;
 
-import org.junit.runner.RunWith;
+
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.transaction.BeforeTransaction;
 
 /**
  * @author Shengzhao Li
  */
-@RunWith(SpringRunner.class)
 @SpringBootTest
 @TestPropertySource(locations = "classpath:application-test.properties")
 public abstract class ContextTest extends AbstractTransactionalJUnit4SpringContextTests {

src/test/java/com/monkeyk/sos/SpringOauthServerApplicationTests.java

@@ -1,18 +1,16 @@
 package com.monkeyk.sos;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 @TestPropertySource(locations = "classpath:application-test.properties")
-public class SpringOauthServerApplicationTests {
+class SpringOauthServerApplicationTests {
 
-	@Test
-	public void contextLoads() {
-	}
+    @Test
+    void contextLoads() {
+    }
 
 }

src/test/java/com/monkeyk/sos/config/JWTTokenStoreConfigurationTest.java

@@ -1,12 +1,14 @@
 package com.monkeyk.sos.config;
 
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 import org.springframework.security.oauth2.common.util.RandomValueStringGenerator;
 import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
 
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+
 
 /**
  * 2020/6/9
@@ -14,11 +16,11 @@ import static org.junit.Assert.*;
  * @author Shengzhao Li
  * @since 2.1.0
  */
-public class JWTTokenStoreConfigurationTest {
+class JWTTokenStoreConfigurationTest {
 
 
     @Test
-    public void keyTest() throws Exception {
+    void keyTest() throws Exception {
 
         RandomValueStringGenerator randomValueStringGenerator = new RandomValueStringGenerator(32);
         String verifierKey = randomValueStringGenerator.generate();
@@ -29,7 +31,7 @@ public class JWTTokenStoreConfigurationTest {
 
 
     @Test
-    public void testJwtAccessTokenConverter() throws Exception {
+    void testJwtAccessTokenConverter() throws Exception {
 
         JwtAccessTokenConverter jwtAccessTokenConverter = new JwtAccessTokenConverter();
         jwtAccessTokenConverter.setSigningKey("IH6S2dhCEMwGr7uE4fBakSuDh9SoIrRa");

src/test/java/com/monkeyk/sos/infrastructure/DateUtilsTest.java

@@ -12,23 +12,23 @@
 package com.monkeyk.sos.infrastructure;
 
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 /*
   * @author Shengzhao Li
   */
-public class DateUtilsTest {
+class DateUtilsTest {
 
 
     @Test
-    public void convert() {
+    void convert() {
 
         LocalDateTime localDateTime = LocalDateTime.of(2015, 4, 3, 12, 30, 22);
 
@@ -41,7 +41,7 @@ public class DateUtilsTest {
 
 
         final String text = DateUtils.toDateTime(localDateTime);
-        assertEquals(text,"2015-04-03 12:30:22");
+        assertEquals(text, "2015-04-03 12:30:22");
 
     }
 

src/test/java/com/monkeyk/sos/infrastructure/PasswordHandlerTest.java

@@ -1,18 +1,18 @@
 package com.monkeyk.sos.infrastructure;
 
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /*
   * @author Shengzhao Li
   */
-public class PasswordHandlerTest {
+class PasswordHandlerTest {
 
 
     @Test
-    public void testMd5() throws Exception {
+    void testMd5() throws Exception {
 
         final String md5 = PasswordHandler.encode("123456");
         assertNotNull(md5);

src/test/java/com/monkeyk/sos/infrastructure/jdbc/OauthRepositoryJdbcTest.java

@@ -15,19 +15,19 @@ import com.monkeyk.sos.domain.oauth.OauthClientDetails;
 import com.monkeyk.sos.domain.oauth.OauthRepository;
 import com.monkeyk.sos.domain.shared.GuidGenerator;
 import com.monkeyk.sos.infrastructure.AbstractRepositoryTest;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 /*
   * @author Shengzhao Li
   */
-public class OauthRepositoryJdbcTest extends AbstractRepositoryTest {
+class OauthRepositoryJdbcTest extends AbstractRepositoryTest {
 
 
     @Autowired
@@ -35,7 +35,7 @@ public class OauthRepositoryJdbcTest extends AbstractRepositoryTest {
 
 
     @Test
-    public void findOauthClientDetails() {
+    void findOauthClientDetails() {
         OauthClientDetails oauthClientDetails = oauthRepositoryMyBatis.findOauthClientDetails("unity-client");
         assertNull(oauthClientDetails);
 
@@ -43,7 +43,7 @@ public class OauthRepositoryJdbcTest extends AbstractRepositoryTest {
 
 
     @Test
-    public void saveOauthClientDetails() {
+    void saveOauthClientDetails() {
 
         final String clientId = GuidGenerator.generate();
 
@@ -58,14 +58,14 @@ public class OauthRepositoryJdbcTest extends AbstractRepositoryTest {
     }
 
     @Test
-    public void findAllOauthClientDetails() {
+    void findAllOauthClientDetails() {
         final List<OauthClientDetails> allOauthClientDetails = oauthRepositoryMyBatis.findAllOauthClientDetails();
         assertNotNull(allOauthClientDetails);
         assertTrue(allOauthClientDetails.isEmpty());
     }
 
     @Test
-    public void updateOauthClientDetailsArchive() {
+    void updateOauthClientDetailsArchive() {
         oauthRepositoryMyBatis.updateOauthClientDetailsArchive("ddooelddd", true);
     }
 

src/test/java/com/monkeyk/sos/infrastructure/jdbc/UserRepositoryJdbcTest.java

@@ -14,19 +14,20 @@ package com.monkeyk.sos.infrastructure.jdbc;
 import com.monkeyk.sos.domain.user.User;
 import com.monkeyk.sos.domain.user.UserRepository;
 import com.monkeyk.sos.infrastructure.AbstractRepositoryTest;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
 import java.util.List;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 /*
   * @author Shengzhao Li
   */
-public class UserRepositoryJdbcTest extends AbstractRepositoryTest {
+class UserRepositoryJdbcTest extends AbstractRepositoryTest {
 
 
     @Autowired
@@ -34,7 +35,7 @@ public class UserRepositoryJdbcTest extends AbstractRepositoryTest {
 
 
     @Test
-    public void findByGuid() {
+    void findByGuid() {
         User user = userRepository.findByGuid("oood");
         assertNull(user);
 
@@ -49,7 +50,7 @@ public class UserRepositoryJdbcTest extends AbstractRepositoryTest {
     }
 
     @Test
-    public void findUsersByUsername() {
+    void findUsersByUsername() {
         User user = userRepository.findByGuid("oood");
         assertNull(user);
 
@@ -65,7 +66,7 @@ public class UserRepositoryJdbcTest extends AbstractRepositoryTest {
 
 
     @Test
-    public void updateUser() {
+    void updateUser() {
         User user = new User("user", "123", "123", "ewo@honyee.cc");
         userRepository.saveUser(user);
 
@@ -84,7 +85,7 @@ public class UserRepositoryJdbcTest extends AbstractRepositoryTest {
 
 
     @Test
-    public void findByUsername() {
+    void findByUsername() {
         String username = "user";
         User user = new User(username, "123", "123", "ewo@honyee.cc");
         userRepository.saveUser(user);
@@ -98,7 +99,7 @@ public class UserRepositoryJdbcTest extends AbstractRepositoryTest {
     * Run the test must initial db firstly
     * */
 //    @Test()
-    public void testPrivilege() {
+    void testPrivilege() {
 
         String guid = "55b713df1c6f423e842ad68668523c49";
         final User user = userRepository.findByGuid(guid);

src/test/java/com/monkeyk/sos/service/business/ClientCredentialsInlineAccessTokenInvokerTest.java

@@ -1,13 +1,14 @@
 package com.monkeyk.sos.service.business;
 
 import com.monkeyk.sos.service.dto.AccessTokenDto;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.security.oauth2.provider.NoSuchClientException;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
+
 
 /**
  * 2019/7/6
@@ -39,8 +40,9 @@ public class ClientCredentialsInlineAccessTokenInvokerTest extends AbstractInlin
 
     }
 
-    @Test(expected = NoSuchClientException.class)
-    public void invalidClientId() {
+//    @Test(expected = NoSuchClientException.class)
+    @Test()
+     void invalidClientId() {
 
         createClientDetails();
 
@@ -62,7 +64,7 @@ public class ClientCredentialsInlineAccessTokenInvokerTest extends AbstractInlin
     }
 
     @Test()
-    public void invalidClientSecret() {
+     void invalidClientSecret() {
 
         createClientDetails();
 

src/test/java/com/monkeyk/sos/service/business/PasswordInlineAccessTokenInvokerTest.java

@@ -1,25 +1,25 @@
 package com.monkeyk.sos.service.business;
 
 import com.monkeyk.sos.service.dto.AccessTokenDto;
-import org.junit.Test;
-import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 
 /**
  * 2019/7/6
  *
  * @author Shengzhao Li
  */
-public class PasswordInlineAccessTokenInvokerTest extends AbstractInlineAccessTokenInvokerTest {
+ class PasswordInlineAccessTokenInvokerTest extends AbstractInlineAccessTokenInvokerTest {
 
 
     @Test
-    public void invokeNormal() {
+     void invokeNormal() {
 
         createClientDetails();
 
@@ -46,8 +46,9 @@ public class PasswordInlineAccessTokenInvokerTest extends AbstractInlineAccessTo
     }
 
 
-    @Test(expected = InvalidGrantException.class)
-    public void invalidUsername() {
+//    @Test(expected = InvalidGrantException.class)
+    @Test
+     void invalidUsername() {
 
         createClientDetails();
 
@@ -70,8 +71,9 @@ public class PasswordInlineAccessTokenInvokerTest extends AbstractInlineAccessTo
     }
 
 
-    @Test(expected = IllegalStateException.class)
-    public void invalidScope() {
+//    @Test(expected = IllegalStateException.class)
+    @Test
+     void invalidScope() {
 
         createClientDetails();
         createUser();

src/test/java/com/monkeyk/sos/service/business/RefreshTokenInlineAccessTokenInvokerTest.java

@@ -1,24 +1,25 @@
 package com.monkeyk.sos.service.business;
 
 import com.monkeyk.sos.service.dto.AccessTokenDto;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
+
 
 /**
  * 2019/7/6
  *
  * @author Shengzhao Li
  */
-public class RefreshTokenInlineAccessTokenInvokerTest extends AbstractInlineAccessTokenInvokerTest {
+class RefreshTokenInlineAccessTokenInvokerTest extends AbstractInlineAccessTokenInvokerTest {
 
 
     @Test
-    public void invokeNormal() {
+    void invokeNormal() {
 
         createClientDetails();
 
@@ -62,8 +63,9 @@ public class RefreshTokenInlineAccessTokenInvokerTest extends AbstractInlineAcce
     }
 
 
-    @Test(expected = InvalidGrantException.class)
-    public void invalidRefreshToken() {
+    //    @Test(expected = InvalidGrantException.class)
+    @Test
+    void invalidRefreshToken() {
 
         createClientDetails();
 

src/test/resources/application-test.properties

@@ -4,21 +4,21 @@ spring.application.name=spring-oauth-server
 #
 # MySQL
 #####################
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/oauth2_boot_test?autoReconnect=true&autoReconnectForPools=true&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
 spring.datasource.username=andaily
 spring.datasource.password=andaily
 #Datasource properties
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.maximum-pool-size=20
-spring.datasource.hikari.minimum-idle=2
+#spring.datasource.hikari.minimum-idle=2
 #
 # MVC
 spring.mvc.ignore-default-model-on-redirect=false
-spring.http.encoding.enabled=true
-spring.http.encoding.charset=UTF-8
-spring.http.encoding.force=true
-spring.mvc.locale=zh_CN
+#spring.http.encoding.enabled=true
+#spring.http.encoding.charset=UTF-8
+#spring.http.encoding.force=true
+#spring.mvc.locale=zh_CN
 spring.mvc.view.prefix=/WEB-INF/jsp/
 spring.mvc.view.suffix=.jsp
 #