diff --git a/README.md b/README.md index 156428251fb7a91540764b7ed63f84d7a0ed182d..fedd815cf7b9407e5c84de90339db967100e214b 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # 2 环境 -- `Spring Boot 2.7.0+` +- `Spring Boot 2.6.8+` - `OpenJDK 17.0.3+` - `Gradle 7.4.1+` - `Kotlin 1.6.21+` diff --git a/RedisCache/README.md b/RedisCache/README.md index 0b600479eda2ba22fc352c04d3f44409e7491b30..854bce7720a4e4a8d29fc486dda9979f435786ce 100644 --- a/RedisCache/README.md +++ b/RedisCache/README.md @@ -1,3 +1,16 @@ -# Redis缓存Demo +# 内容 -[博客地址](https://blog.csdn.net/qq_27525611/article/details/114001442) +`Redis`缓存。 + +# 环境 + +- `MySQL 8.0.29` (`Docker`) +- `Redis 7.0.0` (`Docker`) +- `com.baomidou:mybatis-plus-boot-starter:3.5.1` +- `mysql:mysql-connector-java` +- `org.springframework.boot:spring-boot-starter-data-redis` +- `io.lettuce:lettuce-core:6.1.8.RELEASE` + +# 博客 + +[地址](https://blog.csdn.net/qq_27525611/article/details/114001442) \ No newline at end of file diff --git a/RedisCache/demo/build.gradle.kts b/RedisCache/demo/build.gradle.kts index 1c2c8255f656b5cbbf1855fec96923406c25740c..9e45ce73ef54948dbf19968c7f9171d0d53242d3 100644 --- a/RedisCache/demo/build.gradle.kts +++ b/RedisCache/demo/build.gradle.kts @@ -1,47 +1,47 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - 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" + id("org.springframework.boot") version "2.7.0" + id("io.spring.dependency-management") version "1.0.11.RELEASE" + 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 { - extendsFrom(configurations.annotationProcessor.get()) - } + compileOnly { + extendsFrom(configurations.annotationProcessor.get()) + } } repositories { - mavenCentral() + mavenCentral() } dependencies { - implementation("org.springframework.boot:spring-boot-starter-data-redis") - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - developmentOnly("org.springframework.boot:spring-boot-devtools") - annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") - testImplementation("org.springframework.boot:spring-boot-starter-test") - - implementation("com.baomidou:mybatis-plus-boot-starter:3.4.2") - implementation("mysql:mysql-connector-java:8.0.23") + implementation("org.springframework.boot:spring-boot-starter-data-redis") + implementation("org.springframework.boot:spring-boot-starter-web") + implementation("com.fasterxml.jackson.module:jackson-module-kotlin") + implementation("org.jetbrains.kotlin:kotlin-reflect") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + 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") + implementation("io.lettuce:lettuce-core:6.1.8.RELEASE") } tasks.withType { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "11" - } + kotlinOptions { + freeCompilerArgs = listOf("-Xjsr305=strict") + jvmTarget = "17" + } } tasks.withType { - useJUnitPlatform() + useJUnitPlatform() } diff --git a/RedisCache/demo/gradle/wrapper/gradle-wrapper.jar b/RedisCache/demo/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 Binary files a/RedisCache/demo/gradle/wrapper/gradle-wrapper.jar and b/RedisCache/demo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/RedisCache/demo/gradle/wrapper/gradle-wrapper.properties b/RedisCache/demo/gradle/wrapper/gradle-wrapper.properties index 2a563242c11316831a57f9a5df4bfab13a1d21e3..00e33edef6936b1ada8721cff42201db8c9d8675 100644 --- a/RedisCache/demo/gradle/wrapper/gradle-wrapper.properties +++ b/RedisCache/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/RedisCache/demo/gradlew b/RedisCache/demo/gradlew index 4f906e0c811fc9e230eb44819f509cd0627f2600..1b6c787337ffb79f0e3cf8b1e9f00f680a959de1 100755 --- a/RedisCache/demo/gradlew +++ b/RedisCache/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/RedisCache/demo/src/main/kotlin/com/example/demo/DemoApplication.kt b/RedisCache/demo/src/main/kotlin/com/example/demo/DemoApplication.kt index b7af03123ff35628e6975733980a57e6be6d8aca..7fd8c289535dfd36fe707f6b6bc81c0f1c2a1ada 100644 --- a/RedisCache/demo/src/main/kotlin/com/example/demo/DemoApplication.kt +++ b/RedisCache/demo/src/main/kotlin/com/example/demo/DemoApplication.kt @@ -7,5 +7,5 @@ import org.springframework.boot.runApplication class DemoApplication fun main(args: Array) { - runApplication(*args) -} \ No newline at end of file + runApplication(*args) +} diff --git a/RedisCache/demo/src/main/kotlin/com/example/demo/config/RedisConfig.kt b/RedisCache/demo/src/main/kotlin/com/example/demo/config/RedisConfig.kt index 09c38ff5ec655ecec631b4a241ed85122ce51056..20dfd02e2b9ba2a13df1bf224d088ef8563c81ab 100644 --- a/RedisCache/demo/src/main/kotlin/com/example/demo/config/RedisConfig.kt +++ b/RedisCache/demo/src/main/kotlin/com/example/demo/config/RedisConfig.kt @@ -1,7 +1,7 @@ package com.example.demo.config -import org.springframework.boot.autoconfigure.AutoConfigureAfter -import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration +import com.example.demo.entity.User +import org.springframework.beans.factory.annotation.Value import org.springframework.cache.CacheManager import org.springframework.cache.annotation.EnableCaching import org.springframework.context.annotation.Bean @@ -9,32 +9,38 @@ import org.springframework.context.annotation.Configuration import org.springframework.data.redis.cache.RedisCacheConfiguration import org.springframework.data.redis.cache.RedisCacheManager import org.springframework.data.redis.connection.RedisConnectionFactory +import org.springframework.data.redis.connection.RedisStandaloneConfiguration import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory import org.springframework.data.redis.core.RedisTemplate -import org.springframework.data.redis.serializer.* +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer +import org.springframework.data.redis.serializer.RedisSerializationContext +import org.springframework.data.redis.serializer.StringRedisSerializer @Configuration -@AutoConfigureAfter(RedisAutoConfiguration::class) @EnableCaching class RedisConfig { + @Value("\${spring.redis.host:127.0.0.1}") + lateinit var host: String + + @Value("\${spring.redis.port:6379}") + lateinit var port: String @Bean - fun redisTemplate(factory:LettuceConnectionFactory):RedisTemplate{ - val template = RedisTemplate() - template.keySerializer = StringRedisSerializer() - template.valueSerializer = GenericJackson2JsonRedisSerializer() - template.setConnectionFactory(factory) - return template - } + fun redisConnectionFactory() = LettuceConnectionFactory(RedisStandaloneConfiguration(host, port.toInt())) @Bean - fun cacheManager(factory: RedisConnectionFactory):CacheManager{ - val configuration = RedisCacheConfiguration.defaultCacheConfig() - .serializeKeysWith( - RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer()) - ).serializeValuesWith( - RedisSerializationContext.SerializationPair.fromSerializer(GenericJackson2JsonRedisSerializer()) - ) - return RedisCacheManager.builder(factory).cacheDefaults(configuration).build() + fun redisTemplate(factory: LettuceConnectionFactory) = RedisTemplate().apply { + keySerializer = StringRedisSerializer() + valueSerializer = GenericJackson2JsonRedisSerializer() + setConnectionFactory(factory) } + + @Bean + fun cacheManager(factory: RedisConnectionFactory) = RedisCacheManager.builder(factory).cacheDefaults( + RedisCacheConfiguration.defaultCacheConfig().serializeKeysWith( + RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer()) + ).serializeValuesWith( + RedisSerializationContext.SerializationPair.fromSerializer(GenericJackson2JsonRedisSerializer()) + ) + ).build() } \ No newline at end of file diff --git a/RedisCache/demo/src/main/kotlin/com/example/demo/entity/User.kt b/RedisCache/demo/src/main/kotlin/com/example/demo/entity/User.kt index 98be168e4affec4b8a8ec0b52718b87498640b9c..e5ada06d87908547af99cb8aa52108409c3cfd5c 100644 --- a/RedisCache/demo/src/main/kotlin/com/example/demo/entity/User.kt +++ b/RedisCache/demo/src/main/kotlin/com/example/demo/entity/User.kt @@ -1,8 +1,7 @@ package com.example.demo.entity -//import com.fasterxml.jackson.annotation.JsonTypeInfo +import com.fasterxml.jackson.annotation.JsonTypeInfo -open class User(var id:Int?=null, var name:String="") - -//@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS) -//data class User(var id:Int?=null, var name:String="") \ No newline at end of file +@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS) +data class User(var id: Long? = 0, var name: String = "") +//open class User(var id: Long? = 0, var name: String = "") \ No newline at end of file diff --git a/RedisCache/demo/src/main/kotlin/com/example/demo/service/Service.kt b/RedisCache/demo/src/main/kotlin/com/example/demo/service/UserService.kt similarity index 55% rename from RedisCache/demo/src/main/kotlin/com/example/demo/service/Service.kt rename to RedisCache/demo/src/main/kotlin/com/example/demo/service/UserService.kt index 2bcf68401f18321c47f869a9cc8589573d22b6da..6d59a546324fcc2304b96f34dbad30a982d819f5 100644 --- a/RedisCache/demo/src/main/kotlin/com/example/demo/service/Service.kt +++ b/RedisCache/demo/src/main/kotlin/com/example/demo/service/UserService.kt @@ -11,28 +11,26 @@ import org.springframework.transaction.annotation.Transactional @Service @Transactional -class Service { +class UserService { @Autowired - private lateinit var mapper:UserMapper + lateinit var mapper: UserMapper - @CachePut(value = ["user"],key = "#user.id") - fun save(user:User): User { + @CachePut(value = ["user"], key = "#user.id") + fun save(user: User): User { val oldUser = mapper.selectById(user.id) - if(oldUser == null){ + if (oldUser == null) { mapper.insert(user) return user } - if(mapper.updateById(user) == 1) - return user - return oldUser + return if (mapper.updateById(user) == 1) user else oldUser } - @CacheEvict(value = ["user"],key = "#id") - fun delete(id:Int) = (mapper.deleteById(id) == 1) + @CacheEvict(value = ["user"], key = "#id") + fun delete(id: Long) = mapper.deleteById(id) == 1 - @Cacheable(value = ["user"],key = "#id") - fun select(id:Int?): User? = mapper.selectById(id) + @Cacheable(value = ["user"], key = "#id") + fun select(id: Long?): User? = mapper.selectById(id) - @Cacheable(value = ["allUser"],key = "#root.target+#root.methodName") + @Cacheable(value = ["allUser"], key = "#root.target+#root.methodName") fun selectAll(): List? = mapper.selectList(null) } \ No newline at end of file diff --git a/RedisCache/demo/src/main/resources/application.yml b/RedisCache/demo/src/main/resources/application.yml index 78612f496f53df8c30314106af686e31dd312fa0..fb0470b3d28697bfacdc92d9a257d090892bd54d 100644 --- a/RedisCache/demo/src/main/resources/application.yml +++ b/RedisCache/demo/src/main/resources/application.yml @@ -3,10 +3,6 @@ spring: url: jdbc:mysql://localhost:3306/test username: root password: 123456 - redis: - database: 0 - host: 127.0.0.1 - port: 6379 -logging: - level: - com.example.demo: debug \ No newline at end of file +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/RedisCache/demo/src/main/resources/db/user.sql b/RedisCache/demo/src/main/resources/db/user.sql new file mode 100644 index 0000000000000000000000000000000000000000..16416eb658a5d8e7f4ee14f36ee26ffe56f8962d --- /dev/null +++ b/RedisCache/demo/src/main/resources/db/user.sql @@ -0,0 +1,7 @@ +DROP DATABASE IF EXISTS test; +CREATE DATABASE test; +USE test; +CREATE TABLE user( + id BIGINT PRIMARY KEY , + name VARCHAR(30) NOT NULL +); \ No newline at end of file diff --git a/RedisCache/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt b/RedisCache/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt deleted file mode 100644 index 5d02a6b6b9e2ed1d65c8848ec0e01761b4929998..0000000000000000000000000000000000000000 --- a/RedisCache/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.example.demo - -import com.example.demo.entity.User -import com.example.demo.service.Service -import org.junit.jupiter.api.Test -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.context.SpringBootTest - -@SpringBootTest -class DemoApplicationTests { - @Autowired - private lateinit var service: Service - - @Test - fun select() { - service.select(1) - service.select(1) - } - - @Test - fun selectAll(){ - service.selectAll() - service.selectAll() - } - - @Test - fun delete(){ - service.delete(1) - } - - @Test - fun save(){ - val user = User(1,"name1") - service.save(user) - service.select(user.id) - user.name = "name2" - service.save(user) - service.select(user.id) - } -} diff --git a/RedisCache/demo/src/test/kotlin/com/example/demo/RedisTest.kt b/RedisCache/demo/src/test/kotlin/com/example/demo/RedisTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..3434e400a5b91cd72ea9b9bc59f2b87d62d72a85 --- /dev/null +++ b/RedisCache/demo/src/test/kotlin/com/example/demo/RedisTest.kt @@ -0,0 +1,28 @@ +package com.example.demo + +import com.example.demo.entity.User +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.data.redis.core.RedisTemplate +import org.springframework.data.redis.core.StringRedisTemplate + +@SpringBootTest +class RedisTest { + @Autowired + lateinit var stringRedisTemplate: StringRedisTemplate + + @Autowired + lateinit var redisTemplate: RedisTemplate + + @Test + fun redisTemplateTest() { + val KEY = "key" + stringRedisTemplate.opsForValue().set(KEY, "value") + println("$KEY -> ${stringRedisTemplate.opsForValue().get(KEY)}") + + val USER_KEY = "user_key" + redisTemplate.opsForValue().set(USER_KEY, User(1, "name")) + println("$USER_KEY -> ${redisTemplate.opsForValue().get(USER_KEY)}") + } +} \ No newline at end of file diff --git a/RedisCache/demo/src/test/kotlin/com/example/demo/UserServiceTest.kt b/RedisCache/demo/src/test/kotlin/com/example/demo/UserServiceTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..e27ded9a9d7187b9dc6bdda104c438a4d771d4de --- /dev/null +++ b/RedisCache/demo/src/test/kotlin/com/example/demo/UserServiceTest.kt @@ -0,0 +1,41 @@ +package com.example.demo + +import com.example.demo.entity.User +import com.example.demo.service.UserService +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest + +@SpringBootTest +class UserServiceTest { + @Autowired + lateinit var service: UserService + + @Test + fun select() { + println(service.select(1)) + println(service.select(1)) + } + + @Test + fun selectAll() { + println(service.selectAll()) + println(service.selectAll()) + } + + @Test + fun delete() { + println(service.delete(1)) + println(service.delete(1)) + } + + @Test + fun save() { + val user = User(1, "name1") + println(service.save(user)) + println(service.select(user.id)) + user.name = "name2" + println(service.save(user)) + println(service.select(user.id)) + } +}