perf($POM): update dependencies

spring-boot-admin 2.6.6 -> 2.7.1 [skip ci]
johnnymillergh · Jul 2, 2022 · 42d0abb · 42d0abb
1 parent de3e26a
commit 42d0abb
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 39 deletions.
diff --git a/.../src/main/kotlin/com/jmsoftware/maf/authcenter/user/service/impl/UserDomainServiceImpl.kt b/.../src/main/kotlin/com/jmsoftware/maf/authcenter/user/service/impl/UserDomainServiceImpl.kt
@@ -123,8 +123,7 @@ class UserDomainServiceImpl(
                     this.like(User::username, payload.username)
                 }
             }
-        }
-            .page(page)
+        }.page(page)
         return PageResponseBodyBean.ofSuccess(page.records, page.total)
     }
 }
diff --git a/.../test/kotlin/com/jmsoftware/maf/authcenter/user/service/impl/UserDomainServiceImplTest.kt b/.../test/kotlin/com/jmsoftware/maf/authcenter/user/service/impl/UserDomainServiceImplTest.kt
@@ -32,7 +32,6 @@ import org.mockito.junit.jupiter.MockitoExtension
 import org.springframework.context.MessageSource
 import org.springframework.data.redis.core.RedisTemplate
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
-import java.time.LocalDateTime
 import javax.servlet.http.HttpServletRequest
 
 /**
@@ -161,13 +160,7 @@ internal class UserDomainServiceImplTest {
     @Test
     fun getUserPageList() {
         doReturn(userMapper).`when`(userDomainService).baseMapper
-        val response = userDomainService.getUserPageList(
-            GetUserPageListPayload(
-                "jonathan",
-                LocalDateTime.now(),
-                LocalDateTime.now()
-            )
-        )
+        val response = userDomainService.getUserPageList(GetUserPageListPayload())
         log.info("User page list: $response")
         assertNotNull(response)
         assertTrue(CollUtil.isEmpty(response.list))

diff --git a/...nfra/src/main/kotlin/com/jmsoftware/maf/authcenter/user/payload/GetUserPageListPayload.kt b/...nfra/src/main/kotlin/com/jmsoftware/maf/authcenter/user/payload/GetUserPageListPayload.kt
@@ -1,9 +1,6 @@
 package com.jmsoftware.maf.authcenter.user.payload
 
 import com.jmsoftware.maf.common.bean.PaginationBase
-import java.time.LocalDateTime
-import javax.validation.constraints.NotEmpty
-import javax.validation.constraints.NotNull
 
 /**
  * # GetUserPageListPayload
@@ -12,11 +9,6 @@ import javax.validation.constraints.NotNull
  *
  * @author Johnny Miller (锺俊), e-mail: [email protected], date: 4/12/22 12:46 PM
  */
-data class GetUserPageListPayload(
-    @field:NotEmpty
-    val username: String,
-    @field:NotNull
-    val startTime: LocalDateTime,
-    @field:NotNull
-    val endTime: LocalDateTime
-) : PaginationBase()
+class GetUserPageListPayload : PaginationBase() {
+    val username: String? = null
+}
diff --git a/pom.xml b/pom.xml
@@ -56,8 +56,8 @@
         <functionaljava.version>5.0</functionaljava.version>
         <functionaljava-java8.version>4.8.1</functionaljava-java8.version>
         <spring-content.version>1.0.0.M5</spring-content.version>
-        <spring-boot-admin-starter-server.version>2.6.6</spring-boot-admin-starter-server.version>
-        <spring-boot-admin-starter-client.version>2.6.6</spring-boot-admin-starter-client.version>
+        <spring-boot-admin-starter-server.version>2.7.1</spring-boot-admin-starter-server.version>
+        <spring-boot-admin-starter-client.version>2.7.1</spring-boot-admin-starter-client.version>
         <mybatis-plus-boot-starter.version>3.5.2</mybatis-plus-boot-starter.version>
         <dynamic-datasource-spring-boot-starter.version>3.5.1</dynamic-datasource-spring-boot-starter.version>
         <shardingsphere.version>5.1.2</shardingsphere.version>

diff --git a/...in/kotlin/com/jmsoftware/maf/springcloudstarter/configuration/WebSecurityConfiguration.kt b/...in/kotlin/com/jmsoftware/maf/springcloudstarter/configuration/WebSecurityConfiguration.kt
@@ -2,11 +2,10 @@ package com.jmsoftware.maf.springcloudstarter.configuration
 
 import com.jmsoftware.maf.common.util.logger
 import org.springframework.context.annotation.Bean
-import org.springframework.security.authentication.AuthenticationManager
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
+import org.springframework.security.web.SecurityFilterChain
 import javax.annotation.PostConstruct
 
 /**
@@ -17,7 +16,7 @@ import javax.annotation.PostConstruct
  * @author Johnny Miller (锺俊), e-mail: [email protected], date: 4/18/22 9:20 PM
  */
 @EnableWebSecurity
-class WebSecurityConfiguration : WebSecurityConfigurerAdapter() {
+class WebSecurityConfiguration {
     companion object {
         private val log = logger()
     }
@@ -27,14 +26,17 @@ class WebSecurityConfiguration : WebSecurityConfigurerAdapter() {
         log.warn("Initial bean: `${WebSecurityConfiguration::class.java.simpleName}`")
     }
 
-    public override fun authenticationManager(): AuthenticationManager {
-        return super.authenticationManagerBean()
-    }
-
-    override fun configure(http: HttpSecurity) {
-        // Disable Web Security.
-        http.authorizeRequests().anyRequest().permitAll().and().csrf().disable().cors().disable()
-    }
+    @Bean
+    fun securityFilterChain(http: HttpSecurity): SecurityFilterChain =
+        http.authorizeRequests()
+            .anyRequest()
+            .permitAll()
+            .and()
+            .csrf()
+            .disable()
+            .cors()
+            .disable()
+            .build()
 
     @Bean
     fun bcryptPasswordEncoder(): BCryptPasswordEncoder {

diff --git a/.../kotlin/com/jmsoftware/maf/springcloudstarter/elasticsearch/ElasticsearchConfiguration.kt b/.../kotlin/com/jmsoftware/maf/springcloudstarter/elasticsearch/ElasticsearchConfiguration.kt
@@ -1,7 +1,6 @@
 package com.jmsoftware.maf.springcloudstarter.elasticsearch
 
 import com.jmsoftware.maf.common.util.logger
-import org.elasticsearch.client.RestHighLevelClient
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties
 import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration
@@ -20,7 +19,7 @@ import javax.annotation.PostConstruct
  * <a href='https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.logging'>Client Logging</a>
  */
 @EnableElasticsearchRepositories
-@ConditionalOnClass(AbstractElasticsearchConfiguration::class, RestHighLevelClient::class)
+@ConditionalOnClass(AbstractElasticsearchConfiguration::class)
 class ElasticsearchConfiguration(
     private val elasticsearchProperties: ElasticsearchProperties
 ) {

diff --git a/...software/maf/springcloudstarter/quartz/entity/GetQuartzJobConfigurationPageListPayload.kt b/...software/maf/springcloudstarter/quartz/entity/GetQuartzJobConfigurationPageListPayload.kt
@@ -9,6 +9,6 @@ import com.jmsoftware.maf.common.bean.PaginationBase
  *
  * @author Johnny Miller (锺俊), e-mail: [email protected], date: 4/14/22 10:38 PM
  */
-data class GetQuartzJobConfigurationPageListPayload(
-    val serviceName: String?
-) : PaginationBase()
+class GetQuartzJobConfigurationPageListPayload : PaginationBase() {
+    val serviceName: String? = null
+}