diff --git a/WebWithMyBatisPlus/README.md b/WebWithMyBatisPlus/README.md index b7f19663b73e589a50a00f9c1f8deaa88e0dc815..c6938b9b95635d2eeabed5c43cf244a807690352 100755 --- a/WebWithMyBatisPlus/README.md +++ b/WebWithMyBatisPlus/README.md @@ -1 +1,16 @@ -# Spring Web + MyBatis Plus Demo +# 内容 + +Spring Web+MyBatisPlus + +# 环境 + +- MyBatisPlus 3.5.1 +- MySQL 8.0.29 (Docker) +- 数据库名字为`test` +- 数据表名字为`user` +- 数据库用户名`root` +- 数据库密码为`123456` + +# 博客 + +[地址](https://blog.csdn.net/qq_27525611/article/details/108440134) \ No newline at end of file diff --git a/WebWithMyBatisPlus/demo/build.gradle.kts b/WebWithMyBatisPlus/demo/build.gradle.kts index 39336cc36c53713a87e845ce602f072063098943..6469b380401faa63d9fde07f0b49f2158ba7c021 100644 --- a/WebWithMyBatisPlus/demo/build.gradle.kts +++ b/WebWithMyBatisPlus/demo/build.gradle.kts @@ -1,15 +1,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "2.4.3" + id("org.springframework.boot") version "2.6.7" id("io.spring.dependency-management") version "1.0.11.RELEASE" - kotlin("jvm") version "1.4.30" - kotlin("plugin.spring") version "1.4.30" + kotlin("jvm") version "1.6.21" + kotlin("plugin.spring") version "1.6.21" } group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_11 +java.sourceCompatibility = JavaVersion.VERSION_17 configurations { compileOnly { @@ -26,17 +26,17 @@ 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.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") + implementation("com.baomidou:mybatis-plus-boot-starter:3.5.1") } tasks.withType { kotlinOptions { freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "11" + jvmTarget = "17" } } diff --git a/WebWithMyBatisPlus/demo/gradle/wrapper/gradle-wrapper.jar b/WebWithMyBatisPlus/demo/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 Binary files a/WebWithMyBatisPlus/demo/gradle/wrapper/gradle-wrapper.jar and b/WebWithMyBatisPlus/demo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/WebWithMyBatisPlus/demo/gradle/wrapper/gradle-wrapper.properties b/WebWithMyBatisPlus/demo/gradle/wrapper/gradle-wrapper.properties index 2a563242c11316831a57f9a5df4bfab13a1d21e3..00e33edef6936b1ada8721cff42201db8c9d8675 100644 --- a/WebWithMyBatisPlus/demo/gradle/wrapper/gradle-wrapper.properties +++ b/WebWithMyBatisPlus/demo/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/WebWithMyBatisPlus/demo/gradlew b/WebWithMyBatisPlus/demo/gradlew index 4f906e0c811fc9e230eb44819f509cd0627f2600..1b6c787337ffb79f0e3cf8b1e9f00f680a959de1 100755 --- a/WebWithMyBatisPlus/demo/gradlew +++ b/WebWithMyBatisPlus/demo/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -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 - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/config/MyBatisPlusConfig.kt b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/config/MyBatisPlusConfig.kt old mode 100755 new mode 100644 diff --git a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusIServiceController.kt b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusIServiceController.kt old mode 100755 new mode 100644 index 87428184735854ebe5a607f1c17bec1e8c1dae32..1dfa6c63b969f49e91394fad66ce8ff607007f41 --- a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusIServiceController.kt +++ b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusIServiceController.kt @@ -3,30 +3,35 @@ package com.example.demo.controller import com.example.demo.entity.User import com.example.demo.service.MyBatisPlusIService import org.springframework.beans.factory.annotation.Autowired -import org.springframework.web.bind.annotation.* +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.bind.annotation.RestController @RestController -@RequestMapping("/iservice") +@RequestMapping("/iservice/") class MyBatisPlusIServiceController { @Autowired - lateinit var myBatisPlusIService: MyBatisPlusIService + private lateinit var myBatisPlusIService: MyBatisPlusIService - @GetMapping("select") - fun select1(@RequestParam id: String): User? = myBatisPlusIService.select(id) + @GetMapping("select/id") + fun select1(@RequestParam id:Long): User? = myBatisPlusIService.select(id) - @GetMapping("select/{id}") - fun select2(@PathVariable("id") id: String): User? = myBatisPlusIService.select(id) + @GetMapping("select/id/{id}") + fun select2(@PathVariable("id") id:Long): User? = myBatisPlusIService.select(id) - @GetMapping("selectAll") - fun selectAll(): List = myBatisPlusIService.selectAll() + @GetMapping("select/all") + fun selectAll(): List? = myBatisPlusIService.selectAll() @GetMapping("delete") - fun delete1(@RequestParam id: String) = myBatisPlusIService.delete(id) + fun delete1(@RequestParam id:Long) = myBatisPlusIService.delete(id) @GetMapping("delete/{id}") - fun delete2(@PathVariable("id") id: String) = myBatisPlusIService.delete(id) + fun delete2(@PathVariable id:Long) = myBatisPlusIService.delete(id) @PostMapping("save") - fun save(@RequestBody user: User) = myBatisPlusIService.save(user) - + fun save(@RequestBody user:User) = myBatisPlusIService.save(user) } \ No newline at end of file diff --git a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusMapperController.kt b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusMapperController.kt old mode 100755 new mode 100644 index fad1af9a6631efb6975795c6724f8bb9566beecd..91690d1f7d4ddc843d37935bcfa9d503eaa7e772 --- a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusMapperController.kt +++ b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/controller/MyBatisPlusMapperController.kt @@ -9,24 +9,23 @@ import org.springframework.web.bind.annotation.* @RequestMapping("/mapper") class MyBatisPlusMapperController { @Autowired - lateinit var myBatisPlusMapper: MyBatisPlusMapper + private lateinit var myBatisPlusMapper: MyBatisPlusMapper - @GetMapping("select") - fun select1(@RequestParam id: String): User? = myBatisPlusMapper.select(id) + @GetMapping("select/id") + fun select1(@RequestParam id:Long): User? = myBatisPlusMapper.select(id) - @GetMapping("select/{id}") - fun select2(@PathVariable("id") id: String): User? = myBatisPlusMapper.select(id) + @GetMapping("select/id/{id}") + fun select2(@PathVariable("id") id:Long): User? = myBatisPlusMapper.select(id) - @GetMapping("selectAll") - fun selectAll(): List = myBatisPlusMapper.selectAll() + @GetMapping("select/all") + fun selectAll(): List? = myBatisPlusMapper.selectAll() @GetMapping("delete") - fun delete1(@RequestParam id: String) = myBatisPlusMapper.delete(id) + fun delete1(@RequestParam id:Long) = myBatisPlusMapper.delete(id) @GetMapping("delete/{id}") - fun delete2(@PathVariable("id") id: String) = myBatisPlusMapper.delete(id) + fun delete2(@PathVariable id:Long) = myBatisPlusMapper.delete(id) @PostMapping("save") fun save(@RequestBody user: User) = myBatisPlusMapper.save(user) - } \ No newline at end of file diff --git a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserMapper.kt b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserMapper.kt old mode 100755 new mode 100644 index b8e7c6e3f0c494cb2054235b23a90c7adff6d728..75d3670b41f747a7279e933289d95b2ac7ca97dd --- a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserMapper.kt +++ b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserMapper.kt @@ -2,5 +2,9 @@ package com.example.demo.dao import com.baomidou.mybatisplus.core.mapper.BaseMapper import com.example.demo.entity.User +import org.springframework.stereotype.Service -interface UserMapper: BaseMapper \ No newline at end of file +@Service +// 因为有了MyBatisPlusConfig,不加这个@Service也可以正常运行 +// 加这个@Service主要是防止IDEA出现No Beans警告 +interface UserMapper:BaseMapper \ No newline at end of file diff --git a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserService.kt b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserService.kt old mode 100755 new mode 100644 index fbe2ff855d10ed4a8f0b2d80106daabe2935fed6..723c0a6771261b25cb6c3ee2c792182dcadb14ae --- a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserService.kt +++ b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/dao/UserService.kt @@ -2,7 +2,5 @@ package com.example.demo.dao import com.baomidou.mybatisplus.extension.service.IService import com.example.demo.entity.User -import org.springframework.stereotype.Component -@Component interface UserService:IService \ No newline at end of file diff --git a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/entity/User.kt b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/entity/User.kt old mode 100755 new mode 100644 index 9f61d9c1bcf521f6e2eed04f44fc38b188f6781e..b32f2784e2ae94c42d354355b68f80b73dc6c51f --- a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/entity/User.kt +++ b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/entity/User.kt @@ -1,5 +1,5 @@ package com.example.demo.entity -class User(var id:String,var username:String,var password:String){ +class User(var id:Long,var username:String,var password:String) { override fun toString() = "id:$id\nusername:$username\npassword:$password\n" } \ No newline at end of file diff --git a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusIService.kt b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusIService.kt old mode 100755 new mode 100644 index 0a243d4f977bd600382fb8d071a8b211ab291762..998ccd7c1cdfa4b4d9b43312afbe91d46db1566c --- a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusIService.kt +++ b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusIService.kt @@ -4,16 +4,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl import com.example.demo.dao.UserMapper import com.example.demo.dao.UserService import com.example.demo.entity.User -import org.springframework.stereotype.Component import org.springframework.stereotype.Service @Service -class MyBatisPlusIService : ServiceImpl(), UserService { - override fun save(user: User) = saveOrUpdate(user) +class MyBatisPlusIService:ServiceImpl(),UserService { + override fun save(user:User) = if(getById(user.id) != null) updateById(user) + else super.save(user) - fun delete(id: String) = removeById(id) + fun delete(id:Long) = removeById(id) - fun select(id: String): User? = getById(id) + fun select(id:Long): User? = getById(id) - fun selectAll(): List = list() -} + fun selectAll(): List? = list() +} \ No newline at end of file diff --git a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusMapper.kt b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusMapper.kt old mode 100755 new mode 100644 index 94f869297d06dff6216ae66e59783c2740f03f25..577db48dcfe5e83712ef29b0fd0e94506f18f02d --- a/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusMapper.kt +++ b/WebWithMyBatisPlus/demo/src/main/kotlin/com/example/demo/service/MyBatisPlusMapper.kt @@ -3,7 +3,6 @@ package com.example.demo.service import com.example.demo.dao.UserMapper import com.example.demo.entity.User import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component import org.springframework.stereotype.Service @Service @@ -11,15 +10,12 @@ class MyBatisPlusMapper { @Autowired private lateinit var mapper: UserMapper - fun save(user: User): Boolean { - if (mapper.selectById(user.id) != null) - return mapper.updateById(user) == 1 - return mapper.insert(user) == 1 - } + fun save(user: User) = if (mapper.selectById(user.id) != null) mapper.updateById(user) == 1 + else mapper.insert(user) == 1 - fun delete(id: String) = (mapper.deleteById(id) == 1) + fun delete(id: Long) = mapper.deleteById(id) == 1 - fun select(id: String): User? = mapper.selectById(id) + fun select(id: Long): User? = mapper.selectById(id) - fun selectAll(): List = mapper.selectList(null) + fun selectAll(): List? = mapper.selectList(null) } \ No newline at end of file diff --git a/WebWithMyBatisPlus/demo/src/main/resources/application.yml b/WebWithMyBatisPlus/demo/src/main/resources/application.yml old mode 100755 new mode 100644 index f9fd551ddaa0b808361fe0a49354b7ce9ee28cf4..fb0470b3d28697bfacdc92d9a257d090892bd54d --- a/WebWithMyBatisPlus/demo/src/main/resources/application.yml +++ b/WebWithMyBatisPlus/demo/src/main/resources/application.yml @@ -1,5 +1,8 @@ spring: datasource: url: jdbc:mysql://localhost:3306/test - username: test - password: test \ No newline at end of file + username: root + password: 123456 +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/WebWithMyBatisPlus/demo/src/main/resources/db/CreateTableAndInsertData.sql b/WebWithMyBatisPlus/demo/src/main/resources/db/CreateTableAndInsertData.sql new file mode 100644 index 0000000000000000000000000000000000000000..38604b0f1890eba4aa507721b41ed687c370cb64 --- /dev/null +++ b/WebWithMyBatisPlus/demo/src/main/resources/db/CreateTableAndInsertData.sql @@ -0,0 +1,12 @@ +CREATE DATABASE IF NOT EXISTS test; + +USE test; + +CREATE TABLE user +( + id BIGINT PRIMARY KEY, + username VARCHAR(30) NOT NULL, + password VARCHAR(30) NOT NULL +); + +INSERT INTO user(id,username,password) VALUES (1,'username1','password1'),(2,'username2','password2'); diff --git a/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt b/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt deleted file mode 100644 index 875f277245a96ab9dd82713fd13d6d373432efb8..0000000000000000000000000000000000000000 --- a/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.demo - -import org.junit.jupiter.api.Test -import org.springframework.boot.test.context.SpringBootTest - -@SpringBootTest -class DemoApplicationTests { - - @Test - fun contextLoads() { - } - -} diff --git a/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusIServiceTest.kt b/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusIServiceTest.kt old mode 100755 new mode 100644 index 65997ea68a1433c28dfd1bac4de9388679da531a..6a4e6376a22957bcb8dd76cdab3b2034fa8c3253 --- a/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusIServiceTest.kt +++ b/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusIServiceTest.kt @@ -9,21 +9,21 @@ import org.springframework.boot.test.context.SpringBootTest @SpringBootTest class MyBatisPlusIServiceTest { @Autowired - lateinit var myBatisPlusIService: MyBatisPlusIService + private lateinit var myBatisPlusIService: MyBatisPlusIService @Test fun save() { - myBatisPlusIService.save(User("1", "2", "3")) + myBatisPlusIService.save(User(3, "iservice-username-3", "iservice-password-3")) } @Test fun delete() { - myBatisPlusIService.delete("3") + myBatisPlusIService.delete(4) } @Test fun select() { - println(myBatisPlusIService.select("1")) + println(myBatisPlusIService.select(1)) } @Test @@ -31,4 +31,3 @@ class MyBatisPlusIServiceTest { println(myBatisPlusIService.selectAll()) } } - diff --git a/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusMapperTest.kt b/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusMapperTest.kt old mode 100755 new mode 100644 index 9a31b2a95f48a92291291d214dba99aecfa34dc9..5c432fec0b345b56ac84b04a619f43b2b062ec4a --- a/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusMapperTest.kt +++ b/WebWithMyBatisPlus/demo/src/test/kotlin/com/example/demo/MyBatisPlusMapperTest.kt @@ -9,21 +9,21 @@ import org.springframework.boot.test.context.SpringBootTest @SpringBootTest class MyBatisPlusMapperTest { @Autowired - lateinit var myBatisPlusMapper: MyBatisPlusMapper + private lateinit var myBatisPlusMapper: MyBatisPlusMapper @Test fun save() { - myBatisPlusMapper.save(User("2", "3", "4")) + myBatisPlusMapper.save(User(3, "mapper-username-3", "mapper-password-3")) } @Test fun delete() { - myBatisPlusMapper.delete("3") + myBatisPlusMapper.delete(4) } @Test fun select() { - println(myBatisPlusMapper.select("1")) + println(myBatisPlusMapper.select(1)) } @Test