Update Spring Boot 2.4.3 and Gradle 6.8.2 Web with MyBatisPlus

WebWithMyBatisPlus/demo/.gitignore

@@ -13,6 +13,9 @@ build/
 .settings
 .springBeans
 .sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
 
 ### IntelliJ IDEA ###
 .idea

WebWithMyBatisPlus/demo/build.gradle.kts

 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "2.3.3.RELEASE"
-    id("io.spring.dependency-management") version "1.0.10.RELEASE"
-    kotlin("jvm") version "1.3.72"
-    kotlin("plugin.spring") version "1.3.72"
+    id("org.springframework.boot") version "2.4.3"
+    id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    kotlin("jvm") version "1.4.30"
+    kotlin("plugin.spring") version "1.4.30"
 }
 
 group = "com.example"
@@ -26,17 +26,11 @@ dependencies {
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("com.baomidou:mybatis-plus-boot-starter:3.4.0")
+    implementation("com.baomidou:mybatis-plus-boot-starter:3.4.2")
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     runtimeOnly("mysql:mysql-connector-java")
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
-    testImplementation("org.springframework.boot:spring-boot-starter-test") {
-        exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
-    }
-}
-
-tasks.withType<Test> {
-    useJUnitPlatform()
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
 }
 
 tasks.withType<KotlinCompile> {
@@ -45,3 +39,7 @@ tasks.withType<KotlinCompile> {
         jvmTarget = "11"
     }
 }
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+}

WebWithMyBatisPlus/demo/gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

WebWithMyBatisPlus/demo/gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

WebWithMyBatisPlus/demo/gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusIServiceController.kt

@@ -7,25 +7,24 @@ import org.springframework.web.bind.annotation.*
 
 @RestController
 @RequestMapping("/iservice")
-class MyBatisPlusIServiceController
-{
+class MyBatisPlusIServiceController {
     @Autowired
     lateinit var myBatisPlusIService: MyBatisPlusIService
 
     @GetMapping("select")
-    fun select1(@RequestParam id:String): User? = myBatisPlusIService.select(id)
+    fun select1(@RequestParam id: String): User? = myBatisPlusIService.select(id)
 
     @GetMapping("select/{id}")
-    fun select2(@PathVariable("id") id:String): User? = myBatisPlusIService.select(id)
+    fun select2(@PathVariable("id") id: String): User? = myBatisPlusIService.select(id)
 
     @GetMapping("selectAll")
     fun selectAll(): List<User> = myBatisPlusIService.selectAll()
 
     @GetMapping("delete")
-    fun delete1(@RequestParam id:String) = myBatisPlusIService.delete(id)
+    fun delete1(@RequestParam id: String) = myBatisPlusIService.delete(id)
 
     @GetMapping("delete/{id}")
-    fun delete2(@PathVariable("id") id:String) = myBatisPlusIService.delete(id)
+    fun delete2(@PathVariable("id") id: String) = myBatisPlusIService.delete(id)
 
     @PostMapping("save")
     fun save(@RequestBody user: User) = myBatisPlusIService.save(user)

WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusMapperController.kt

@@ -12,19 +12,19 @@ class MyBatisPlusMapperController {
     lateinit var myBatisPlusMapper: MyBatisPlusMapper
 
     @GetMapping("select")
-    fun select1(@RequestParam id:String): User? = myBatisPlusMapper.select(id)
+    fun select1(@RequestParam id: String): User? = myBatisPlusMapper.select(id)
 
     @GetMapping("select/{id}")
-    fun select2(@PathVariable("id") id:String): User? = myBatisPlusMapper.select(id)
+    fun select2(@PathVariable("id") id: String): User? = myBatisPlusMapper.select(id)
 
     @GetMapping("selectAll")
     fun selectAll(): List<User> = myBatisPlusMapper.selectAll()
 
     @GetMapping("delete")
-    fun delete1(@RequestParam id:String) = myBatisPlusMapper.delete(id)
+    fun delete1(@RequestParam id: String) = myBatisPlusMapper.delete(id)
 
     @GetMapping("delete/{id}")
-    fun delete2(@PathVariable("id") id:String) = myBatisPlusMapper.delete(id)
+    fun delete2(@PathVariable("id") id: String) = myBatisPlusMapper.delete(id)
 
     @PostMapping("save")
     fun save(@RequestBody user: User) = myBatisPlusMapper.save(user)

WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserMapper.kt

@@ -2,7 +2,5 @@ package com.example.demo.dao
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
 import com.example.demo.entity.User
-import org.apache.ibatis.annotations.Mapper
-import org.springframework.stereotype.Component
 
 interface UserMapper: BaseMapper<User>
\ No newline at end of file

WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserService.kt

@@ -3,8 +3,6 @@ package com.example.demo.dao
 import com.baomidou.mybatisplus.extension.service.IService
 import com.example.demo.entity.User
 import org.springframework.stereotype.Component
-import org.springframework.stereotype.Repository
-import org.springframework.stereotype.Service
 
 @Component
 interface UserService:IService<User>
\ No newline at end of file

WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusIService.kt

@@ -8,13 +8,12 @@ import org.springframework.stereotype.Component
 import org.springframework.stereotype.Service
 
 @Service
-class MyBatisPlusIService: ServiceImpl<UserMapper, User>(), UserService
-{
+class MyBatisPlusIService : ServiceImpl<UserMapper, User>(), UserService {
     override fun save(user: User) = saveOrUpdate(user)
 
-    fun delete(id:String) = removeById(id)
+    fun delete(id: String) = removeById(id)
 
-    fun select(id:String): User? = getById(id)
+    fun select(id: String): User? = getById(id)
 
-    fun selectAll():List<User> = list()
+    fun selectAll(): List<User> = list()
 }

WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusMapper.kt

@@ -7,21 +7,19 @@ import org.springframework.stereotype.Component
 import org.springframework.stereotype.Service
 
 @Service
-class MyBatisPlusMapper
-{
+class MyBatisPlusMapper {
     @Autowired
     private lateinit var mapper: UserMapper
 
-    fun save(user: User):Boolean
-    {
-        if(mapper.selectById(user.id) != null)
+    fun save(user: User): Boolean {
+        if (mapper.selectById(user.id) != null)
             return mapper.updateById(user) == 1
         return mapper.insert(user) == 1
     }
 
-    fun delete(id:String) = (mapper.deleteById(id) == 1)
+    fun delete(id: String) = (mapper.deleteById(id) == 1)
 
-    fun select(id:String): User? = mapper.selectById(id)
+    fun select(id: String): User? = mapper.selectById(id)
 
-    fun selectAll():List<User> = mapper.selectList(null)
+    fun selectAll(): List<User> = mapper.selectList(null)
 }
\ No newline at end of file

WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusIServiceTest.kt

@@ -7,31 +7,27 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 
 @SpringBootTest
-class MyBatisPlusIServiceTest
-{
+class MyBatisPlusIServiceTest {
     @Autowired
     lateinit var myBatisPlusIService: MyBatisPlusIService
+
     @Test
-    fun save()
-    {
-        myBatisPlusIService.save(User("1","2","3"))
+    fun save() {
+        myBatisPlusIService.save(User("1", "2", "3"))
     }
 
     @Test
-    fun delete()
-    {
+    fun delete() {
         myBatisPlusIService.delete("3")
     }
 
     @Test
-    fun select()
-    {
+    fun select() {
         println(myBatisPlusIService.select("1"))
     }
 
     @Test
-    fun selectAll()
-    {
+    fun selectAll() {
         println(myBatisPlusIService.selectAll())
     }
 }

WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusMapperTest.kt

@@ -7,32 +7,27 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 
 @SpringBootTest
-class MyBatisPlusMapperTest
-{
+class MyBatisPlusMapperTest {
     @Autowired
     lateinit var myBatisPlusMapper: MyBatisPlusMapper
 
     @Test
-    fun save()
-    {
-        myBatisPlusMapper.save(User("2","3","4"))
+    fun save() {
+        myBatisPlusMapper.save(User("2", "3", "4"))
     }
 
     @Test
-    fun delete()
-    {
+    fun delete() {
         myBatisPlusMapper.delete("3")
     }
 
     @Test
-    fun select()
-    {
+    fun select() {
         println(myBatisPlusMapper.select("1"))
     }
 
     @Test
-    fun selectAll()
-    {
+    fun selectAll() {
         println(myBatisPlusMapper.selectAll())
     }
 }
\ No newline at end of file